Sync for the release.

svn path=/trunk/; revision=11530

31 files changed, 158072 insertions, 82984 deletions

diff --git a/filter/libfilter-i18n.h b/filter/libfilter-i18n.h
index 0c05212bc4..d3cc5cbb36 100644
--- a/filter/libfilter-i18n.h
+++ b/filter/libfilter-i18n.h
@@ -21,7 +21,6 @@ char *s = N_("ends with");
 char *s = N_("Exist");
 char *s = N_("exists");
 char *s = N_("Expression");
-char *s = N_("Forward to Address");
 char *s = N_("Important");
 char *s = N_("is");
 char *s = N_("is greater than");
diff --git a/po/ChangeLog b/po/ChangeLog
index aecbf3743d..c023d90775 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
+
+	* Updated all the .po's for the release.
+
 2001-07-31  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* no.po: Updated Norwegian (bokmЕl) translation.
diff --git a/po/az.po b/po/az.po
index d4630d17a2..276152b553 100644
--- a/po/az.po
+++ b/po/az.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.3.1\n"
-"POT-Creation-Date: 2001-05-07 14:02+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-05-23 00:10GMT +0200\n"
 "Last-Translator: Vasif д╟smayд╠loд÷lu MD <azerb_linux@hotmail.com>\n"
 "Language-Team: Azerbaijani Turkish <linuxaz@azerimal.net>\n"
@@ -14,11 +14,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.8\n"
 
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import VCard files into Evolution."
+msgstr "'GnomeCard' fayllarд╠nд╠ 'Evolution' iц╖inи≥ gи≥tirи≥n e'malatxana."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports VCard files into Evolution."
+msgstr "'GnomeCard' fayllarд╠nд╠ 'Evolution' iц╖inи≥ gи≥tirir."
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Kart: "
 
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -26,7 +36,7 @@ msgstr ""
 "\n"
 "Ad: "
 
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -34,7 +44,7 @@ msgstr ""
 "\n"
 "  Prefiks:\t"
 
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -42,7 +52,7 @@ msgstr ""
 "\n"
 "  Verilи≥n:\t"
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -50,7 +60,7 @@ msgstr ""
 "\n"
 "  ф▐lavи≥: "
 
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -58,7 +68,7 @@ msgstr ""
 "\n"
 "  Ailи≥:\t"
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -66,7 +76,7 @@ msgstr ""
 "\n"
 "  Suffiks:\t"
 
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -74,7 +84,7 @@ msgstr ""
 "\n"
 "Ad gц╪nц╪:  "
 
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -82,7 +92,7 @@ msgstr ""
 "\n"
 "ц°nvan:"
 
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -90,7 +100,7 @@ msgstr ""
 "\n"
 "   Poц╖t Qutusu:\t"
 
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -98,7 +108,7 @@ msgstr ""
 "\n"
 "   ф▐lavи≥:\t"
 
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -106,7 +116,7 @@ msgstr ""
 "\n"
 "   Kц╪ц╖и≥:\t"
 
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -114,7 +124,7 @@ msgstr ""
 "\n"
 "   е·и≥hи≥r:\t"
 
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -122,7 +132,7 @@ msgstr ""
 "\n"
 "   Rayon:\t"
 
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -130,7 +140,7 @@ msgstr ""
 "\n"
 "   Poц╖t Kodu:\t"
 
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -138,7 +148,7 @@ msgstr ""
 "\n"
 "   ц√lkи≥:\t"
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
@@ -146,7 +156,7 @@ msgstr ""
 "\n"
 "Tи≥slim Etiketi:  "
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -154,7 +164,7 @@ msgstr ""
 "\n"
 "Telefonlar:\n"
 
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -162,7 +172,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -170,7 +180,7 @@ msgstr ""
 "\n"
 "ePoц╖t:\n"
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -178,7 +188,7 @@ msgstr ""
 "\n"
 "ePoц╖t:"
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -186,7 +196,7 @@ msgstr ""
 "\n"
 "Gц╤ndи≥rici:  "
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -194,7 +204,7 @@ msgstr ""
 "\n"
 "Zaman zolaд÷д╠:  "
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -202,7 +212,7 @@ msgstr ""
 "\n"
 "Coд÷rafi Yerlи≥е÷mи≥:  "
 
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -210,7 +220,7 @@ msgstr ""
 "\n"
 "Mи≥slи≥k:\t"
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -218,7 +228,7 @@ msgstr ""
 "\n"
 "Quruluе÷:\t"
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -226,7 +236,7 @@ msgstr ""
 "\n"
 "   Ad:\t"
 
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -234,7 +244,7 @@ msgstr ""
 "\n"
 "   Bц╤lmи≥:\t"
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -242,7 +252,7 @@ msgstr ""
 "\n"
 "   Bц╤lmи≥2:\t"
 
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -250,7 +260,7 @@ msgstr ""
 "\n"
 "   Bц╤lmи≥3:\t"
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -258,7 +268,7 @@ msgstr ""
 "\n"
 "   Bц╤lmи≥4:\t"
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -266,7 +276,7 @@ msgstr ""
 "\n"
 "Kateqoriyalar:\t"
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -284,7 +294,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -292,7 +302,7 @@ msgstr ""
 "\n"
 "Yeganи≥ Kи≥limи≥:\t"
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -300,27 +310,25 @@ msgstr ""
 "\n"
 "ц°mumi Aц╖ar:\t"
 
-#: addressbook/backend/ebook/e-destination.c:232
-msgid "???"
-msgstr "???"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr "'GnomeCard' fayllarд╠nд╠ 'Evolution' iц╖inи≥ gи≥tirи≥n e'malatxana."
+#: addressbook/backend/ebook/e-card.c:4037
+#, fuzzy
+msgid "Multiple VCards"
+msgstr "ц┤oxlu д╟smarд╠c"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "'GnomeCard' fayllarд╠nд╠ 'Evolution' iц╖inи≥ gи≥tirir."
+#: addressbook/backend/ebook/e-card.c:4045
+#, fuzzy, c-format
+msgid "VCard for %s"
+msgstr "%s ц╪ц╖ц╪n parol girin"
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Bonoboyu baе÷lada bilmи≥dim"
 
@@ -333,14 +341,14 @@ msgid "EBook not loaded\n"
 msgstr "eKitab yц╪klи≥nmи≥di\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Wombat xidmи≥ti baе÷ladд╠la bilmи≥di"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Wombatд╠ baе÷lada bilmи≥dim"
 
@@ -349,725 +357,845 @@ msgstr "Wombatд╠ baе÷lada bilmи≥dim"
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot ц°nvan и≥lavи≥lи≥ri bloku oxuna bilmи≥di"
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr "Bonobonun ц╪nvan nц╪mayiе÷ etdirmи≥ vasitи≥si."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "Bonobonun ц╪nvan nц╪mayiе÷ etdirmи≥  vasitи≥si."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "ц°nvan dи≥ftи≥ri gц╤stи≥rи≥n nц╪munи≥vi Bonobo idarи≥si."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Evolution ц╪nvan dи≥ftи≥ri kiц╖ik kartlarд╠nд╠ gц╤stи≥rи≥n idarи≥."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Evolution ц°nvan Dи≥ftи≥ri kiц╖ik kart nц╪maiyiе÷i"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "ф▐laqи≥lи≥ri idarи≥ edici 'Evolution' и≥lavи≥si."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr "'Evolution'un ц°nvan Dи≥ftи≥ri Kiц╖ik Kart e'malatxanasд╠"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr "ц°nvan Dи≥ftи≥riidи≥ ц╪nvan gц╤stи≥rici"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr "ц°nvan Dи≥ftи≥rindи≥ ц╪nvan gц╤stи≥rici e'malatxanasд╠"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr "'Evolution'un ц°nvan Dи≥ftи≥ri e'malatxanasд╠."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr "Nц╪munи≥vi ц╪nvan dи≥ftи≥ri idarи≥si e'malatxanasд╠"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "LDAP Vericisi"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Fayl"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Namи≥'lum ц╪nvan dи≥ftи≥ri"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "Heц╖ biri (adsд╠z halд╠)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Parol"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Namи≥'lum tanд╠tma nц╤vц╪"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "ф▐sas"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "Bir"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "Alt Aд÷ac"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr "Namи≥'lum hи≥rи≥kи≥t nц╤vц╪"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr "Cild DN:"
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr "FIZME DN Kц╤mи≥k Mи≥tnini bura cala"
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Bu parolu yadda saxla"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "Ev Sahibi:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr "FIXME Yuva kц╤mи≥k mwtni burada."
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "Kц╤k DN :"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr "FIXME Kц╤k Dn kц╤mи≥k mи≥tni burda."
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Qapд╠:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr "FIXME Qapд╠ kц╤mи≥k mи≥tni burda."
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "Axtarд╠е÷ Hи≥rи≥kи≥ti ..."
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Tanд╠tma :"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Yol:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr "FIXME Cд╠д÷д╠r Kц╤mи≥k mи≥tni burda."
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "Belи≥ bir yol yoxdursa yarat."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "ц°nvan dи≥ftи≥rini dц╪zи≥lt"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "ц°nvan dи≥ftи≥ri и≥lavи≥ et"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"Sahib olduд÷unuz ц╪nvan dи≥ftи≥ri nц╖vц╪nц╪ seц╖in, bunu haqqд╠nda lazд╠mi "
+"mи≥'lumatlarд╠ bildirin."
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Ad :"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr "FIXME Ad kц╤mи≥k mи≥tbi burda."
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "д╟zah :"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr "FIXME д╟zah kц╤mи≥k mи≥tbi burda."
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "ф▐lavи≥ Et"
+msgid "Addressbook Sources"
+msgstr "ц°nvan Dи≥ftи≥ri Qaynaд÷д╠"
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Sil"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Ad"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "_ф▐lavи≥ Et"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "_Dц╪zи≥lt"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "Digи≥r ф▐laqи≥lи≥r"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "%s ц╪ц╖ц╪n parol girin"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "ц°nvan dи≥ftи≥rini aц╖a bilmи≥dim"
+
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
+msgstr "Daxil edи≥n hи≥r hansд╠ ц╪zv"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "Ad daxil edи≥n"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "ePoц╖t daxil edи≥n"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "Ad daxil edи≥n"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "Qovluq Sи≥yyahд╠nд╠ gц╤stи≥rи≥cи≥k olan URI"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "д╟lk ePoц╖t ц╪nvanд╠"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "2.nci ePoц╖t ц╪nvanд╠"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "3.ncц╪ ePoц╖t ц╪nvanд╠"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "Fayl seц╖"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Yeni bir hesab yarat"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "ц°nvan dи≥ftи≥rini dц╪zи≥lt"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "ф▐laqи≥ Mи≥'lumatд╠nд╠ Dц╪zи≥lt"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "ф▐laqи≥lи≥rи≥ ф▐lavи≥ Et"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "ePoц╖t ц°nvanд╠: "
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "Sorд÷ularд╠ Baд÷la"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Sorд÷ularд╠ Fи≥allaе÷dд╠r (Tи≥hlц╪kи≥lidir!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Evolution ц°nvan Dи≥ftи≥ri ad seц╖mи≥ ara ц╪zц╪."
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr "Evolution ц°nvan Dи≥ftи≥ri ad seц╖mи≥ ara ц╪zц╪ e'malatxanasд╠"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Sil"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "Hamд╠sд╠nд╠ Sil"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "E-poц╖t Gц╤ndи≥rilir"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Digи≥r ф▐laqи≥lи≥r"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "Alд╠cд╠lar Siyahд╠sд╠ :"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "Ad Seц╖"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "Adд╠ buradan seц╖:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "Kateqoriyalar:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "A_xtar"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "_д╟l dц╤nц╪mц╪ :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "_Mи≥slи≥k"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "Mи≥slи≥ki _Faks"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "_ф▐laqи≥lи≥r ..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Nц╤_vlи≥r..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "ф▐laqи≥ dц╪zи≥ldicisi"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "ф▐traflд╠"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Fи≥rqli fayllalи≥:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "ц°mumi"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Yeni telefon nц╤vц╪"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "_Qeydlи≥r:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Orqanizasiya"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Telefon Nц╤vlи≥ri"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
-msgstr "д╟lk ePoц╖t ц╪nvanд╠"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "_HTML ePoц╖tlarд╠nд╠ qи≥bul edir"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Web sи≥hifи≥si :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
-msgstr "_ф▐lavи≥ Et"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "_ц°nvan..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "_Kц╤mи≥kц╖i adд╠ :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "_Ad gц╪nц╪ :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Mи≥slи≥k"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "е·_irkи≥t :"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "_ф▐laqи≥lи≥r ..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:639 mail/mail-config.glade.h:75
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:98
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Sil"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "_Bц╤lmи≥ :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "_Tam Ad ..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_Ev"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "Mи≥slи≥k _izahд╠:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "_д╟darи≥cinin Adд╠ :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_Cib"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "_Lи≥qи≥b :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "_д╟darи≥ :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_Mи≥slи≥k :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "_Yoldaе÷:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "_Bu ePoц╖t ц╪nvanд╠dд╠r"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "ф▐laqи≥ni Silimmi?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "Bu ц╪zv bu kateqoriyalara aitdir:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Kц╤mи≥kц╖i"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Mи≥slи≥k"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "2.nci Mи≥slи≥k"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Mи≥slи≥ki Faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Geri axtarma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Maе÷д╠n"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "е·irkи≥t"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Ev"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "2.nci ev"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Ev faksд╠"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Cib telefonu"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Baе÷qa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Baе÷qa faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Peycer"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "д╟lk"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
-msgid "Email 2"
-msgstr "2.nci ePoц╖t ц╪nvanд╠"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
-msgid "Email 3"
-msgstr "3.ncц╪ ePoц╖t ц╪nvanд╠"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "ф▐laqи≥ni Silimmi?"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:233
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Cи≥ld ф▐laqи≥ ф▐lavи≥si"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:235
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "Hamд╠sд╠nд╠ Dц╪zи≥lt"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:276
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Tam Ad"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:282
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "ePoц╖t"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "ц°nvan _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Kanada"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "ц°nvanд╠ Yoxla"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "ц√l_kи≥:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Finlandiya"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "ABе·"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_ц°nvan :"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_е·и≥hи≥r:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "_Poц╖t Qutusu:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "_Vilayи≥t"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "_ZIP Kodu:"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Tam adд╠ yoxla"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Esq."
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "Miss"
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Mr."
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Mrs."
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Ms."
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Ad :"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_Soyad :"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Orta ad:"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_Suffiks:"
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "B_aе÷lд╠q:"
 
-#: addressbook/gui/component/addressbook.c:241
-msgid "As _Minicards"
-msgstr "_Balaca kartlar olaraq"
-
-#: addressbook/gui/component/addressbook.c:247
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "_Cи≥dvи≥l olaraq"
-
-#: addressbook/gui/component/addressbook.c:407
-#, c-format
-msgid "Enter password for %s"
-msgstr "%s ц╪ц╖ц╪n parol girin"
-
-#: addressbook/gui/component/addressbook.c:435
-msgid "Unable to open addressbook"
-msgstr "ц°nvan dи≥ftи≥rini aц╖a bilmи≥dim"
-
-#: addressbook/gui/component/addressbook.c:440
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Bu ц╪nvan dи≥ftи≥rini aц╖a bilmи≥dik. Bu ya sи≥hv bir\n"
-"URI'nin bildirilmи≥sindи≥n ц╤trц╪ ya da LDAP dи≥stи≥yi \n"
-"olmayan bir vericiyи≥ ц╖atmaq istи≥mи≥sindи≥n ц╤trц╪dц╪r.\n"
-"Bir URI bildirdin isи≥, URI'nin dц╪z olduд÷unu yoxla vи≥\n"
-"yenи≥ sд╠na. Bir URI bildirimи≥din isи≥, bir LDAP vericisinи≥\n"
-"ц╖atmaq istи≥din. LDAp'д╠ istifadи≥ etmи≥k istи≥yirsи≥nsи≥ , OpenLDAPi(д╠)\n"
-"qurub, Evolution'u yenidи≥n yoxlayд╠b yenidи≥n qurmaq "
-"mи≥cburiyyи≥tindи≥sи≥n.\n"
-
-#: addressbook/gui/component/addressbook.c:563 widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Hamд╠sд╠nд╠ Gц╤stи≥r"
-
-#: addressbook/gui/component/addressbook.c:565 widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
-msgstr "ф▐traflд╠..."
-
-#: addressbook/gui/component/addressbook.c:595 calendar/gui/gnome-cal.c:236
-msgid "Any field contains"
-msgstr "Daxil edи≥n hи≥r hansд╠ ц╪zv"
-
-#: addressbook/gui/component/addressbook.c:596
-msgid "Name contains"
-msgstr "Ad daxil edи≥n"
-
-#: addressbook/gui/component/addressbook.c:597
-msgid "Email contains"
-msgstr "ePoц╖t daxil edи≥n"
-
-#: addressbook/gui/component/addressbook.c:740
-msgid "The URI that the Folder Browser will display"
-msgstr "Qovluq Sи≥yyahд╠nд╠ gц╤stи≥rи≥cи≥k olan URI"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "LDAP Vericisi"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Fayl"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Namи≥'lum ц╪nvan dи≥ftи≥ri"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "Heц╖ biri (adsд╠z halд╠)"
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
-msgid "Password"
-msgstr "Parol"
-
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:170
-msgid "Unknown auth type"
-msgstr "Namи≥'lum tanд╠tma nц╤vц╪"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "Base"
-msgstr "ф▐sas"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "One"
-msgstr "Bir"
-
-#: addressbook/gui/component/addressbook-config.c:183
-msgid "Subtree"
-msgstr "Alt Aд÷ac"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Unknown scope type"
-msgstr "Namи≥'lum hи≥rи≥kи≥t nц╤vц╪"
-
-#: addressbook/gui/component/addressbook-config.c:353
-msgid "Bind DN:"
-msgstr "Cild DN:"
-
-#: addressbook/gui/component/addressbook-config.c:354
-msgid "FIXME Bind DN Help text here"
-msgstr "FIZME DN Kц╤mи≥k Mи≥tnini bura cala"
-
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
-msgstr "Bu parolu yadda saxla"
-
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
-msgid "Host:"
-msgstr "Ev Sahibi:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Host help text here."
-msgstr "FIXME Yuva kц╤mи≥k mwtni burada."
-
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Port:"
-msgstr "Qapд╠:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "Fayl adд╠ :"
 
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
-msgstr "FIXME Qapд╠ kц╤mи≥k mи≥tni burda."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "Dekabr"
 
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
-msgstr "Kц╤k DN :"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
-msgstr "FIXME Kц╤k Dn kц╤mи≥k mи≥tni burda."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:435
-msgid "Search Scope:"
-msgstr "Axtarд╠е÷ Hи≥rи≥kи≥ti ..."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
+msgstr "Sil"
 
-#: addressbook/gui/component/addressbook-config.c:489
-msgid "Authentication:"
-msgstr "Tanд╠tma :"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "ф▐laqи≥ dц╪zи≥ldicisi"
 
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
-msgid "Path:"
-msgstr "Yol:"
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "ф▐laqи≥ dц╪zи≥ldicisi"
 
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "FIXME Path Help text here"
-msgstr "FIXME Cд╠д÷д╠r Kц╤mи≥k mи≥tni burda."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:513
-msgid "Create path if it doesn't exist."
-msgstr "Belи≥ bir yol yoxdursa yarat."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:647
-msgid "Edit Addressbook"
-msgstr "ц°nvan dи≥ftи≥rini dц╪zи≥lt"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#, fuzzy
+msgid "New Contact:"
+msgstr "Yeni и≥laqи≥"
 
-#: addressbook/gui/component/addressbook-config.c:649
-msgid "Add Addressbook"
-msgstr "ц°nvan dи≥ftи≥ri и≥lavи≥ et"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#, fuzzy
+msgid "Original Contact:"
+msgstr "Digи≥r ф▐laqи≥lи≥r"
 
-#: addressbook/gui/component/addressbook-config.c:665
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
 msgstr ""
-"Sahib olduд÷unuz ц╪nvan dи≥ftи≥ri nц╖vц╪nц╪ seц╖in, bunu haqqд╠nda lazд╠mi "
-"mи≥'lumatlarд╠ bildirin."
-
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
-msgid "Name:"
-msgstr "Ad :"
-
-#: addressbook/gui/component/addressbook-config.c:672
-msgid "FIXME Name help text here"
-msgstr "FIXME Ad kц╤mи≥k mи≥tbi burda."
-
-#: addressbook/gui/component/addressbook-config.c:674
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "д╟zah :"
-
-#: addressbook/gui/component/addressbook-config.c:675
-msgid "FIXME Description help text here"
-msgstr "FIXME д╟zah kц╤mи≥k mи≥tbi burda."
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "ц°nvan Dи≥ftи≥ri Qaynaд÷д╠"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:19
-#: mail/message-browser.c:203 ui/evolution-addressbook.xml.h:3
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Sil"
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "Dц╪zи≥lt"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Ad"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+msgid "Changed Contact:"
 msgstr "Digи≥r ф▐laqи≥lи≥r"
 
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "Sorд÷ularд╠ Baд÷la"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "Sorд÷ularд╠ Fи≥allaе÷dд╠r (Tи≥hlц╪kи≥lidir!)"
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
-msgstr "ф▐laqи≥ Mи≥'lumatд╠nд╠ Dц╪zи≥lt"
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
-msgid "Add to Contacts"
-msgstr "ф▐laqи≥lи≥rи≥ ф▐lavи≥ Et"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Bonobonun ц╪nvan nц╪mayiе÷ etdirmи≥ vasitи≥si."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Bonobonun ц╪nvan nц╪mayiе÷ etdirmи≥  vasitи≥si."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "ц°nvan dи≥ftи≥ri gц╤stи≥rи≥n nц╪munи≥vi Bonobo idarи≥si."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Evolution ц╪nvan dи≥ftи≥ri kiц╖ik kartlarд╠nд╠ gц╤stи≥rи≥n idarи≥."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution ц°nvan Dи≥ftи≥ri kiц╖ik kart nц╪maiyiе÷i"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "ф▐laqи≥lи≥ri idarи≥ edici 'Evolution' и≥lavи≥si."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr "'Evolution'un ц°nvan Dи≥ftи≥ri Kiц╖ik Kart e'malatxanasд╠"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "ц°nvan Dи≥ftи≥riidи≥ ц╪nvan gц╤stи≥rici"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
-msgstr "ц°nvan Dи≥ftи≥rindи≥ ц╪nvan gц╤stи≥rici e'malatxanasд╠"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "'Evolution'un ц°nvan Dи≥ftи≥ri e'malatxanasд╠."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
-msgstr "Nц╪munи≥vi ц╪nvan dи≥ftи≥ri idarи≥si e'malatxanasд╠"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
-msgstr "Sil"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
-msgid "Remove All"
-msgstr "Hamд╠sд╠nд╠ Sil"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Evolution ц°nvan Dи≥ftи≥ri ad seц╖mи≥ ara ц╪zц╪."
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Evolution ц°nvan Dи≥ftи≥ri ad seц╖mи≥ ara ц╪zц╪ e'malatxanasд╠"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Tap..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Alд╠cд╠lar Siyahд╠sд╠ :"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Ad Seц╖"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Adд╠ buradan seц╖:"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
+msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Axtar"
 
@@ -1179,156 +1307,254 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "VCard olaraq qeyd et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr "ф▐laqи≥ni baе÷qasд╠na gц╤ndи≥r"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Send message to contact"
 msgstr "ф▐laqи≥yи≥ yeni bir ismarд╠c gц╤ndи≥r"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/message-browser.c:200
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:55 ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "ц┤ap Et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr "Zи≥rfi ц┤ap Et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Sil"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "%s yц╪klи≥nи≥rkи≥n xи≥ta oldu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "Qaynaqlar"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Namи≥'lum xи≥ta"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "Xи≥tdи≥n Qopuq д╟е÷lи≥"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "Qadaд÷andд╠r"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "Fayl tapд╠la bilmи≥di"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "ф▐mи≥liyyat dи≥stи≥klи≥nmir"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "Lи≥д÷v Edildi"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "G/ц┤ xи≥tasд╠"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "%s yц╪klи≥nи≥rkи≥n xи≥ta oldu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "%s yц╪klи≥nи≥rkи≥n xи≥ta oldu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "%s yц╪klи≥nи≥rkи≥n xи≥ta oldu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "%s yц╪klи≥nи≥rkи≥n xи≥ta oldu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr ""
+" Data oxunarkи≥n xи≥ta oldu:\n"
+"%s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* ф▐laqи≥ и≥lavи≥ etmи≥k ц╪ц╖ц╪n buraya tд╠qlayд╠n *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr "Fи≥rqli faylla"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "ePoц╖t"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "ф▐sas Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr "Kц╤mи≥kц╖i Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "д╟е÷ Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr "Geri axtarma Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "е·irkи≥t Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "Ev Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "е·irkи≥t"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "д╟е÷ ц°nvanд╠"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "Ev ц°nvanд╠"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "ф▐l Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "Maе÷д╠n Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "2.nci д╟е÷ Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "2.nci Ev Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "Digи≥r Telefonlar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "Baе÷qaц°nvanlar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Web Sи≥hifи≥si"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "Bц╤lmи≥"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "д╟darи≥"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "Baе÷lд╠q"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Mи≥slи≥k"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "д╟darи≥ci"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Lи≥qи≥b"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "Yoldaе÷"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Qeyd"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr "Sи≥rbи≥st/mи≥е÷д÷ul URL"
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "Qurtardд╠"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "Tи≥qvim yц╪klи≥nir..."
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "ц°nvan dи≥ftи≥rinи≥ qeyd et"
 
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1371,7 +1597,8 @@ msgid "Dimensions:"
 msgstr "ц√lц╖ц╪lи≥r :"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Yazд╠ nц╤vц╪ ..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1431,7 +1658,6 @@ msgid "Margins"
 msgstr "Kи≥narlar"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "Sц╪tunlarд╠n miqdarд╠ :"
 
@@ -1511,37 +1737,62 @@ msgstr "Nц╤v:"
 msgid "Width:"
 msgstr "En :"
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Yazд╠ nц╤vц╪ ..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Tи≥qvim vericisi ilи≥ baд÷lantд╠ qurulurkи≥n xи≥ta oldu"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "Pilot Tи≥qvim и≥lavи≥lи≥ri bloku oxuna bilmи≥di"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilot Edilи≥cи≥klи≥r и≥lavи≥lи≥ri bloku oxuna bilmи≥di"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "д╟clas bildiricisi "
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Tи≥qvim gц╤stи≥rи≥n Bonobo idarи≥ nц╪munи≥si."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Mц╪rgц╪lи≥"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr "Evolutionun д╟cracд╠ mц╪ndи≥ricat parц╖asд╠."
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Oldu"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolution Tи≥qvim iTip/iMip Nц╪mayiе÷ц╖isi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr "'Evolution'un Tи≥qvim и≥lavи≥si."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr "Tи≥qvim Mц╪ndи≥ricatд╠ parц╖asд╠ e'malatxanasд╠."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr "Evolutionun tи≥qvim parц╖asд╠nд╠n mи≥rkи≥zi."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr "Tи≥qvim iTip nц╪mayiе÷ idarи≥si e'malatxanasд╠."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr "Nц╪munи≥vi Tи≥qvim idarи≥si e'malaxanasд╠"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Evolutionun tи≥qvim parц╖asд╠nд╠n mи≥rkи≥zi."
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1551,7 +1802,92 @@ msgstr "Alarm vermи≥ xidmи≥ti"
 msgid "Factory for the alarm notification service"
 msgstr "Alarm vermи≥ xidmи≥ti e'malatxanasд╠"
 
-#: calendar/gui/alarm-notify/notify-main.c:56
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "%A %b %d %Y %H:%M'dи≥ki iclas ц╪ц╖ц╪n bildiriе÷"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "%A %b %d %Y %H:%M'dи≥ki iclas ц╪ц╖ц╪n bildiriе÷"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "%A %b %d %Y %H:%M'dи≥ki iclas ц╪ц╖ц╪n bildiriе÷"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "%A %b %d %Y %H:%M'dи≥ki iclas ц╪ц╖ц╪n bildiriе÷"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "%A %b %d %Y %H:%M'dи≥ki iclas ц╪ц╖ц╪n bildiriе÷"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "%A %b %d %Y %H:%M'dи≥ki iclas ц╪ц╖ц╪n bildiriе÷"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "%A %b %d %Y %H:%M'dи≥ki iclas ц╪ц╖ц╪n bildiriе÷"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "\"Evolution\" haqqд╠nda mи≥'lumat gц╤stи≥r"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "%A %b %d %Y %H:%M'dи≥ bildir"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Qapat"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "Mц╪rgц╪lи≥"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "Xи≥bи≥rdarlд╠q vaxtд╠ ( dи≥qiqи≥ )"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "д╟clasд╠ dц╪zи≥lt"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "Mц╪ndи≥ricat yoxdur."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "д╟clas bildiricisi "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "Mц╪rgц╪lи≥"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Oldu"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
 "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
@@ -1560,134 +1896,164 @@ msgstr ""
 "Bu, %s dir(dд╠r).  д╟ndiki Unix vaxtд╠ da %ld dir(dд╠r). Bи≥lkи≥ bilmи≥k "
 "istи≥yи≥rsinizdeyи≥ fikirlи≥е÷dik."
 
-#: calendar/gui/alarm-notify/notify-main.c:93 calendar/gui/main.c:52
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
 msgid "Could not initialize GNOME"
 msgstr "GNOME baе÷ladд╠la bilmи≥di"
 
-#: calendar/gui/alarm-notify/notify-main.c:108
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Bonoboyu baе÷lada bilmи≥dim"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
 msgid "Could not create the alarm notify service factory"
 msgstr "Alarm vermи≥ xidmи≥ti e'malatxanasд╠ yaradд╠la bilmir"
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
-msgstr "Fayl tapд╠la bilmи≥di"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A, %e %B %Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %b %d"
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
-msgstr "Tи≥qvimi aц╖"
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %b %d"
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
-msgstr "Tи≥qvimi qeyd et"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: calendar/gui/calendar-commands.c:468
-msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
+#: calendar/gui/calendar-commands.c:586
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Tи≥qvimin gц╤rц╪nц╪е÷ц╪ quraе÷dд╠rд╠la bilmir. Lц╪tfи≥n ORBIT vи≥ OAF "
 "qurд÷ularд╠nд╠zд╠ yoxlayд╠n."
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "ц°mumi"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "е·и≥xsi"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Gizli"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1606
-#: calendar/gui/event-editor.c:1633
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Namи≥'lum"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "Baz."
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "ц┤и≥rе÷."
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:691
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Yц╪ksи≥k"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
-#: calendar/gui/calendar-model.c:1574
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:690
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:689
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Alц╖aq"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "е·и≥ffaf"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Mat"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Baе÷lamayд╠b"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "д╟е÷lи≥yir"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "Bitirmи≥ Tarixi"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:544
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Lи≥д÷v Edildi"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:802
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1698,22 +2064,28 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:882
-msgid "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
-msgstr "Siniflи≥dirmи≥ 'ц°mumi', 'Xц╪susi', 'Gizli' ya da 'Heц╖ Biri' olmalд╠dд╠r"
+#: calendar/gui/calendar-model.c:981
+msgid ""
+"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+msgstr ""
+"Siniflи≥dirmи≥ 'ц°mumi', 'Xц╪susi', 'Gizli' ya da 'Heц╖ Biri' olmalд╠dд╠r"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
-#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1198
-#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
-#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Yoxdur"
 
-#: calendar/gui/calendar-model.c:970
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1723,116 +2095,295 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1010
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Faiz qiymи≥ti ikisi dи≥ daxil olam ц╪zи≥rи≥ 0 ilи≥ 100 arasд╠nda olmalд╠dд╠r"
+msgstr ""
+"Faiz qiymи≥ti ikisi dи≥ daxil olam ц╪zи≥rи≥ 0 ilи≥ 100 arasд╠nda olmalд╠dд╠r"
 
-#: calendar/gui/calendar-model.c:1051
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
-msgstr "ц°stц╪nlц╪k 'Yц╪ksи≥k', 'Normal', 'Alц╖aq' vи≥ ya 'Tи≥svirsiz' ola bilи≥r."
+msgstr ""
+"ц°stц╪nlц╪k 'Yц╪ksи≥k', 'Normal', 'Alц╖aq' vи≥ ya 'Tи≥svirsiz' ola bilи≥r."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1064
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Tи≥svirsiz"
 
-#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
-msgstr "е·и≥ffaflд╠q 'е·и≥ffaf', 'д╟е÷д╠q Keц╖irmи≥z' vи≥ ya 'Heц╖ Biri' olmalд╠dд╠r."
+msgstr ""
+"е·и≥ffaflд╠q 'е·и≥ffaf', 'д╟е÷д╠q Keц╖irmи≥z' vи≥ ya 'Heц╖ Biri' olmalд╠dд╠r."
 
-#: calendar/gui/calendar-model.c:1576
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "Tи≥krarlayan"
 
-#: calendar/gui/calendar-model.c:1578
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Vи≥zifи≥lи≥ndirilmiе÷"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Bи≥li"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Xeyr"
 
-#: calendar/gui/calendar-summary.c:198
-msgid "%A, %e %B %Y"
-msgstr "%A, %e %B %Y"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "Kart Nц╪mayiе÷i "
 
-#: calendar/gui/calendar-summary.c:207
-msgid "Appointments"
-msgstr "Gц╤rц╪е÷lи≥r"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "д╟_е÷  hи≥ftи≥si"
 
-#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "Gц╤rц╪nц╪е÷lи≥ri Mц╪и≥yyи≥nlи≥е÷dir"
 
-#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:948
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Vи≥zifи≥"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "Ay"
 
-#: calendar/gui/calendar-summary.c:443
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Tи≥qvim yц╪klи≥mи≥ xи≥tasд╠</b>"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "Tи≥qvimin gц╤stи≥rи≥cи≥yi URI"
 
-#: calendar/gui/calendar-summary.c:455
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Tи≥qvim yц╪klи≥mи≥ xи≥tasд╠:<br>Bu yol dи≥stи≥klanmir"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "Sи≥sli Alarmlar"
 
-#: calendar/gui/calendar-summary.c:622
-msgid "Display"
-msgstr "Ekran"
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "Alд╠cд╠lar Siyahд╠sд╠ :"
 
-#: calendar/gui/calendar-summary.c:627
-msgid "Show appointments"
-msgstr "Gц╤rц╪е÷lи≥ri gц╤stи≥r"
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "Gц╤stи≥rmи≥ Seц╖и≥nи≥klи≥ri :"
 
-#: calendar/gui/calendar-summary.c:635
-msgid "Show tasks"
-msgstr "Vи≥zifи≥lи≥ri gц╤stи≥r"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:690
-msgid "Things to do"
-msgstr "Edilи≥cи≥klи≥r"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Tи≥qvim yц╪klи≥nir"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "Tи≥qvimin gц╤stи≥rи≥cи≥yi URI"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "%A %b %d %Y %H:%M'dи≥ bildir"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "д╟smarд╠c saxlanmasд╠"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "%A %b %d %Y %H:%M'dи≥ki iclas ц╪ц╖ц╪n bildiriе÷"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Sи≥s ц╖al"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
-msgstr "Mц╪ndи≥ricat yoxdur."
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Qapat"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "Proqramд╠ iе÷и≥ sal"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "д╟clasд╠ dц╪zи≥lt"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Xи≥bи≥rdarlд╠q vaxtд╠ ( dи≥qiqи≥ )"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "gц╪n"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "Gц╪ncи≥llи≥mи≥lri hи≥r "
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "saat"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "dи≥qiqи≥"
+
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr "%d gц╪n"
+
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr "1 gц╪n"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr "%d hи≥ftи≥"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr "2 hи≥ftи≥"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr "%d saat"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr "1 saat"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr "%d dи≥qiqи≥"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr "1 dи≥qiqи≥"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr "%d saniyи≥"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr "1 saniyи≥"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr "Sи≥s ц╖al"
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "Bц╪tц╪n ismarд╠c baе÷lд╠qlarд╠nд╠ gц╤stи≥r"
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an email"
+msgstr "ePoц╖t gц╤ndи≥r"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr "Proqramд╠ iе÷и≥ sal"
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr "iclasд╠n baе÷lanд÷д╠cд╠ndan и≥vvи≥l"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr "iclasд╠n baе÷lanд÷д╠cд╠ndan sonra"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr "iclas qurtarandan и≥vvи≥l"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr "iclas qurtarandan sonra"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "ф▐sas"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "Tarix vи≥ Vaxt"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "Xatд╠rladд╠cд╠lar"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Mц╪ndи≥ricat:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_Seц╖и≥nи≥klи≥r"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "sonra"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "и≥vvи≥l"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "gц╪n(lи≥r)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr "gц╤rц╪е÷ц╪n sonu"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr "saat"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+msgid "minute(s)"
+msgstr "dи≥qiqи≥"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
+msgstr "iclasд╠n baе÷lanд÷д╠cд╠"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
@@ -1863,36 +2414,38 @@ msgid "60 minutes"
 msgstr "60 dи≥qiqи≥"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Zд╠nqд╠rovun sи≥s kи≥silmи≥si mц╪ddи≥ti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Sи≥sli Alarmlar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "Alarm pи≥ncи≥rи≥si ц╖д╠xanda biiplи≥."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Tи≥qvim"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "Tи≥qvim Seц╖и≥nи≥klи≥ri"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Rи≥nglи≥r"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+#, fuzzy
+msgid "Compress weekends in month view"
 msgstr "Hи≥ftи≥ sonlarд╠nд╠ sд╠xд╠е÷dд╠r"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+#, fuzzy
+msgid "Date Navigator"
 msgstr "Tarix sи≥yyahд╠ xц╪susiyyи≥tlи≥ri"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1900,583 +2453,1085 @@ msgid "Defaults"
 msgstr "ф▐saslar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Gц╤stи≥rmи≥ Seц╖и≥nи≥klи≥ri :"
+#: mail/mail-config.glade.h:30
+msgid "Display"
+msgstr "Ekran"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
-msgstr "Uyд÷un Tarix"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Xи≥bardarlд╠д÷д╠ Fи≥allaе÷dд╠r"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Gц╪n sonu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Hи≥ftи≥nin ilk gц╪nц╪:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "Cц╪m"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:484
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Cц╪mи≥"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "д╟е÷arи≥tlи≥"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "Bц╪gunki д╟е÷lи≥r"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Bц╪gunkц╪ д╟е÷lи≥r:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Hи≥lи≥ Bitirilmи≥miе÷ д╟е÷lи≥r"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Hи≥lи≥ Bitirilmи≥miе÷ д╟е÷lи≥r:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "B.e"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Bazar ertи≥si"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Vaxtд╠ Keц╖miе÷ д╟е÷lи≥r"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "Vaxtд╠ Keц╖miе÷ д╟е÷lи≥r:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
-msgstr "Rи≥ng al"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "ц°stц╪nlц╪k"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#, fuzzy
+msgid "Overdue tasks"
+msgstr "Vaxtд╠ Keц╖miе÷ д╟е÷lи≥r"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Bц╪tц╪n Gц╤rц╪е÷lи≥rimi Bildir"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Xatд╠rladд╠cд╠lar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "е·n"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:485
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "е·и≥nbи≥"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Gц╤stи≥r"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "Gц╤rц╪е÷lи≥rin sonlanma tarixini gц╤stи≥r"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Hи≥ftи≥ Sayд╠sд╠nд╠ gц╤stи≥r"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "Gц╪bц╪b baе÷lanд÷д╠cд╠:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "Baz"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:486
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Bazar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "Vи≥zifи≥ Taxtasд╠"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "Vи≥zifи≥"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "Bц╪gunki д╟е÷lи≥r"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "C.a"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Cц╪mи≥ Axе÷amд╠"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Keц╖mи≥sinи≥ qи≥dи≥r qalan vaxt"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Time"
+msgstr "Baе÷lд╠q"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "Vaxt Dilimlи≥ri:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Vaxt е·и≥kli:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"Zaman zolaд÷д╠:  "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "ц┤.a"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "ц┤и≥rе÷и≥nbи≥ axе÷amд╠"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Gц╤stи≥riе÷li Xи≥bи≥rdarlд╠qlar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "ц┤и≥r"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "ц┤и≥rе÷и≥nbи≥"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "д╟е÷ Hи≥ftи≥si"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
+msgstr "д╟_е÷  hи≥ftи≥si"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "dи≥qiqи≥ и≥vvи≥lindи≥ onlar meydana ц╖д╠xд╠rlar."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
-msgid "seconds."
-msgstr "saniyи≥."
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "Bu hesabд╠ hи≥qiqи≥tи≥n dи≥ silmи≥k istи≥yirsiniz?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "Bu `%s' vи≥zifи≥sini hи≥qiqи≥tи≥n dи≥ silmи≥k istи≥yirsiniz?"
 
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "Bu `%s' jurnal giriе÷ini hи≥qiqи≥tи≥n dи≥ silmи≥k istи≥yirsiniz?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "Bitirmи≥ Tarixi"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "Bitirmи≥ Tarixi"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#, fuzzy
+msgid "Due "
+msgstr "Uyд÷un Tarix"
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "д╟clasд╠ dц╪zи≥lt"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "д╟clas - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "Vи≥zifи≥ - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Jurnal ц╪zvц╪ - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Mц╪ndи≥ricat yoxdur"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "Faylд╠nд╠n ц╪sц╪tц╪nи≥ yazд╠m mд╠?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Eyni adlд╠ bir fayl onsuz da vardд╠r.\n"
+"ц°stц╪nи≥ yazд╠m mд╠?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Fи≥rqli Qeyd Et ..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Bu  `%s' gц╤rц╪е÷ц╪nц╪ hи≥qiqи≥tи≥n dи≥ silmи≥k istи≥yirsiniz?"
 
-#: calendar/gui/dialogs/delete-comp.c:73
+#: calendar/gui/dialogs/delete-comp.c:87
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Bu adsд╠z gц╤rц╪е÷ц╪ hи≥qiqи≥tи≥n dи≥ silmи≥k istи≥yirsiniz?"
 
-#: calendar/gui/dialogs/delete-comp.c:79
+#: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Bu `%s' vи≥zifи≥sini hи≥qiqи≥tи≥n dи≥ silmи≥k istи≥yirsiniz?"
 
-#: calendar/gui/dialogs/delete-comp.c:82
+#: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Bu adsд╠z vи≥zifи≥sini hи≥qiqи≥tи≥n dи≥ silmи≥k istи≥yirsiniz?"
 
-#: calendar/gui/dialogs/delete-comp.c:88
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Bu `%s' jurnal giriе÷ini hи≥qiqи≥tи≥n dи≥ silmи≥k istи≥yirsiniz?"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Bu adsд╠z jurnal giriе÷ini hи≥qiqи≥tи≥n dи≥ silmи≥k istи≥yirsiniz?"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Dи≥yiе÷ikliklи≥ri qeyd etmи≥k istи≥yirsinizimi?"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "Bu  `%s' gц╤rц╪е÷ц╪nц╪ hи≥qiqи≥tи≥n dи≥ silmи≥k istи≥yirsiniz?"
 
-#: calendar/gui/dialogs/task-editor.c:707
-msgid "Edit Task"
-msgstr "Vи≥zifи≥ni Dц╪zи≥lt"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "Bu `%s' vи≥zifи≥sini hи≥qiqи≥tи≥n dи≥ silmи≥k istи≥yirsiniz?"
 
-#: calendar/gui/dialogs/task-editor.c:713 calendar/gui/event-editor.c:382
-msgid "No summary"
-msgstr "Mц╪ndи≥ricat yoxdur"
+#: calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "Bu `%s' jurnal giriе÷ini hи≥qiqи≥tи≥n dи≥ silmи≥k istи≥yirsiniz?"
 
-#: calendar/gui/dialogs/task-editor.c:719 calendar/gui/event-editor.c:388
-#, c-format
-msgid "Appointment - %s"
-msgstr "д╟clas - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Fayl seц╖"
 
-#: calendar/gui/dialogs/task-editor.c:722 calendar/gui/event-editor.c:391
-#, c-format
-msgid "Task - %s"
-msgstr "Vи≥zifи≥ - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Bц╤lmи≥lи≥r :"
 
-#: calendar/gui/dialogs/task-editor.c:725 calendar/gui/event-editor.c:394
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Jurnal ц╪zvц╪ - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Zaman zolaд÷д╠:  "
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% _Qurtardд╠:"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
+msgstr "д╟clas"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
+msgstr "Xatд╠rladд╠cд╠"
+
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
+msgstr "Tи≥krarlama"
+
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "Gц╤rц╪е÷ц╪ Lи≥д÷v Et"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "Gц╪nц╪n bц╪_tц╪n hadisи≥lи≥ri"
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Siniflи≥ndirmи≥lи≥r"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Date & Time"
 msgstr "Tarix vи≥ Vaxt"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Bitirmи≥ Tarixi:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Pri_vate"
 msgstr "Xц╪_susi"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "Gediе÷at"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "ц°m_umi"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Baе÷la_ma Tarixi:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "Mц╪_ndи≥ricat:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Vи≥zifи≥"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
 msgid "_Confidential"
 msgstr "_Gizli"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "_ф▐laqи≥lи≥r ..."
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "_Sonlanma vaxtд╠:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "_Bu tarixи≥ qи≥dи≥r :"
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "_Baе÷lama vaxt:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_ц°stц╪nlц╪k:"
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "_Hal:"
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Qrup adд╠ :"
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
-msgstr "Kateqoriyalar"
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Kaд÷д╠z qaynaд÷д╠ :"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Completion Date"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr "Stul"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr "Lazд╠mi д╟е÷tirakц╖д╠lar"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr "Ehtiyatdakд╠ д╟е÷tirakц╖д╠lar"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr "Qeyri д╟е÷tirakц╖д╠lar"
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Gediе÷ и≥lavи≥ et"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr " Qи≥bul Et"
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr " Rи≥dd Et"
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Giriе÷imli"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Silinи≥n"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "д╟е÷lи≥yir"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Maе÷д╠n Telefonu"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Lazд╠mi д╟е÷tirakц╖д╠lar"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Ehtiyatdakд╠ д╟е÷tirakц╖д╠lar"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Qeyri д╟е÷tirakц╖д╠lar"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "Gц╤ndи≥rildi"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "Sil..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
+msgstr "Ziyarи≥tц╖ilи≥r"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
 msgstr "Qurtarma Vaxtд╠"
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "End Date"
-msgstr "Son Tarix"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "Silinи≥n"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Start Date"
-msgstr "Baе÷lama Tarixi"
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "Silinи≥n"
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
-msgstr "ц┤oд÷rafi Yerlи≥е÷mи≥"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "д╟darи≥ci"
 
-#: calendar/gui/e-calendar-table.c:164
-msgid "Percent complete"
-msgstr "Faiz Qurtardд╠"
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "Dekabr"
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Summary"
-msgstr "Mц╪ndи≥ricat"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr "RSVP"
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
-msgstr "е·и≥ffaf"
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr "Rolu"
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
-msgstr "URL"
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Hal"
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
-msgstr "Alarm"
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Nц╤v"
 
-#: calendar/gui/e-calendar-table.c:170
-msgid "Click here to add a task"
-msgstr "Vи≥zifи≥ и≥lavи≥ etmи≥k ц╪ц╖ц╪n buraya tд╠qla"
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Tи≥е÷kilatц╖д╠:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Tи≥е÷kilatц╖д╠:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "Baе÷qalarд╠nд╠ _Dи≥vи≥t Et ..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Tи≥е÷kilatц╖д╠:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Bu gц╤rц╪е÷dи≥ \"Evolution\"un dц╪zи≥ldи≥ bilmи≥yи≥cи≥yi hallar var."
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr "..da"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "gц╪n"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr "...da (dи≥)"
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr "."
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr "hadisи≥lи≥r"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
+msgstr "Xц╪susi tи≥krarlama"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Hи≥r"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "Xaric Tutulan"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
+msgstr "Tи≥krarlama yoxudr"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
+msgstr "Nц╪mayiе÷"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
+msgstr "Tи≥kralama Qaydasд╠"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
+msgstr "Bи≥sit Tи≥krarlama"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "Dц╪zи≥lts"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "ц╪ц╖ц╪n"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "hи≥miе÷и≥"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "ay"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr "qи≥dи≥r"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "hи≥ftи≥"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
+msgstr "il"
+
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr "Dи≥yiе÷ikliklи≥ri qeyd etmи≥k istи≥yirsinizimi?"
+
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "Bitirmи≥ Tarixi:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "Silinи≥n"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "Silinи≥n"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "Yoxdur"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "Vи≥zifи≥"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% _Qurtardд╠:"
+
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
+msgstr "Gediе÷at"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "Baе÷la_ma Tarixi:"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
+msgstr "_Bu tarixи≥ qи≥dи≥r :"
+
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
+msgstr "_ц°stц╪nlц╪k:"
+
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
+msgstr "_Hal:"
+
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "д╟е÷arи≥tlи≥mи≥ qurtadд╠"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "_Aц╖"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
-msgstr "Vи≥zifи≥ qurtarmasд╠nд╠ iе÷arи≥tlи≥"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "Kи≥_s"
 
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit this task..."
-msgstr "Bu vи≥zifи≥ni dц╪zи≥lt ..."
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Kц╤ц╖ц╪rt"
+
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "_Yapд╠е÷dд╠r"
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "Vи≥zifи≥ni Dц╪zи≥lt"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "д╟е÷arи≥tlи≥mи≥ qurtadд╠"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Vи≥zifи≥ni sil"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
+msgstr "д╟е÷arи≥tlи≥mи≥ qurtadд╠"
+
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Bu vи≥zifи≥ni sil"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
-msgstr "am"
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "Vи≥zifи≥ и≥lavи≥ etmи≥k ц╪ц╖ц╪n buraya tд╠qla"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% _Qurtardд╠:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Alarm"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kateqoriyalar"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "Qurtar"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "Qurtarma Vaxtд╠"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "Uyд÷un Tarix"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Son Tarix"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "ц┤oд÷rafi Yerlи≥е÷mи≥"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "ц°stц╪nlц╪k"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Baе÷lama Tarixi"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "Mц╪ndи≥ricat"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "Vи≥zifи≥"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "е·и≥ffaf"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i dи≥qiqи≥ bц╤lmи≥lи≥ri"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr "%a %b %d"
-
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "pm"
+
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Yeni д╟clas"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "Yeni Bц╪tц╪n Gц╪n Hadisи≥lи≥ri"
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
-msgid "Go to Today"
-msgstr "Gц╪nи≥ Get"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "_Bugц╪nи≥ Get"
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "Tarixи≥ Get..."
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Aц╖"
-
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Bu д╟clasд╠ sil"
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Gц╤rц╪е÷ Cи≥dvи≥li"
-
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Bu hadisи≥nin daе÷д╠na bilmи≥sinи≥ imkan ver"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "Bu Hadisи≥ni sil"
 
-#: calendar/gui/e-day-view.c:3179
-msgid "Delete all Occurrences"
-msgstr "Bц╪tц╪n Hadisи≥lи≥ri sil"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
+msgstr "Bц╪tц╪n Hadisи≥lи≥ri Sil"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i dи≥qiqи≥ bц╤lmи≥lи≥ri"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
-msgstr "Tи≥qvim faylд╠nд╠ gц╪ncи≥llи≥yи≥ bilmirи≥m!\n"
+#: calendar/gui/e-itip-control.c:697
+#, fuzzy
+msgid "This is a meeting request."
+msgstr "_Bu ePoц╖t ц╪nvanд╠dд╠r"
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
-msgid "Component successfully updated."
-msgstr "Komponenet mц╪vи≥ffи≥qiyyи≥tlи≥ gц╪ncи≥llи≥ndi."
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
-msgstr "Tи≥qvim faylд╠ yц╪klи≥nи≥rkи≥n xи≥ta oldu."
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
-msgstr "Tи≥qvim faylд╠nд╠ aц╖a bilmirи≥m!\n"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
-msgstr "Tи≥qvim faylд╠nд╠ yц╪klи≥yи≥ bilmirи≥m!\n"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
-msgstr "Tи≥qvim faylд╠nд╠ oxuya bilmirи≥m!\n"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+#, fuzzy
+msgid "The message is not understandable."
+msgstr "Bu ismarд╠c hazд╠rda mц╤vcuddur"
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
-msgstr "Bu, dи≥vи≥t edilmи≥miе÷ biri tи≥rи≥findи≥n verilи≥n cavabdд╠r!"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:499
-msgid "I couldn't update your calendar store."
-msgstr "Tи≥qvim mи≥'lumatlarд╠nд╠ gц╪ncи≥llи≥yи≥ bilmirи≥m."
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
-msgstr "Tи≥qvim komponenetini silи≥ bilmirи≥m!\n"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Component successfully deleted."
-msgstr "Komponenet mц╪vи≥ffи≥qiyyи≥tlи≥ silindi."
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-msgid "I don't recognize this type of calendar component."
-msgstr "Bu cц╪r tи≥qvim parц╖asд╠ndan baе÷д╠m ц╖д╠xmд╠r."
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
-msgstr "Tи≥qvimи≥ ф▐lavи≥ Et"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
-msgid " Accept "
-msgstr " Qи≥bul Et"
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:815
-msgid " Decline "
-msgstr " Rи≥dd Et"
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:834
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "Qovluq geri dц╤nц╪lmи≥z е÷и≥kildи≥ xи≥sarи≥t alд╠b."
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Tentative "
-msgstr " Giriе÷imli"
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
-msgstr "Tи≥qvimi Gц╪ncи≥llи≥"
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
-msgstr "Gц╤rц╪е÷ц╪ Lи≥д÷v Et"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr "Tи≥qvim faylд╠nд╠ gц╪ncи≥llи≥yи≥ bilmirи≥m!\n"
+
+#: calendar/gui/e-itip-control.c:1015
+#, fuzzy
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "Tи≥qvim faylд╠nд╠ aц╖a bilmirи≥m!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -2491,26 +3546,22 @@ msgstr "-- --"
 msgid "Calendar Message"
 msgstr "Tи≥qvim д╟smarд╠cд╠"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:623
+#: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Tarix:"
 
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "Tи≥qvim yц╪klи≥nir"
+
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Tи≥qvim yц╪klи≥nir..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Tи≥е÷kilatц╖д╠:"
-
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Verici д╟smarд╠cд╠:"
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Mц╪ndи≥ricat:"
-
 #: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "bitiе÷ tarixi"
@@ -2519,418 +3570,48 @@ msgstr "bitiе÷ tarixi"
 msgid "date-start"
 msgstr "baе÷lama tarixi"
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "Ziyarи≥tц╖ilи≥r"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "Ziyarи≥tц╖ilи≥rin ц╪nvanlarд╠"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "Ziyarи≥tц╖ilи≥r:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"Gц╤rц╪е÷ц╪\n"
-"Lи≥д÷v Et"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr "Stul"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "Gц╤rц╪е÷ Dи≥vи≥tlи≥ri"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "Qeyri д╟е÷tirakц╖д╠lar"
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "Ehtiyatdakд╠ д╟е÷tirakц╖д╠lar"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "Tи≥е÷kilatц╖д╠:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:14
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"Hadisи≥ni\n"
-"Dи≥rc Et"
-
-#: calendar/gui/e-meeting-dialog.glade.h:16
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"Gц╤rц╪е÷\n"
-"д╟stи≥"
-
-#: calendar/gui/e-meeting-dialog.glade.h:19
-msgid "Required Participant"
-msgstr "Lazд╠mi д╟е÷tirakц╖д╠lar"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Role"
-msgstr "Rolu"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"Vaxt\n"
-"Planlaе÷dд╠r"
-
-#: calendar/gui/e-meeting-dialog.glade.h:23 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1083
-msgid "Status"
-msgstr "Hal"
-
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "Hamд╠sд╠"
 
-#: calendar/gui/e-tasks.c:155
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "Kateqoriyalar:"
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "`%s' dakд╠ (dи≥ki) vи≥zifи≥lи≥r yц╪klи≥nи≥ bilmи≥di"
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s' i(д╠) yц╪klи≥mи≥yи≥ yarayan yol dи≥stи≥klи≥nmir"
 
-#: calendar/gui/event-editor.c:376
-msgid "Edit Appointment"
-msgstr "д╟clasд╠ dц╪zи≥lt"
-
-#: calendar/gui/event-editor.c:454
-msgid "on"
-msgstr "..da"
-
-#: calendar/gui/event-editor.c:479 filter/filter-datespec.c:81
-msgid "day"
-msgstr "gц╪n"
-
-#: calendar/gui/event-editor.c:606
-msgid "on the"
-msgstr "...da (dи≥)"
-
-#: calendar/gui/event-editor.c:613
-msgid "th"
-msgstr "."
-
-#: calendar/gui/event-editor.c:759
-msgid "occurrences"
-msgstr "hadisи≥lи≥r"
-
-#: calendar/gui/event-editor.c:876
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Bu gц╤rц╪е÷dи≥ \"Evolution\"un dц╪zи≥ldи≥ bilmи≥yи≥cи≥yi hallar var."
-
-#: calendar/gui/event-editor.c:1548
-#, c-format
-msgid " %d days"
-msgstr "%d gц╪n"
-
-#: calendar/gui/event-editor.c:1550
-msgid " 1 day"
-msgstr "1 gц╪n"
-
-#: calendar/gui/event-editor.c:1553
-#, c-format
-msgid " %d weeks"
-msgstr "%d hи≥ftи≥"
-
-#: calendar/gui/event-editor.c:1555
-msgid " 1 week"
-msgstr "2 hи≥ftи≥"
-
-#: calendar/gui/event-editor.c:1558
-#, c-format
-msgid " %d hours"
-msgstr "%d saat"
-
-#: calendar/gui/event-editor.c:1560
-msgid " 1 hour"
-msgstr "1 saat"
-
-#: calendar/gui/event-editor.c:1563
-#, c-format
-msgid " %d minutes"
-msgstr "%d dи≥qiqи≥"
-
-#: calendar/gui/event-editor.c:1565
-msgid " 1 minute"
-msgstr "1 dи≥qiqи≥"
-
-#: calendar/gui/event-editor.c:1568
-#, c-format
-msgid " %d seconds"
-msgstr "%d saniyи≥"
-
-#: calendar/gui/event-editor.c:1570
-msgid " 1 second"
-msgstr "1 saniyи≥"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1593
-msgid "Play a sound"
-msgstr "Sи≥s ц╖al"
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1596
-msgid "Show a dialog"
-msgstr "Dialoqu gц╤stи≥r"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1599
-msgid "Send an email"
-msgstr "ePoц╖t gц╤ndи≥r"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1602
-msgid "Run a program"
-msgstr "Proqramд╠ iе÷и≥ sal"
-
-#: calendar/gui/event-editor.c:1617
-msgid " before start of appointment"
-msgstr "iclasд╠n baе÷lanд÷д╠cд╠ndan и≥vvи≥l"
-
-#: calendar/gui/event-editor.c:1619
-msgid " after start of appointment"
-msgstr "iclasд╠n baе÷lanд÷д╠cд╠ndan sonra"
-
-#: calendar/gui/event-editor.c:1627
-msgid " before end of appointment"
-msgstr "iclas qurtarandan и≥vvи≥l"
-
-#: calendar/gui/event-editor.c:1629
-msgid " after end of appointment"
-msgstr "iclas qurtarandan sonra"
-
-#: calendar/gui/event-editor.c:3137 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Gц╪nц╪n bц╪_tц╪n hadisи≥lи≥ri"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "д╟clas"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "Gц╤rц╪е÷ ф▐saslarд╠"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Xц╪susi tи≥krarlama"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Hи≥r"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Xaric Tutulan"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Dц╪zи≥lts"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Tи≥krarlama yoxudr"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Nц╪mayiе÷"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Tи≥krarlama"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Tи≥kralama Qaydasд╠"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Xatд╠rladд╠cд╠"
-
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "Qurд÷ular..."
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Bи≥sit Tи≥krarlama"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "_Sonlanma vaxtд╠:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "_Baе÷lama vaxt:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "_Baе÷lama Tarixi"
-
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "sonra"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
-msgid "before"
-msgstr "и≥vvи≥l"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "gц╪n(lи≥r)"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "gц╤rц╪е÷ц╪n sonu"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "ц╪ц╖ц╪n"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "hи≥miе÷и≥"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "saat"
-
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
-msgid "minute(s)"
-msgstr "dи≥qiqи≥"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr "ay"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "start of appointment"
-msgstr "iclasд╠n baе÷lanд÷д╠cд╠"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "until"
-msgstr "qи≥dи≥r"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "week(s)"
-msgstr "hи≥ftи≥"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "year(s)"
-msgstr "il"
-
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-msgid "New Appointment..."
-msgstr "Yeni д╟clas ..."
-
-#: calendar/gui/e-week-view.c:3314
-msgid "Delete All Occurrences"
-msgstr "Bц╪tц╪n Hadisи≥lи≥ri Sil"
-
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/gnome-cal.c:223
-msgid "Show all "
-msgstr "Hamд╠sд╠nд╠ Gц╤stи≥r"
-
-#: calendar/gui/gnome-cal.c:237
-msgid "Summary contains"
-msgstr "Xц╪lasи≥ daxil edи≥n"
-
-#: calendar/gui/gnome-cal.c:238
-msgid "Description contains"
-msgstr "д╟zah daxil edи≥n"
-
-#: calendar/gui/gnome-cal.c:239
-msgid "Comment contains"
-msgstr "е·и≥rh daxil edи≥n"
-
-#: calendar/gui/gnome-cal.c:240
-msgid "Has category"
-msgstr "Kateqoriyaya sahib olan"
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "Yeni д╟clas ..."
 
-#: calendar/gui/gnome-cal.c:843
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s'da(dи≥) qovluq yarada bilmи≥dim"
 
-#: calendar/gui/gnome-cal.c:854
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s' i(д╠) aц╖maд÷a yarayan yol dи≥stи≥klи≥nmir"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Tи≥qvim gц╤stи≥rи≥n Bonobo idarи≥ nц╪munи≥si."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr "Evolutionun д╟cracд╠ mц╪ndи≥ricat parц╖asд╠."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution Tи≥qvim iTip/iMip Nц╪mayiе÷ц╖isi"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "'Evolution'un Tи≥qvim и≥lavи≥si."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr "Tи≥qvim Mц╪ndи≥ricatд╠ parц╖asд╠ e'malatxanasд╠."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "Evolutionun tи≥qvim parц╖asд╠nд╠n mи≥rkи≥zi."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr "Tи≥qvim iTip nц╪mayiе÷ idarи≥si e'malatxanasд╠."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr "Nц╪munи≥vi Tи≥qvim idarи≥si e'malaxanasд╠"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprel"
@@ -2952,232 +3633,256 @@ msgid "Go To Date"
 msgstr "Tarixи≥ Get"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Gц╪nи≥ Get"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Yanvars"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "д╟yul"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "д╟yun"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "Mart"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "May"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "Noyabr"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "Oktyabr"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Sentyabr"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Gц╪nи≥ Get"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1.nci"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2.nci"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3.ncц╪"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4.ncц╪"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5.nci"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6.ncд╠"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7.nci"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8.nci"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9.ncu"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10.ncu"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11.nci"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12.nci"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13.ncц╪"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14.ncц╪"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15.nci"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16.ncд╠"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17.nci"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18.nci"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19.ncu"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20.nci"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21.nci"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22.nci"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23.ncц╪"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24.ncц╪"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25.nci"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26.ncд╠"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27.nci"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28.nci"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29.ncu"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "39.ncu"
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31.nci"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Baz."
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "B.ei"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "ц┤.a"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "ц┤и≥"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "C.a"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Cц╪mи≥"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "е·n"
 
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Vи≥zifи≥"
+
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "Hazд╠rkд╠ gц╪n ( %a %b %d %Y )"
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1104
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Hazд╠rkд╠ hи≥ftи≥ ( %s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Hazд╠rkд╠ ay ( %b %Y )"
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Hazд╠rkд╠ il ( %Y )"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Tи≥qvimi ц╖ap et"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1524
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:57
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "ц┤ap Etmи≥ nц╪mayiе÷i"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Bu ц╪zvц╪ ц╖ap et"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "ц┤ap Qurд÷ularд╠"
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "Gц╤stи≥rilи≥cи≥k vи≥zifи≥lи≥r qovluд÷unun URIsi"
 
@@ -3223,80 +3928,100 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "BBeц┤aц┤CaCе·"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "Bu е÷ifrlи≥mи≥ ilи≥ imza dи≥stи≥klи≥nmir"
 
-#: camel/camel-cipher-context.c:209
+#: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
 msgstr "Bu qeydlи≥rdи≥ mц╪и≥yyи≥nlи≥е÷dirilи≥n imzalama nц╤vц╪ dи≥stи≥klи≥nmir"
 
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
 msgstr "Bu qeydlи≥rdи≥ tи≥sdiqlи≥mи≥ dи≥stи≥klи≥nmir"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
 msgstr "Bu qeydlи≥rdи≥ е÷ifrlи≥mи≥ dи≥stи≥klи≥nmir"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:336
 msgid "Decryption is not supported by this cipher"
 msgstr "Bu qeydlи≥rdи≥ е÷ifr aц╖ma dи≥stи≥klи≥nmir"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "Qovluqlar sinxronlaе÷dд╠rд╠lд╠r"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr "Nц╤vbи≥ faylд╠nд╠ aц╖a bilmи≥dim"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr "Nц╤vbи≥ faylд╠nд╠ iе÷lи≥dи≥ bilmirи≥m"
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%d%%) д╟smarд╠cд╠ alд╠nд╠r"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
-#, c-format
-msgid "Failed message %d"
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, fuzzy, c-format
+msgid "Failed on message %d"
 msgstr "Bacarд╠lmayan д╟smarд╠c %d"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "д╟smarд╠c aц╖д╠la bilmir"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "Qovluqlar sinxronlaе÷dд╠rд╠lд╠r"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-msgid "Complete"
-msgstr "Qurtar"
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d д╟smarд╠cд╠n %d qи≥dи≥rи≥ alд╠nд╠r"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d nin(nд╠n) %d ismarд╠cд╠nda iflas etdim"
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Alд╠cд╠ sц╪zgи≥c xи≥tasд╠: %s: %s"
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "д╟е÷и≥ salд╠cд╠ sц╪zgи≥c xи≥tasд╠: %s: %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "д╟е÷и≥ salд╠cд╠ sц╪zgи≥c axtarд╠е÷д╠ xи≥tasд╠: %s: %s"
@@ -3332,14 +4057,33 @@ msgstr "Namи≥'lum baе÷lд╠qda sorг╖u aparд╠lд╠r: %s"
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Cismdи≥ hц╤kmsц╪z yazд╠, kи≥limи≥ xaric"
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Boru yaradд╠la bilmи≥di: %s"
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "%s ц╪stц╪ndи≥ qovluq qд╠fд╠lд╠ yaradд╠la bilmи≥di: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "ц┤и≥ngи≥llи≥nи≥ bilmи≥di: %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "%s ц╪ц╖ц╪n qд╠fд╠l faylд╠nд╠ yarada bilmи≥dim: %s"
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3349,120 +4093,117 @@ msgstr ""
 #: camel/camel-lock.c:201
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
-msgstr "fcntl(2) istifadи≥ edilи≥rи≥k qд╠fд╠l faylд╠ alд╠nmasд╠ ifе÷las etdi: %s"
+msgstr ""
+"fcntl(2) istifadи≥ edilи≥rи≥k qд╠fд╠l faylд╠ alд╠nmasд╠ ifе÷las etdi: %s"
 
 #: camel/camel-lock.c:255
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
-msgstr "fclock(2) istifadи≥ edilи≥rи≥k qд╠fд╠l faylд╠ alд╠nmasд╠ iflas etdi: %s"
+msgstr ""
+"fclock(2) istifadи≥ edilи≥rи≥k qд╠fд╠l faylд╠ alд╠nmasд╠ iflas etdi: %s"
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "%s mи≥ktub faylд╠ yoxlana bilmir: %s"
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "%s mи≥ktub faylд╠ aц╖д╠la bilmir: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Mц╪vи≥qqи≥ti mи≥ktub faylд╠ %s aц╖д╠la bilmir: %s"
 
-#: camel/camel-movemail.c:199
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "%s ц╪ц╖ц╪n qд╠fд╠l faylд╠ sд╠nana bilmи≥di: %s"
-
-#: camel/camel-movemail.c:245
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Mи≥ktub faylд╠ oxunma xи≥tasд╠: %s"
-
-#: camel/camel-movemail.c:256
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Mц╪vи≥qqи≥ti mи≥ktub faylд╠ yazд╠lmasд╠ xи≥tasд╠: %s"
-
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Mи≥ktublarд╠n mц╪vи≥qqи≥ti %s fayllд╠nda saxlanma xи≥tasд╠: %s"
 
-#: camel/camel-movemail.c:306
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Boru yaradд╠la bilmи≥di: %s"
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "ц┤и≥ngи≥llи≥nи≥ bilmи≥di: %s"
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Mи≥ktub daе÷д╠ma proqramд╠ iflas etdi: %s"
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Namи≥'lum xи≥ta)"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Mи≥ktub faylд╠ oxunma xи≥tasд╠: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Mц╪vи≥qqи≥ti mи≥ktub faylд╠ yazд╠lmasд╠ xи≥tasд╠: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Mц╪vи≥qqи≥ti mи≥ktub faylд╠ kц╤ц╖ц╪rц╪lmи≥ xи≥tasд╠: %s"
 
-#: camel/camel-pgp-context.c:188
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "%s ц╪ц╖ц╪n %s parol kalimanizi lц╪rfи≥n girin"
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Lц╪tfи≥n %s parol kи≥limи≥nizi girin"
 
-#: camel/camel-pgp-context.c:509
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr "д╟mzalanacaq dц╪z mи≥tn yoxdur."
 
-#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
-#: camel/camel-pgp-context.c:1055 camel/camel-pgp-context.c:1267
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Parol verilmи≥yib."
 
-#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
-#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1062
-#: camel/camel-pgp-context.c:1274
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "GPG/PGP proqramд╠na boru yaradд╠la bilmir. %s"
 
-#: camel/camel-pgp-context.c:681
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr "Tи≥miz imza mи≥tni yoxdur."
 
-#: camel/camel-pgp-context.c:871
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr "Tи≥sdiqlи≥nи≥cи≥k dц╪z mи≥tn yoxdur."
 
-#: camel/camel-pgp-context.c:888
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Mц╪vи≥qqи≥ti fayl yaradд╠la bilmir: %s"
 
-#: camel/camel-pgp-context.c:1045
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr "е·ifrlи≥nи≥cи≥k mи≥tn yoxdur."
 
-#: camel/camel-pgp-context.c:1071
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "Alд╠cд╠ bildirilmи≥yib"
 
-#: camel/camel-pgp-context.c:1259
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr "е·ifri aц╖д╠lacaq mи≥tn yoxdur."
 
@@ -3481,37 +4222,37 @@ msgstr "%s yц╪klи≥nи≥ bilmи≥di: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s yц╪klи≥nи≥ bilmir: Modulda baе÷latma kodu yoxdur."
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s verici %s"
 
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s ц╪stц╪ndи≥ %s ц╪ц╖ц╪n %s xidmи≥tlи≥ri"
 
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr "Baд÷lantд╠ Lи≥д÷v edildi"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s a(и≥) baд÷lana bilmirи≥m (qapд╠ %d): %s"
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr "(namи≥'lum ev sahibi)"
 
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:287
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "ф▐mи≥liyyat lи≥д÷v edildi"
 
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "Verici gц╤zlanilmи≥z е÷akildи≥ baд÷lantд╠nд╠ kи≥sdi"
 
@@ -3521,7 +4262,8 @@ msgstr "Adsд╠z"
 
 #: camel/camel-sasl-anonymous.c:35
 msgid "This option will connect to the server using an anonymous login."
-msgstr "Bu seц╖и≥nи≥klи≥ siz vericisiyи≥ adsд╠z olaraq baд÷lana bilи≥cи≥ksiniz."
+msgstr ""
+"Bu seц╖и≥nи≥klи≥ siz vericisiyи≥ adsд╠z olaraq baд÷lana bilи≥cи≥ksiniz."
 
 #: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
@@ -3622,7 +4364,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "Vericidи≥n xи≥talд╠ tanд╠tma istи≥yi alд╠ndд╠."
 
@@ -3632,7 +4374,8 @@ msgstr "NT Giriе÷"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
-msgstr "Bu seц╖и≥nи≥klи≥ siz vericisiyи≥ sadи≥ parol ilи≥ baд÷lana bilи≥cи≥ksiniz."
+msgstr ""
+"Bu seц╖и≥nи≥klи≥ siz vericisiyи≥ sadи≥ parol ilи≥ baд÷lana bilи≥cи≥ksiniz."
 
 #: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
@@ -3684,14 +4427,15 @@ msgstr "_Virtual Qovluq Sehirbazд╠ ..."
 
 #: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
-msgstr "Baе÷qa qovluq dи≥stи≥lи≥rinin istи≥yi olan mи≥ktublarд╠n oxunmasд╠ ц╪ц╖ц╪n"
+msgstr ""
+"Baе÷qa qovluq dи≥stи≥lи≥rinin istи≥yi olan mи≥ktublarд╠n oxunmasд╠ ц╪ц╖ц╪n"
 
-#: camel/camel-session.c:294 camel/camel-session.c:363
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "`%s' protokolu ц╪ц╖ц╪n xidmи≥tц╖i yoxdur"
 
-#: camel/camel-session.c:478
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3700,33 +4444,53 @@ msgstr ""
 "%s qovluд÷unu yarada bilmи≥dim:\n"
 "%s"
 
-#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:1007 mail/mail-ops.c:1014
-#: mail/mail-ops.c:1032 mail/mail-ops.c:1033
-msgid "Trash"
-msgstr "Zibil Qutusu"
+#: camel/camel-smime-context.c:173
+#, fuzzy, c-format
+msgid "Please enter your password for %s"
+msgstr "%s ц╪ц╖ц╪n %s parol kalimanizi lц╪rfи≥n girin"
 
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "Belи≥ bir fayl yoxdur ."
+
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "Belи≥ bir fayl yoxdur ."
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, fuzzy, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "Vericiyи≥ istifadи≥ц╖i adд╠ gц╤ndи≥rilи≥ bilmи≥di"
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
+#, fuzzy
+msgid "Failed to decode message."
+msgstr "Bacarд╠lmayan д╟smarд╠c %d"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
-"ePoц╖t: %s\n"
-"ц°mumи≥ Ad: %s\n"
-"Quruluе÷ Vahidi: %s\n"
-"Quruluе÷: %s\n"
-"Yer: %s\n"
-"ф▐yalи≥t: %s\n"
-"ц√lkи≥: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3741,17 +4505,36 @@ msgstr ""
 "\n"
 "Yenи≥ dи≥ qи≥bul etmи≥k istи≥yirsiniz?"
 
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
+"ePoц╖t: %s\n"
+"ц°mumи≥ Ad: %s\n"
+"Quruluе÷ Vahidi: %s\n"
+"Quruluе÷: %s\n"
+"Yer: %s\n"
+"ф▐yalи≥t: %s\n"
+"ц√lkи≥: %s"
+
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL `%s' alд╠na bilmir"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr "\"%s\"da(dи≥) %s deye bir ismarд╠c yoxdur"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "Bele bir ismarд╠c yoxdur: %s"
@@ -3760,64 +4543,75 @@ msgstr "Bele bir ismarд╠c yoxdur: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Buradakд╠ ismarд╠clarд╠ zibilи≥ gц╤ndи≥rи≥ bilmи≥zsiniz."
 
-#: camel/providers/imap/camel-imap-message-cache.c:150
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "ц√n yaddaе÷ qovluд÷unu aц╖a bilmи≥dim: %s"
-
-#: camel/providers/imap/camel-imap-command.c:232
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP vericisindи≥n gц╤zlи≥nilmи≥z cavab alд╠ndд╠: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP и≥mri iflas etdi: %s"
 
-#: camel/providers/imap/camel-imap-command.c:241 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Namи≥'lum xи≥ta"
-
-#: camel/providers/imap/camel-imap-command.c:295
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "Verci cavabд╠ ц╖ox tez sonlandд╠."
 
-#: camel/providers/imap/camel-imap-command.c:487
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP vericisi cavabд╠ %s mи≥'lumatд╠nд╠ daxil etmir"
 
-#: camel/providers/imap/camel-imap-command.c:524
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP vericisindи≥n gц╤zlи≥nilmи≥z qи≥bul cavabд╠ alд╠ndд╠: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:170
+#: camel/providers/imap/camel-imap-folder.c:192
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "%s qovluд÷unu yarada bilmи≥dim: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:189
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s ц╪ц╖ц╪n mц╪ndи≥ricat yц╪klи≥nи≥ bilmи≥di"
 
-#: camel/providers/imap/camel-imap-folder.c:362
-msgid "Scanning IMAP folder"
-msgstr "IMAP qovluд÷u daranд╠r"
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
+msgstr ""
+
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "д╟smarд╠clar qeyd edilir"
 
-#: camel/providers/imap/camel-imap-folder.c:1043
-#: camel/providers/imap/camel-imap-folder.c:1265
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "Bu ismarд╠c hazд╠rda mц╤vcuddur"
 
-#: camel/providers/imap/camel-imap-folder.c:1071
-#: camel/providers/imap/camel-imap-folder.c:1298
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "д╟smarд╠clar qeyd edilir"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH cavabд╠nda ismarд╠c gц╤vdи≥si tapд╠la bilmи≥di"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "ц√n yaddaе÷ qovluд÷unu aц╖a bilmи≥dim: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "Yeni ePoц╖t ц╪ц╖ц╪n baxд╠lд╠r"
 
@@ -3825,7 +4619,7 @@ msgstr "Yeni ePoц╖t ц╪ц╖ц╪n baxд╠lд╠r"
 msgid "Check for new messages in all folders"
 msgstr "Bц╪tц╪n qovluqlarda yeni ePoц╖t ц╪ц╖ц╪n bax"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:551
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Qovluqlar"
 
@@ -3851,7 +4645,8 @@ msgstr "IMAPv4"
 
 #: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
-msgstr "IMAP vericisindи≥ mи≥ktublarд╠n saxlanmasд╠ vи≥ oxuna bilmи≥si ц╪ц╖ц╪n."
+msgstr ""
+"IMAP vericisindи≥ mи≥ktublarд╠n saxlanmasд╠ vи≥ oxuna bilmи≥si ц╪ц╖ц╪n."
 
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
@@ -3859,28 +4654,28 @@ msgstr ""
 "Bu seц╖и≥nи≥klи≥ siz IMAP vericisinи≥ dц╪z mи≥tn parol ilи≥ baд÷lana "
 "bilи≥cи≥ksiniz."
 
-#: camel/providers/imap/camel-imap-store.c:454
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "%s IMAP vericisi %s tanд╠tma nц╤vц╪nц╪ dи≥stи≥klи≥mir"
 
-#: camel/providers/imap/camel-imap-store.c:464
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s Tanд╠tma nц╤vц╪ dи≥ц÷tи≥klи≥nmir"
 
-#: camel/providers/imap/camel-imap-store.c:488
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sLц╪tfи≥n %s@%s ц╪ц╖ц╪n IMAP parolunu girin"
 
-#: camel/providers/imap/camel-imap-store.c:503
-#: camel/providers/smtp/camel-smtp-transport.c:402
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "Parolu girmи≥diniz."
 
-#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3891,36 +4686,54 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:788 mail/mail-local.c:337
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
 msgid "No such folder %s"
 msgstr "%s deyи≥ bir qovluq yoxdur"
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "MH-е÷и≥klindи≥ mи≥ktub qovluqlarд╠"
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
-msgstr "Yerli mи≥ktublarд╠n MH oxе÷arд╠ mи≥ktub qovluqlarд╠nda saxlamaq ц╪ц╖ц╪n"
+msgstr ""
+"Yerli mи≥ktublarд╠n MH oxе÷arд╠ mи≥ktub qovluqlarд╠nda saxlamaq ц╪ц╖ц╪n"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr "Standart UNIX mи≥ktub qutusu faylд╠"
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr "Standart mbox е÷и≥klindи≥ki mи≥ktublarд╠n saxlanmasд╠ ц╪ц╖ц╪n"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr "Qmail mи≥ktun qovluд÷u е÷и≥klindи≥ki mи≥ktub faylд╠"
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
-msgstr "Yerli mи≥ktublarд╠ qmail mи≥ktub qovluqlarд╠nda saxlaya bilmи≥k ц╪ц╖ц╪n"
+msgstr ""
+"Yerli mи≥ktublarд╠ qmail mи≥ktub qovluqlarд╠nda saxlaya bilmи≥k ц╪ц╖ц╪n"
+
+#: camel/providers/local/camel-local-provider.c:70
+#, fuzzy
+msgid "Unix mbox spool-format mail files"
+msgstr "Qmail mи≥ktun qovluд÷u е÷и≥klindи≥ki mи≥ktub faylд╠"
+
+#: camel/providers/local/camel-local-provider.c:71
+#, fuzzy
+msgid "For storing local mail in standard Unix spool directories"
+msgstr ""
+"Yerli mи≥ktublarд╠ qmail mи≥ktub qovluqlarд╠nda saxlaya bilmи≥k ц╪ц╖ц╪n"
 
 #: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s kц╤k saxlama dи≥qiq bir yol deyildir"
@@ -3960,24 +4773,24 @@ msgstr "`%s' Qovluq mц╪ndи≥ricat faylд╠ silinи≥ bilmir: %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "`%s' Qovluq indeks faylд╠ silinи≥ bilmir: %s"
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Xц╪lasи≥yи≥ ismarд╠c и≥lavи≥ edи≥ bilmи≥dim: namи≥'lum sи≥bи≥b"
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "д╟smarд╠c mи≥ktub qovluд÷u fayllд╠na и≥lavи≥ edilи≥ bilmir: %s: %s "
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3986,18 +4799,19 @@ msgstr ""
 "д╟Smarд╠c alд╠na bilmir: %s\n"
 "   %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "Belи≥ bir ismarд╠c yoxdur"
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr "Hц╤kmsц╪z ismarд╠c mц╤vtи≥viyyatд╠"
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4007,14 +4821,14 @@ msgstr ""
 "`%s' qovluд÷u aц╖д╠la bilmir: \n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "`%s' faylд╠ yoxdur ."
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4024,22 +4838,29 @@ msgstr ""
 "`%s' qovluд÷u yaradд╠la bilmи≥di:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' mи≥ktub qovluд÷u faylд╠ deyildir."
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "`%s' qovluд÷u silinи≥ bilmir: %s"
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "mи≥ktub qovluд÷u faylд╠ deyildir"
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"`%s' qovluд÷u yaradд╠la bilmи≥di:\n"
+"%s"
+
 #: camel/providers/local/camel-maildir-summary.c:405
 #: camel/providers/local/camel-maildir-summary.c:526
 #, c-format
@@ -4047,11 +4868,13 @@ msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Mи≥ktub cи≥rgи≥si qovluд÷u cд╠д÷д╠rд╠ aц╖д╠la bilmir: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s ц╪stц╪ndи≥ qovluq qд╠fд╠lд╠ yaradд╠la bilmи≥di: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Mи≥ktub qutusu aц╖д╠la bilmir: %s: %s\n"
@@ -4061,9 +4884,12 @@ msgstr "Mи≥ktub qutusu aц╖д╠la bilmir: %s: %s\n"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "д╟smarд╠c mbox fayllд╠na и≥lava edilи≥ bimir: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4072,11 +4898,13 @@ msgstr ""
 "д╟smarд╠c alд╠na bilmir: %s qovluд÷undan %s\n"
 "   %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Qovluq geri dц╤nц╪lmи≥z е÷и≥kildи≥ xи≥sarи≥t alд╠b."
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "д╟Smarд╠c quruluе÷u bacarд╠lmadд╠: Mи≥ktub qutusu yoxsa xи≥sи≥rlidir?"
 
@@ -4122,36 +4950,45 @@ msgstr "`%s' qovluд÷u boе÷ deyildir. Silinmи≥di."
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
 #: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "Qovluq Cи≥mlи≥е÷dirilir"
 
 #: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "Qovluq aц╖д╠la bilmir: %s:%ld yerindи≥n yд╠д÷camlaе÷dд╠rд╠lд╠r: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "%ld yeri yaxд╠nlд╠д÷д╠nda %s qovluд÷unda ciddi mи≥ktub darama xи≥tasд╠"
 
 #: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Qovluq yд╠д÷camlaе÷dд╠rд╠la bilmir: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1397
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Qovluq sinxronlaе÷dд╠rд╠lд╠r"
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Qovluq toplanmaq ц╪ц╖ц╪n aц╖д╠la bilmir: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Mц╪vи≥qqи≥ti mи≥ktub qutusu aц╖д╠la bilmir: %s"
@@ -4160,23 +4997,30 @@ msgstr "Mц╪vи≥qqи≥ti mи≥ktub qutusu aц╖д╠la bilmir: %s"
 #: camel/providers/local/camel-mbox-summary.c:557
 #: camel/providers/local/camel-mbox-summary.c:746
 #: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 "Toplama vи≥ qovluq bir birinи≥ uyд÷un gи≥lmir, sinxronizasiyadan sonra da "
 "и≥lbи≥tdи≥"
 
 #: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Mц╪vи≥qqи≥ti mи≥ktub qutusuna yazд╠la bilmir: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Mц╪vи≥qqи≥ti mи≥ktub qutusuna yazд╠lma bacarд╠lmadд╠: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:635
 #: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Qaynaq qovluд÷u baд÷lana bilmи≥di: %s: %s"
@@ -4191,13 +5035,14 @@ msgstr "Mц╪vи≥qqи≥ti qovluq baд÷lana bilmи≥di: %s"
 msgid "Could not rename folder: %s"
 msgstr "Qovluq yenidи≥n adlandд╠rд╠la bilmir: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Namи≥'lum xи≥ta: %s"
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "mh qovluд÷una ismarд╠c и≥lavи≥ edilи≥ bilmir: %s: %s"
@@ -4212,39 +5057,93 @@ msgstr "`%s' qovluq deyildir."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH cи≥rgи≥ cд╠д÷д╠rд╠ aц╖д╠la bilmir: %s: %s"
 
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "д╟smarд╠c mbox fayllд╠na и≥lava edilи≥ bimir: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "`%s' normal bir fayl deyildir ."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "`%s' faylд╠ yoxdur ."
+
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy
+msgid "Spool stores do not have an inbox"
+msgstr "Yerli saxlamalarд╠n gи≥lи≥nlи≥r qutusu qovluд÷u yoxdur"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "%s Yeli mи≥ktub faylд╠"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "Mц╪vи≥qqи≥ti mи≥ktub faylд╠ %s aц╖д╠la bilmir: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "Qaynaq qovluд÷u baд÷lana bilmи≥di: %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "%s@%s ц╪ц╖ц╪n parolu lц╪tfи≥n girin"
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "Verici istifadи≥ц╖i adд╠nд╠ qи≥bul etmи≥di"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "Vericiyи≥ istifadи≥ц╖i adд╠ gц╤ndи≥rilи≥ bilmи≥di"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "Verici istifadи≥ц╖i adд╠nд╠/parolunu qи≥bul etmи≥di"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "%s ismarд╠cд╠ tapд╠la bilmи≥di"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "Vericidи≥n qrup adд╠ ц╤yrи≥nilи≥ bilmи≥di."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "%s ц╪ц╖ц╪n qrup siyahд╠sд╠ yц╪klи≥nи≥ bilmir: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "%s ц╪ц╖ц╪n qrup faylд╠ qeyd edilи≥ bilmir: %s"
@@ -4259,17 +5158,17 @@ msgstr ""
 "USENET xи≥bи≥r qruplarд╠na gц╤ndи≥rilmiе÷ hи≥r hansд╠ bir xи≥bи≥ri oxumaq "
 "ц╪ц╖ц╪n bir vasitи≥dir."
 
-#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Xи≥bи≥r vericisi ц╪ц╖ц╪n qovluq aц╖д╠la bilmir: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s dan(dи≥n) USENET Xи≥bи≥rlи≥ri"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4277,8 +5176,8 @@ msgstr ""
 "Bu seц╖и≥nи≥k NNTP verisici ilи≥ dц╪z mи≥tn е÷и≥klindи≥ki parol ilи≥ "
 "ц╪nsiyyи≥t quracaqdд╠r."
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "%s ц╪ц╖ц╪n .newsrc faylд╠ aц╖д╠la bilmir ya da yaradд╠la bilmir: %s"
@@ -4329,7 +5228,7 @@ msgstr "д╟smarд╠clarд╠ Vericidи≥ burax"
 msgid "Delete after %s day(s)"
 msgstr "%s gц╪n sonra sil"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4361,7 +5260,8 @@ msgstr ""
 "bц╪tц╪n istifadи≥ц╖ilи≥r ц╪ц╖ц╪n dи≥stи≥klи≥nmи≥z."
 
 #: camel/providers/pop3/camel-pop3-provider.c:91
-msgid "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+msgid ""
+"This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Bu seц╖и≥nи≥k POP verisici ilи≥ Kerberos 4 istifadи≥ edи≥rи≥k ц╪nsiyyи≥t "
 "quracaqdд╠r."
@@ -4423,7 +5323,7 @@ msgid "No such folder `%s'."
 msgstr "`%s' deyи≥ bir qovluq yoxdur."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4455,7 +5355,8 @@ msgstr "д╟smarд╠c gц╤ndи≥rilи≥ bilmи≥di: %s"
 #: camel/providers/sendmail/camel-sendmail-transport.c:163
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail %s siqnalд╠ verи≥rи≥k baд÷landд╠: mи≥ktub gц╤ndи≥rilи≥ bilmи≥di."
+msgstr ""
+"sendmail %s siqnalд╠ verи≥rи≥k baд÷landд╠: mи≥ktub gц╤ndи≥rilи≥ bilmи≥di."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:170
 #, c-format
@@ -4479,7 +5380,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Sendmail proqramд╠ ilи≥ mи≥ktub gц╤ndи≥rilmи≥si"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4489,122 +5390,123 @@ msgstr ""
 "SMTP istifadи≥ edilи≥rи≥k uzaq mи≥ktub yayд╠cд╠sд╠na baд÷lanaraq mи≥ktub "
 "gц╤ndи≥rmи≥k ц╪ц╖ц╪n.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "Sintaksis xи≥tasд╠, и≥mr tanд╠nmд╠r"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "Parametr vи≥ ya arqumentlи≥rdи≥ sintaksis xи≥tasд╠"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "ф▐mr qи≥bul edilmи≥di"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "ф▐mr parametri qи≥bul edilmи≥di"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr "Sistem vи≥ziyyи≥ti vи≥ ya kц╤mи≥k cavabд╠"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "Kц╤mи≥k д╟smarд╠cд╠"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Xidmи≥t hazд╠rdд╠r"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr "Xidmи≥t nи≥qliyyat kanallarд╠nд╠ baд÷layд╠r"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr "Xidmи≥t uyд÷un deyildir, nи≥qliyyat kanallarд╠ baд÷lanд╠r"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr "Sorд÷ulanan mи≥ktub gediе÷i mц╪vи≥ffи≥qiyyи≥tlidir, qurtardд╠"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr "д╟stifadи≥ц╖i yerli deyil; <ц╖atdд╠rma cд╠д÷д╠rд╠>na ц╖atdд╠rд╠ram"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Sorд÷ulanan mи≥ktub gediе÷i alд╠nmadд╠; mи≥ktub qutusu и≥l ц╖atmazdд╠r"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Sorд÷ulanan gediе÷ alд╠nmadд╠; mи≥ktub qutusu и≥l ц╖atmazdд╠r"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr "Sorд÷ulanan gediе÷ lи≥д÷v edildi; xи≥ta oldu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
-msgstr "д╟stifadи≥ц╖i yerli deyil; lц╪tfи≥n <ц╖atdд╠rma cд╠д÷д╠rд╠>nд╠ sд╠nayд╠n"
+msgstr ""
+"д╟stifadи≥ц╖i yerli deyil; lц╪tfи≥n <ц╖atdд╠rma cд╠д÷д╠rд╠>nд╠ sд╠nayд╠n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Sorд÷ulanan gediе÷ alд╠nmadд╠; uyд÷unsuz sistem daxд╠lд╠"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Sorд÷ulanan mи≥ktub gediе÷ lи≥д÷v edildi; daxд╠l dolmuе÷dur"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Sorд÷ulanan gediе÷ alд╠nmadд╠; mи≥ktub qutusu adд╠ qи≥bul edilmи≥di"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Mи≥ktub alд╠mд╠ baе÷ladд╠; <CRLF>.<CRLF> ilи≥ sonlandд╠rд╠n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "Nи≥qliyyat bacarд╠lmadд╠"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr "Parol nи≥qli lazд╠mdд╠r"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "Tanд╠tma mexanizmasд╠ ц╖ox zи≥ifdir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Sorд÷ulanan tanд╠tma mexanizmasд╠ ц╪ц╖ц╪n kriptlи≥mи≥k lazд╠mdд╠r"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "Mц╪vи≥qqи≥ti tanд╠tma iflasд╠"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "Tanд╠tma lazд╠mdд╠r"
 
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Xoе÷ gи≥ldin ismarд╠cд╠ cavab xи≥tasд╠: %s: aд÷д╠r deyil dи≥yи≥sи≥n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "%s SMTP vericisi %s tanд╠tma nц╤vц╪nц╪ dи≥stи≥klи≥mir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:387
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sLц╪tfи≥n %s@%s ц╪ц╖ц╪n SMTP parolunu girin"
 
-#: camel/providers/smtp/camel-smtp-transport.c:410
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4615,321 +5517,241 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:526
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "%s SMTP vericisi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s dan(dи≥n) SMTP mи≥ktub gц╤ndи≥rilmи≥si"
 
-#: camel/providers/smtp/camel-smtp-transport.c:553
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
-msgstr "д╟smarд╠c gц╤ndrи≥rilи≥ bilmи≥di: gц╤ndи≥rи≥nin ц╪nvanд╠ bildirilmи≥yib."
+msgstr ""
+"д╟smarд╠c gц╤ndrи≥rilи≥ bilmи≥di: gц╤ndи≥rи≥nin ц╪nvanд╠ bildirilmи≥yib."
 
-#: camel/providers/smtp/camel-smtp-transport.c:560
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
-msgstr "д╟smarд╠c gц╤ndrи≥rilи≥ bilmи≥di: gц╤ndи≥rи≥nin ц╪nvanд╠ hц╤kmsц╪zdц╪r."
+msgstr ""
+"д╟smarд╠c gц╤ndrи≥rilи≥ bilmи≥di: gц╤ndи≥rи≥nin ц╪nvanд╠ hц╤kmsц╪zdц╪r."
 
-#: camel/providers/smtp/camel-smtp-transport.c:574
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "д╟smarд╠c gц╤ndи≥rilir"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "д╟smarд╠c gц╤ndrи≥rilи≥ bilmи≥di: alд╠cд╠ bildirilmи≥yib."
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO istи≥k vaxtд╠ doldu: %s: aд÷д╠r deyil"
 
-#: camel/providers/smtp/camel-smtp-transport.c:687
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO cavablama xи≥tasд╠: %s. aд÷д╠r deyil"
 
-#: camel/providers/smtp/camel-smtp-transport.c:720
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr "SASL tanд╠tma cismi yaratma xи≥tasд╠."
 
-#: camel/providers/smtp/camel-smtp-transport.c:735
-#: camel/providers/smtp/camel-smtp-transport.c:747
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Tanд╠tma"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH istи≥k vaxt dolmasд╠. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:797
+#: camel/providers/smtp/camel-smtp-transport.c:782
+#, fuzzy
+msgid "AUTH request failed."
+msgstr "AUTH istи≥k vaxt dolmasд╠. %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr "Vericidи≥n xи≥talд╠ tanд╠tma istи≥yi alд╠ndд╠.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:823
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAд╟L FROM istи≥k vaxt dolmasд╠: %s: mи≥ktub gц╤ndи≥rilи≥ bilmи≥di"
 
-#: camel/providers/smtp/camel-smtp-transport.c:842
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "MAд╟L FROM cavablama xи≥tasд╠: %s: mи≥ktub gц╤ndи≥rilи≥ bilmи≥di"
 
-#: camel/providers/smtp/camel-smtp-transport.c:867
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCTP TO istи≥k vaxt dolmasд╠: %s: mи≥ktub gц╤ndи≥rilи≥ bilmи≥di"
 
-#: camel/providers/smtp/camel-smtp-transport.c:886
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "RCTP TO cavablama xи≥tasд╠: %s: mи≥ktub gц╤ndи≥rilи≥ bilmи≥di"
 
-#: camel/providers/smtp/camel-smtp-transport.c:917
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA istи≥k vaxt dolamsд╠. %s: mи≥ktub gц╤ndи≥rilи≥ bilmи≥di"
 
-#: camel/providers/smtp/camel-smtp-transport.c:936
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA cavablama xи≥tasд╠: %s: mи≥ktub gц╤ndи≥rilи≥ bilmи≥di"
 
-#: camel/providers/smtp/camel-smtp-transport.c:951
-#: camel/providers/smtp/camel-smtp-transport.c:969
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA gц╤ndи≥rmи≥ vaxt dolmasд╠: ismarд╠c qurtarд╠lд╠r: %s: mи≥ktub "
 "gц╤ndи≥rilи≥ bilmи≥di"
 
-#: camel/providers/smtp/camel-smtp-transport.c:988
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 "DATA cavablama xи≥tasд╠: ismarд╠c qurtarд╠lmasд╠: %s: mи≥ktub gц╤ndи≥rilи≥ "
 "bilmи≥di"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1012
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET istи≥k vaxt dolmasд╠. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1031
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET cavablama xи≥tasд╠: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1054
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUд╟T istи≥k vaxt dolmasд╠: %s: aд÷д╠r xи≥ta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1073
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUд╟T cavablama xи≥tasд╠: %s: aд÷д╠r deyil"
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 bayt"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u bayt"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "yapд╠е÷dд╠rд╠lmд╠е÷ fayl"
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Bir fayl yapд╠е÷dд╠r"
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "Seц╖ili ц╪zvlи≥ri yapд╠е÷dд╠rд╠lmд╠е÷ fayllar siyahд╠sд╠ndan sil"
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Yapд╠е÷dд╠rд╠lmд╠е÷ fayl и≥lavи≥ et ..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "д╟smarд╠ca bir fayl и≥lavи≥ et"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1083
-msgid "Attachment"
-msgstr "Yapд╠е÷dд╠rд╠lmд╠е÷ fayl"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "Yapд╠е÷dд╠rд╠lmд╠е÷ fayl xц╪susiyyи≥tlи≥ri"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Fayl adд╠ :"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "Daxili yapд╠е÷dд╠rma"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "MIME nц╤vц╪:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Fи≥rqli gц╤ndи≥r:"
-
-#: composer/e-msg-composer.c:529
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"%s imza faylд╠ aц╖д╠la bilmи≥di:\n"
-"%s"
-
-#: composer/e-msg-composer.c:702
-msgid "Save as..."
-msgstr "Fи≥rqli qeyd et ..."
-
-#: composer/e-msg-composer.c:713
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Fayl qeyd edи≥rkи≥n xи≥ta oldu: %s"
-
-#: composer/e-msg-composer.c:733
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Fayl yц╪klи≥rkи≥n xи≥ta oldu: %s"
-
-#: composer/e-msg-composer.c:805
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"Bu hesab ц╪ц╖ц╪n lahiyи≥ cи≥rgи≥sи≥ aц╖д╠la bilmи≥di.\n"
-"ф▐sas lahiyи≥ cи≥rgи≥sini iе÷lи≥tmи≥k istи≥yirsiniz?"
-
-#: composer/e-msg-composer.c:863 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:869
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Bu ismarд╠c gц╤ndи≥rilи≥ bilmи≥di.\n"
-"\n"
-"Dи≥yiе÷ikliklи≥ri qeyd etmak istи≥yirsiniz?"
-
-#: composer/e-msg-composer.c:894
-msgid "Open file"
-msgstr "Faylд╠ aц╖"
-
-#: composer/e-msg-composer.c:1020
-msgid "That file does not exist."
-msgstr "Belи≥ bir fayl yoxdur ."
-
-#: composer/e-msg-composer.c:1030
-msgid "That is not a regular file."
-msgstr "Bu normal bir fayl deyildir ."
-
-#: composer/e-msg-composer.c:1040
-msgid "That file exists but is not readable."
-msgstr "Bu fayl vardд╠r amma oxuna bilи≥n deyildir ."
-
-#: composer/e-msg-composer.c:1050
-msgid "That file appeared accesible but open(2) failed."
-msgstr ""
-"Bu fayl и≥l ц╖atд╠la bilи≥ndi dи≥yи≥sи≥n amma open(2)-ц╖aд÷д╠rд╠е÷д╠ iflas "
-"etdi ."
-
-#: composer/e-msg-composer.c:1072
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
 msgstr ""
-"Bu fayl ц╖ox bц╤yц╪kdц╪r ( 100 KB'dи≥n bц╤yц╪k ! ) .\n"
-"Bu faylд╠ daxil etmи≥k istи≥yirsanmi?"
-
-#: composer/e-msg-composer.c:1093
-msgid "An error occurred while reading the file."
-msgstr "Faylд╠ oxurkи≥n bir xи≥ta oldu ."
 
-#: composer/e-msg-composer.c:1394 composer/e-msg-composer.c:1737
-msgid "Compose a message"
-msgstr "Bir ismarд╠c yaz"
-
-#: composer/e-msg-composer.c:1828
-msgid "Could not create composer window."
-msgstr "Dialoq qutusunu yarada bilmи≥dim ."
-
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "ц°nvan dи≥ftи≥ri ц╪ц╖ц╪n buraya tд╠qla"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:354 mail/mail-format.c:744
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "Gц╤ndи≥rи≥n:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:360 mail/mail-format.c:746
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "Cavab ver"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:371 mail/mail-format.c:643
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Mц╤vzu :"
 
-#: composer/e-msg-composer-hdrs.c:385 mail/mail-format.c:748
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "Gn:"
 
-#: composer/e-msg-composer-hdrs.c:386
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "д╟smarд╠cд╠n gц╤ndи≥rildiд÷i adamlar"
 
-#: composer/e-msg-composer-hdrs.c:389 mail/mail-format.c:750
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "д╟smarд╠cд╠n nц╪sxи≥sinin gц╤ndи≥rilи≥cи≥yi ц╪nvanlar"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4937,7 +5759,137 @@ msgstr ""
 "д╟smarд╠cд╠n nц╪sxи≥lи≥rinin gц╤ndи≥rilи≥cи≥yi ц╪nvanlarд╠ bildir; bunlar "
 "ц╤zlи≥rini ismarд╠cд╠n gц╤ndи≥rildiд÷i adamlar arasд╠nda gц╤rmи≥yи≥cи≥kdir ."
 
-#: composer/evolution-composer.c:355
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Bir fayl yapд╠е÷dд╠r"
+
+#: composer/e-msg-composer.c:670
+#, fuzzy, c-format
+msgid ""
+"Could not open file %s:\n"
+"%s"
+msgstr ""
+"`%s' Faylд╠ aц╖д╠la bilmir:\n"
+"%s"
+
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr "Fayl yц╪klи≥rkи≥n xи≥ta oldu: %s"
+
+#: composer/e-msg-composer.c:873
+msgid "Save as..."
+msgstr "Fи≥rqli qeyd et ..."
+
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "Xи≥bи≥rdarlд╠q"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
+#, c-format
+msgid "Error saving file: %s"
+msgstr "Fayl qeyd edи≥rkи≥n xи≥ta oldu: %s"
+
+#: composer/e-msg-composer.c:926
+#, c-format
+msgid "Error loading file: %s"
+msgstr "Fayl yц╪klи≥rkи≥n xи≥ta oldu: %s"
+
+#: composer/e-msg-composer.c:997
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"Bu hesab ц╪ц╖ц╪n lahiyи≥ cи≥rgи≥sи≥ aц╖д╠la bilmи≥di.\n"
+"ф▐sas lahiyи≥ cи≥rgи≥sini iе÷lи≥tmи≥k istи≥yirsiniz?"
+
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Fayl qeyd edи≥rkи≥n xи≥ta oldu: %s"
+
+#: composer/e-msg-composer.c:1055
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "%s POP vericisindи≥n ismarд╠clar alд╠na bilmи≥di: %s"
+
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"Nи≥ticи≥ faylд╠ yaradд╠la bilmir: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"Nи≥ticи≥ faylд╠ yaradд╠la bilmir: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"д╟smarд╠clarд╠n buraya qeyd edilmи≥ xatasд╠: %s:\n"
+" %s"
+
+#: composer/e-msg-composer.c:1173
+#, fuzzy
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+"Evolution Pine mи≥ktub fayllarд╠ tapdд╠.\n"
+"Onlarд╠ proqramд╠mд╠za idxal edи≥k?"
+
+#: composer/e-msg-composer.c:1321
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Bu ismarд╠c gц╤ndи≥rilи≥ bilmи≥di.\n"
+"\n"
+"Dи≥yiе÷ikliklи≥ri qeyd etmak istи≥yirsiniz?"
+
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
+msgid "Open file"
+msgstr "Faylд╠ aц╖"
+
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "_Mи≥tn faylд╠nд╠ daxil et ... "
+
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+msgid "Compose a message"
+msgstr "Bir ismarд╠c yaz"
+
+#: composer/e-msg-composer.c:2351
+msgid "Could not create composer window."
+msgstr "Dialoq qutusunu yarada bilmи≥dim ."
+
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -4946,7 +5898,7 @@ msgstr ""
 "parц╖asд╠ndakд╠\n"
 "heц╖ bir qurг╖ulari, aparmamд╠sд╠nд╠z."
 
-#: composer/evolution-composer.c:370
+#: composer/evolution-composer.c:374
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolutionun ePoц╖t yazma parц╖asд╠nд╠ baе÷lada bilmи≥dim ."
 
@@ -4963,36 +5915,56 @@ msgid "calendar information"
 msgstr "tи≥qvim haqqд╠nda"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%m/%d/%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %m/%d/%Y"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -5000,271 +5972,65 @@ msgstr "%a %m/%d/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
-
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Evolutionun д╟cracд╠ Mц╪ndи≥ricat parц╖asд╠nд╠ baе÷lada bilmи≥dim ."
-
-#: executive-summary/component/e-summary.c:926
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Html Faylд╠nд╠ aц╖a bilmи≥dim:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:940
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-" Data oxunarkи≥n xи≥ta oldu:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:958
-msgid "File does not have a place for the services.\n"
-msgstr "Faylд╠nд╠n xidmи≥tlи≥r ц╪ц╖ц╪n ayrд╠lmд╠е÷ sahи≥si yoxdur.\n"
-
-#: executive-summary/component/e-summary-callbacks.c:126
-msgid "Select a service"
-msgstr "Xidmц╕t seц╖"
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"д╟cracд╠ Mц╪ndи≥ricatд╠nд╠n arxaplanд╠ ц╪ц╖ц╪n baе÷qa HTML sи≥hifи≥si seц╖и≥ "
-"bilи≥rsiniz\n"
-"\n"
-"Ana seц╖и≥nи≥k ц╪ц╖ц╪n boе÷ buraxд╠n"
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "%s i и≥sas GNOME proqramд╠ ilи≥ aц╖"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "%s i и≥sas GNOME sи≥yyahд╠ ilи≥ aц╖"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "%s a(и≥) mи≥ktub gц╤ndи≥r"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Gц╤rц╪nц╪е÷ц╪ %s a(и≥)dи≥yiе÷dir"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "%s i(д╠) д╟е÷и≥ sal"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "%s i(д╠) Qapat"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "%s i(д╠) sola kц╤ц╖ц╪r"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "%s i(д╠) saд÷a kц╤ц╖ц╪r"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "%s i(д╠) и≥vvи≥lki sи≥tirи≥ kц╤ц╖ц╪r"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "%s i(д╠) sonrakд╠ sи≥tirи≥ kц╤ц╖ц╪r"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "%s i(д╠) Quraе÷dд╠r"
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "Gц√rц╪nц╪е÷"
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "Arxaplan:"
-
-#: executive-summary/component/main.c:62
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"д╟cracд╠ mц╪ndи≥ricatд╠ ц╪zvц╪ Bonoboyu baе÷lada bilmи≥di.\n"
-"ф▐gи≥r RootPOA haqqд╠nda xи≥bи≥rdarlд╠q aldд╠nд╠z isи≥, demи≥li Bonoboyu OAG "
-"yerinи≥\n"
-"GOAD ila dayд╠qladд╠nд╠z."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "д╟cracд╠ mц╪ndи≥ricat ц╪ц╖ц╪n 'Evolution' parц╖asд╠."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "'Evolution'un icracд╠ mц╪ndи≥ricat parц╖asд╠ e'malatxanasд╠."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "RDF mц╪ndи≥ricatд╠ e'malatxanasд╠."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "RDF Mц╪ndи≥ricatд╠"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "Sд╠naq bonobo parц╖asд╠ e'malatxanasд╠."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "Sд╠naq parц╖asд╠ e'malatxanasд╠."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Bonobo xidmи≥ti"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Sд╠naq xidmи≥ti"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "Xи≥ta"
-
-#: executive-summary/test-service/rdf-summary.c:768
-msgid "Update automatically"
-msgstr "Avtomatik gц╪ncи≥llи≥"
-
-#: executive-summary/test-service/rdf-summary.c:778
-msgid "Update now"
-msgstr "д╟ndi gц╪ncи≥llи≥"
-
-#: executive-summary/test-service/rdf-summary.c:788
-msgid "Update every "
-msgstr "Gц╪ncи≥llи≥mи≥lri hи≥r "
-
-#: executive-summary/test-service/rdf-summary.c:796
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "dи≥qiqи≥"
-
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "il"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "il"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "ay"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "ay"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "hи≥ftи≥"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "hи≥ftи≥"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "gц╪n"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "saat"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "saat"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "dи≥qiqи≥"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "saniyи≥"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "saniyи≥"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Vaxsey. Tarix atmaд÷д╠ unutmusan."
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Vaxsey. Hц╤kmsц╪z tarixi seц╖misи≥n."
 
-#: filter/filter-datespec.c:276
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -5274,7 +6040,7 @@ msgstr ""
 "vfolderin aц╖д╠q qaldд╠д÷д╠ mц╪ddи≥t ilи≥ mц╪qayisи≥\n"
 "edilи≥cи≥kdir."
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5282,7 +6048,7 @@ msgstr ""
 "Bu ismarд╠c tarixi burada gц╤stи≥rdiyiniz ilи≥\n"
 "mц╪qayisи≥ edilи≥cи≥kdir."
 
-#: filter/filter-datespec.c:339
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5293,28 +6059,36 @@ msgstr ""
 "\"bir haftи≥ и≥vval\" mи≥sи≥lи≥n."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "indiki vaxt"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "bildirdiyin vaxt"
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "indiki vaxta gц╤rи≥ mц╪ddи≥t"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Mц╪qayisи≥ et"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "indi"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<vaxtд╠ gц╤rи≥ bilmи≥k ц╪ц╖ц╪n buraya tд╠qlayд╠n>"
 
@@ -5340,8 +6114,8 @@ msgstr ""
 "Lц╪tfи≥n arxaya gedin vи≥ mи≥ktublarд╠n toplanacaд÷д╠ hц╤kmlц╪ bir qovluq "
 "seц╖in."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Qovluq Seц╖in"
 
@@ -5353,46 +6127,6 @@ msgstr "Qovluq URIsini Bildirin"
 msgid "<click here to select a folder>"
 msgstr "<qovluq seц╖mи≥k ц╪ц╖ц╪n buraya tд╠qlayд╠n>"
 
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Sц╪zgи≥clи≥ri Dц╪zи≥lt"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "VFolderlи≥ri Dц╪zи≥lt"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Gи≥lи≥n"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Gedи≥n"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr "Virtual Qovluqlar"
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr "tи≥kcи≥ xц╪susi qovluqlar"
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr "vFolder Qaynaqlarд╠"
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr "bц╪tц╪n fи≥al uzaq qovluqlarla"
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr "bц╪tц╪n yerli vи≥ fи≥al uzaq qovluqlarla"
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr "bц╪tц╪n yerli qovluqlarla"
-
 #: filter/filter-input.c:193
 #, c-format
 msgid ""
@@ -5414,36 +6148,88 @@ msgstr "Qayda adд╠ :"
 msgid "Untitled"
 msgstr "Adsд╠z"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "ф▐gи≥r"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Gediе÷i iе÷и≥ sal"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "bц╪tц╪n kriteriyalar uyд÷un gи≥lirsи≥"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "и≥gи≥r hи≥r hansд╠ bir kriteriya uyд÷un gи≥lirsи≥"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "Kriteriya и≥lavи≥ et"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "gи≥lи≥n"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "gedи≥n"
 
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "ф▐lavи≥ Et"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Dц╪zи≥lt"
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Sц╪zgи≥clи≥ri Dц╪zи≥lt"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "VFolderlи≥ri Dц╪zи≥lt"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "Gи≥lи≥n"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "Gedи≥n"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr "Virtual Qovluqlar"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr "tи≥kcи≥ xц╪susi qovluqlar"
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "vFolder Qaynaqlarд╠"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "bц╪tц╪n fи≥al uzaq qovluqlarla"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "bц╪tц╪n yerli vи≥ fи≥al uzaq qovluqlarla"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "bц╪tц╪n yerli qovluqlarla"
+
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
+#, fuzzy
+msgid "Assign Color"
 msgstr "Rи≥ngi Seц╖"
 
 #: filter/libfilter-i18n.h:4
@@ -5519,90 +6305,91 @@ msgid "Expression"
 msgstr "д╟fadи≥"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "д╟smarд╠cд╠ ц╪nvana irи≥lilи≥t"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "Vacib"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "dir(dд╠r)"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "bц╤yц╪kdц╪r"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "azdд╠r"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "deyil"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Mи≥ktublaе÷ma qrupu"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "д╟smarд╠c Gц╤vdи≥si"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "д╟smarд╠c Baе÷lд╠д÷д╠"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "д╟smarд╠c alд╠ndд╠"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "д╟smarд╠c gц╤ndи≥rildi"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Qovluд÷a Kц╤ц╖ц╪r"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr "da(dи≥) ya da sonra"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr "da(dи≥) ya da и≥vvи≥l"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Oxu"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Alд╠cд╠lar"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Regex Uyд÷unluqlarд╠"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Cavab verilи≥n"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.c:1083
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Xal"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Gц╤ndи≥rи≥n"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Hal Seц╖"
 
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Bц╤yц╪klц╪k"
+
 #: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "oxе÷ayд╠r"
@@ -5623,7 +6410,8 @@ msgstr "baе÷layд╠r"
 msgid "Stop Processing"
 msgstr "д╟е÷i Dayandд╠r"
 
-#: filter/libfilter-i18n.h:51 mail/message-list.c:1084
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Mц╤vzu"
 
@@ -5651,188 +6439,275 @@ msgstr "Qaydanд╠ Dц╪zи≥lt"
 msgid "Score Rules"
 msgstr "Qiymи≥tlи≥ndirmи≥ Qaydalarд╠"
 
-#: mail/component-factory.c:329
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
+msgstr "Al"
+
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "Mail"
+msgstr "ePoц╖t"
+
+#: importers/elm-importer.c:498
+#, fuzzy
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution Elm mи≥ktub fayllarд╠ tapdд╠.\n"
+"Onlarд╠ proqramд╠mд╠za idxal edи≥k?"
+
+#: importers/elm-importer.c:527
+msgid "Elm mail"
+msgstr "Elm Poц╖tu"
+
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "ц°nvan dи≥ftи≥ri и≥lavи≥ et"
+
+#: importers/evolution-gnomecard-importer.c:253
+#, fuzzy
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution Netscape  mи≥ktub fayllarд╠ tapdд╠.\n"
+"Onlarд╠ proqramд╠mд╠za idxal edи≥k?"
+
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "Qurд÷ular..."
+
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution Netscape  mи≥ktub fayllarд╠ tapdд╠.\n"
+"Onlarд╠ proqramд╠mд╠za idxal edи≥k?"
+
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution Pine mи≥ktub fayllarд╠ tapdд╠.\n"
+"Onlarд╠ proqramд╠mд╠za idxal edи≥k?"
+
+#: importers/pine-importer.c:691
+msgid "Pine mail"
+msgstr "Pine Poц╖tu"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "Mи≥ktub taе÷kilatcд╠sд╠ 'Evolution' parц╖asд╠."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr "'Evolution'un ePoц╖t yazд╠ц╖д╠sд╠."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr "'Evolution'un icracд╠ mц╪ndи≥ricat parц╖asд╠."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr "'Evolution'un mи≥ktub qovluд÷u nц╪mayiе÷cisi."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr "'Evolution'un mи≥ktub qovluд÷u nц╪mayiе÷cisi e'malatxanasд╠."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr "'Evolution'un mи≥ktub yazд╠ц╖д╠sд╠ e'malatxanasд╠."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr "'Evolution'un mи≥ktub parц╖asд╠ e'malatxanasд╠."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr "Mи≥ktub Mц╪ndи≥ricatд╠ parц╖asд╠ e'malatxanasд╠."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "ePoц╖t Quraе÷dд╠rд╠lmasд╠"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "_Seц╖и≥nи≥klи≥r..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Fayllarд╠n seц╖и≥nи≥klи≥rini tи≥kmillи≥е÷dir"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolutionun ePoц╖t parц╖asд╠nд╠ baе÷lada bilmи≥dim ."
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr "Nц╪sxи≥ni qabд╠q ilи≥ qeyd edи≥ bilmи≥dim"
 
-#: mail/folder-browser.c:267
+#: mail/folder-browser-ui.c:254
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "\"%s\"in Seц╖и≥nи≥klи≥ri"
+
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr "Seц╖и≥nи≥klи≥r"
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Mц╪vи≥qqи≥ti qovluq yaradд╠la bilmи≥di: %s"
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "Axtarд╠е÷д╠ vFolder olaraq saxla"
 
-#: mail/folder-browser.c:575 ui/evolution-mail.xml.h:91
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr "_Mц╤vzudakд╠ vFolder"
 
-#: mail/folder-browser.c:578 ui/evolution-mail.xml.h:89
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "Gц╤n_dи≥rи≥ndи≥ki vFolder"
 
-#: mail/folder-browser.c:581 ui/evolution-mail.xml.h:90
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "_Alд╠cд╠dakд╠ vFolder"
 
-#: mail/folder-browser.c:584 ui/evolution-mail.xml.h:88
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr "Mи≥ktublaе÷ma Q_rupundakд╠ VFolder"
 
-#: mail/folder-browser.c:590
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "Mц╤_vzudakд╠ Sц╪zgи≥c"
 
-#: mail/folder-browser.c:593
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "Gц╤n_dи≥rи≥ndи≥ki  Sц╪zgи≥c"
 
-#: mail/folder-browser.c:596
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "_Alд╠cд╠dakд╠ Sц╪zgи≥c"
 
-#: mail/folder-browser.c:599
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "_Mи≥ktublaе÷ma Qrupundakд╠ Sц╪zgи≥c"
 
-#: mail/folder-browser.c:608
-msgid "_Open"
-msgstr "_Aц╖"
-
-#: mail/folder-browser.c:610
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Yenidи≥n Gц╤ndи≥r"
 
-#: mail/folder-browser.c:612 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:113 ui/evolution-tasks.xml.h:8
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Fи≥rqli _Qeyd Et ..."
 
-#: mail/folder-browser.c:614 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "_ц┤ap Et"
 
-#: mail/folder-browser.c:619
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "Gц╤ndи≥rи≥nи≥ _Cavab Ver"
 
-#: mail/folder-browser.c:621 ui/evolution-mail.xml.h:66
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "_Hamд╠sд╠na Cavab Ver"
+
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "_Hamд╠sд╠na Cavab Ver"
 
-#: mail/folder-browser.c:623 ui/evolution-mail.xml.h:102
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "_ц┤atdд╠r"
 
-#: mail/folder-browser.c:625
-msgid "Forward _inline"
-msgstr "_Hи≥mи≥n ц╖atdд╠r"
-
-#: mail/folder-browser.c:628 ui/evolution-mail.xml.h:40
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Oxun_muе÷ olaraq д╟е÷arи≥tlи≥"
 
-#: mail/folder-browser.c:630 ui/evolution-mail.xml.h:44
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Ox_unmamд╠е÷ olaraq д╟е÷arи≥tlи≥"
 
-#: mail/folder-browser.c:635 ui/evolution-mail.xml.h:107
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "Vacib"
+
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Ox_unmamд╠е÷ olaraq д╟е÷arи≥tlи≥"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "Qovluд÷a _Daе÷д╠ ..."
 
-#: mail/folder-browser.c:637 ui/evolution-mail.xml.h:96
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "Qovluд÷a _Kц╤ц╖ц╪rt..."
 
-#: mail/folder-browser.c:641 ui/evolution-mail.xml.h:118
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "_Geri Gи≥tir"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:651 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "ц°nvan dи≥ftи≥ri и≥lavи≥ et"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Sц╪zgи≥clи≥r ф▐lavи≥ Et"
 
-#: mail/folder-browser.c:655
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "д╟smarд╠cdan Qa_yda Yarat"
 
-#: mail/folder-browser.c:794
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "Mи≥ktublaе÷ma Qrupundakд╠ Sц╪zgи≥c"
 
-#: mail/folder-browser.c:795
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "Mи≥ktublaе÷ma Qrupundakд╠ VFolder"
 
-#: mail/folder-browser.c:797
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Mи≥ktublaе÷ma Qrupunda Sц╪z (%s)"
 
-#: mail/folder-browser.c:798
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "(%s) Mи≥ktublaе÷ma Qrupundakд╠ VFolder"
 
-#: mail/folder-browser-factory.c:213
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "\"%s\"in Seц╖и≥nи≥klи≥ri"
-
-#: mail/folder-browser-factory.c:215 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Seц╖и≥nи≥klи≥r"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "Mи≥ktub taе÷kilatcд╠sд╠ 'Evolution' parц╖asд╠."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "'Evolution'un ePoц╖t yazд╠ц╖д╠sд╠."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "'Evolution'un icracд╠ mц╪ndи≥ricat parц╖asд╠."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "'Evolution'un mи≥ktub qovluд÷u nц╪mayiе÷cisi."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "'Evolution'un mи≥ktub qovluд÷u nц╪mayiе÷cisi e'malatxanasд╠."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "'Evolution'un mи≥ktub yazд╠ц╖д╠sд╠ e'malatxanasд╠."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "'Evolution'un mи≥ktub parц╖asд╠ e'malatxanasд╠."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "Mи≥ktub Mц╪ndи≥ricatд╠ parц╖asд╠ e'malatxanasд╠."
-
-#: mail/importers/elm-importer.c:420
-msgid ""
-"Evolution has found Elm mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution Elm mи≥ktub fayllarд╠ tapdд╠.\n"
-"Onlarд╠ proqramд╠mд╠za idxal edи≥k?"
-
-#: mail/importers/elm-importer.c:430
-msgid "Elm mail"
-msgstr "Elm Poц╖tu"
-
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr "'Mbox'u 'Evolution' iц╖inи≥ gи≥tirи≥n e'malatxana"
@@ -5851,26 +6726,6 @@ msgstr ""
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "'Outlook Express 4' fayllarд╠nд╠ 'Evolution' iц╖inи≥ gи≥tirir."
 
-#: mail/importers/netscape-importer.c:440
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Evolution Netscape  mи≥ktub fayllarд╠ tapdд╠.\n"
-"Onlarд╠ proqramд╠mд╠za idxal edи≥k?"
-
-#: mail/importers/pine-importer.c:385
-msgid ""
-"Evolution has found Pine mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution Pine mи≥ktub fayllarд╠ tapdд╠.\n"
-"Onlarд╠ proqramд╠mд╠za idxal edи≥k?"
-
-#: mail/importers/pine-importer.c:395
-msgid "Pine mail"
-msgstr "Pine Poц╖tu"
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Hazд╠rkд╠ Saxlama е·и≥kli:"
@@ -5905,37 +6760,69 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
 msgid "You have not filled in all of the required information."
 msgstr "Lazд╠mi bц╪tц╪n mи≥'lumatlar verilmи≥lidir."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Evolution Hesab Dц╪zи≥ldicisi"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Evolution Hesab Dц╪zи≥ldicisi"
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "Imza faylд╠ : "
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Bu ismarд╠c gц╤ndи≥rilи≥ bilmи≥di.\n"
+"\n"
+"Dи≥yiе÷ikliklи≥ri qeyd etmak istи≥yirsiniz?"
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr " (varsayд╠lan) "
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "Baд÷la"
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "Fи≥allaе÷dд╠r"
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "Bu hesabд╠ hи≥qiqи≥tи≥n dи≥ silmи≥k istи≥yirsiniz?"
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Geri Qaytar"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "Bunu и≥sas hesab olaraq gц╤stи≥r"
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr "Bu xи≥bи≥r hesabд╠nд╠ hи≥qiqи≥tи≥n dи≥ silmи≥k istи≥yirsiniz?"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:536
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Evolution Hesab д╟darи≥cisi"
 
@@ -6003,39 +6890,47 @@ msgstr ""
 "Bu ismarд╠cд╠n mц╤vzusu yoxdur .\n"
 "Hи≥qiqи≥tи≥n dи≥ gц╤ndи≥rim?"
 
-#: mail/mail-callbacks.c:311
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr "Mи≥ktubu gц╤ndи≥rи≥ bilmи≥k ц╪ц╖ц╪n alд╠cд╠nд╠ da bildirmи≥lisи≥n."
 
-#: mail/mail-callbacks.c:354
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr ""
 "Bu ePoц╖tu gц╤ndи≥rmи≥kdи≥n и≥vvи≥l bir ePoц╖t\n"
 "hesabд╠nд╠ quraе÷dд╠rmalд╠san."
 
-#: mail/mail-callbacks.c:593
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "%s da(dи≥) %s yazmд╠е÷dд╠r:"
 
-#: mail/mail-callbacks.c:774
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Bu ismarд╠cд╠ ц╖atdд╠r:\n"
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "д╟smarд╠c(larд╠) buraya daе÷д╠ "
 
-#: mail/mail-callbacks.c:879
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "д╟smarд╠c(larд╠) buraya kц╤ц╖ц╪rt"
 
-#: mail/mail-callbacks.c:1156
+#: mail/mail-callbacks.c:1374
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Bц╪tц╪n `%d' ismarд╠clarд╠nд╠ dц╪zи≥ltmи≥k istи≥yirsiniz?"
 
-#: mail/mail-callbacks.c:1170
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6043,7 +6938,7 @@ msgstr ""
 "Siz sadи≥cи≥ olaraq Vи≥zifи≥lи≥r qovluд÷undakд╠\n"
 "ismarд╠clarд╠ dц╪zи≥ldи≥ bilи≥rsiniz."
 
-#: mail/mail-callbacks.c:1202
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6051,31 +6946,24 @@ msgstr ""
 "Sadи≥cи≥ olaraq Gц╤ndи≥rilи≥n cи≥rgи≥sinи≥ qeyd edilи≥n\n"
 "ismarд╠clarд╠ yeniden gц╤nderebilirsiniz."
 
-#: mail/mail-callbacks.c:1224
+#: mail/mail-callbacks.c:1442
+#, fuzzy, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "Bц╪tц╪n `%d' ismarд╠clarд╠nд╠ dц╪zи≥ltmи≥k istи≥yirsiniz?"
+
+#: mail/mail-callbacks.c:1463
 msgid "No Message Selected"
 msgstr "Heц╖ д╟smarд╠c Seц╖ilmи≥di"
 
-#: mail/mail-callbacks.c:1250 mail/mail-display.c:90
-msgid "Overwrite file?"
-msgstr "Faylд╠nд╠n ц╪sц╪tц╪nи≥ yazд╠m mд╠?"
-
-#: mail/mail-callbacks.c:1254 mail/mail-display.c:94
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Eyni adlд╠ bir fayl onsuz da vardд╠r.\n"
-"ц°stц╪nи≥ yazд╠m mд╠?"
-
-#: mail/mail-callbacks.c:1298
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "д╟smarд╠cд╠ Fи≥rqli Qeyd Et..."
 
-#: mail/mail-callbacks.c:1300
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "д╟smarд╠clarд╠ Fи≥rqli Qeyd Et..."
 
-#: mail/mail-callbacks.c:1435
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6084,23 +6972,24 @@ msgstr ""
 "Sц╪zgи≥c mи≥'lumatд╠nд╠ yц╪klи≥mи≥ xи≥tasд╠:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1484 ui/evolution-mail.xml.h:56
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "_Sц╪zgи≥clи≥r ..."
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "д╟smarд╠cд╠ ц┤ap Et"
 
-#: mail/mail-callbacks.c:1531
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "д╟smarд╠larд╠n ц╖ap edilmи≥si bacarд╠lmadд╠"
 
-#: mail/mail-callbacks.c:1609
+#: mail/mail-callbacks.c:1966
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Bц╪tц╪n %d ismarд╠clarд╠nд╠ baе÷qa pи≥ncи≥rи≥dи≥ aц╖maq istи≥yirsiniz?"
 
-#: mail/mail-config.c:1121 mail/mail-config.c:1124
-msgid "Connecting to server..."
-msgstr "Vericiyи≥ baд÷lantд╠ qurulur..."
-
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -6145,10 +7034,14 @@ msgstr ""
 "hesab ц╪ц╖ц╪n bir ad veriniz. "
 
 #. set window title
-#: mail/mail-config-druid.c:445
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr "Evolution Hesab Sehirbazд╠"
 
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
+msgstr "Vericiyи≥ baд÷lantд╠ qurulur..."
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr " Dи≥stи≥klи≥nи≥n nц╤vlи≥ri yoxla "
@@ -6158,34 +7051,64 @@ msgid " color"
 msgstr " rи≥ng"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Bu е÷ifrlи≥mи≥ ilи≥ imza dи≥stи≥klи≥nmir"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Hesab"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Hesab Haqqд╠nda"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "Hesab д╟darи≥si"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Hesablar"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Yapд╠е÷dд╠rд╠lmд╠е÷ fayl"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Tanд╠tma"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Kimlik Yoxlama Nц╤vц╪: "
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "ePoц╖tlarд╠ avtomatik yoxla:"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "Yaz"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6201,163 +7124,279 @@ msgstr ""
 "\n"
 "Qurд÷ularд╠nд╠zд╠ qeyd etmи≥k ц╪ц╖ц╪n \"Qurtar\"a basд╠n."
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "ф▐_sas"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Qurtardд╠"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Lahiyи≥lи≥r"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Lahiyи≥lи≥r cи≥rgи≥si:"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "Dц╪zи≥lt..."
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "ePoц╖t ц°nvanд╠: "
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "Fи≥allaе÷dд╠r"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Tam Ad:"
 
-#: mail/mail-config.glade.h:27
-msgid "Highlight citations with "
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
+msgstr ""
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "Imza faylд╠ : "
+
+#: mail/mail-config.glade.h:43
+#, fuzzy
+msgid "Highlight citations with"
 msgstr "Sitatlarд╠ Rи≥nglи≥ndir: "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Kimlik"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Inline"
+msgstr "_Xи≥tdи≥"
+
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "ePoц╖t Quraе÷dд╠rд╠lmasд╠"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Mи≥ktub Qutusu е·и≥kli"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "Bunu и≥sas hesab olaraq gц╤stи≥r"
 
-#: mail/mail-config.glade.h:34
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "д╟smarд╠clarд╠ bundan sonra \"Oxundu\" olaraq iе÷arи≥tlи≥: "
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "LDAP Vericisi"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "Xи≥bи≥rlи≥r"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "Arzuya Baд÷lд╠ Mи≥'lumatlar"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Orqanizasiya"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "PGP binarд╠ cд╠д÷д╠rд╠:"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "Rи≥ng al"
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "д╟smarд╠c gц╤ndrи≥rilи≥ bilmи≥di: alд╠cд╠ bildirilmи≥yib."
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr "Qmail cи≥rgи≥si "
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "_Kotalanmд╠е÷"
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "ePoц╖t Alд╠nд╠r"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "E-poц╖t Alд╠nд╠r"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "Alma Seц╖и≥nи≥klи≥ri"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "д╟stи≥nи≥n Mи≥'lumatlar"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
+
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Security"
+msgstr "_Tи≥hlц╪kи≥sizlik"
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "PGP binarд╠nд╠ seц╖"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "ф▐sas olaraq ePoц╖tu HTML е·и≥klindи≥ gц╤ndи≥r"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "ePoц╖t Gц╤ndи≥rilir"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "E-poц╖t Gц╤ndи≥rilir"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "Gц╤ndи≥rildi"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr "Gц╤ndи≥rilи≥n vи≥ Lahiyи≥ д╟smarд╠clarд╠"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "Gц╤ndи≥rilи≥n ismarд╠clar cи≥rgи≥si:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Verici Quraе÷dд╠rд╠lmasд╠"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Verici Nц╤vц╪: "
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Verici tanд╠tmaya ehtiyac hiss edи≥r"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Imza faylд╠ : "
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "Qaynaqlar"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Mи≥'lumat Yoxdur"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Qaynaqlar"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "Xц╪susi Cи≥rgи≥lи≥r"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr "Standart UNIX poц╖t qutusu faylд╠"
 
-#: mail/mail-config.glade.h:68
-msgid "Type"
-msgstr "Nц╤v"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "E'tibarlд╠ baд÷lantд╠ (SSL) iе÷lи≥t"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "д╟stifadи≥ц╖i adд╠ :"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6367,161 +7406,244 @@ msgstr ""
 "\n"
 "Baе÷lamaq ц╪ц╖ц╪n \"Sonrakд╠\" dц╪ymи≥sinи≥ basд╠n. "
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "_Dц╪zи≥lt"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
+msgstr ""
+
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
+msgstr ""
+
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr "saniyи≥."
+
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "%s ц╪stц╪ndи≥ki POP vericisi ilи≥ ц╪nsiyyи≥t qurula bilmir."
+
+#: mail/mail-crypto.c:86
+#, fuzzy
+msgid "Could not create a PGP verification context."
+msgstr "%s ц╪stц╪ndи≥ki POP vericisi ilи≥ ц╪nsiyyи≥t qurula bilmir."
+
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr "Dialoq qutusunu yarada bilmи≥dim ."
 
-#: mail/mail-display.c:194
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
+msgstr ""
+"%s qovluд÷unu yarada bilmи≥dim:\n"
+"%s"
+
+#: mail/mail-crypto.c:177
+msgid "Could not create a S/MIME signature context."
+msgstr ""
+
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
+msgstr ""
+
+#: mail/mail-crypto.c:240
+msgid "Could not create a S/MIME encryption context."
+msgstr ""
+
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "Dialoq qutusunu yarada bilmи≥dim ."
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr "Dialoq qutusunu yarada bilmи≥dim ."
+
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Yapд╠е÷dд╠rд╠lmд╠е÷ Faylд╠ Qeyd Et"
 
-#: mail/mail-display.c:234
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Mц╪vи≥qqи≥ti qovluq yaradд╠la bilmи≥di: %s"
-
-#: mail/mail-display.c:295
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Diskи≥ Qeyd Et ..."
 
-#: mail/mail-display.c:297
-#, c-format
-msgid "Open in %s..."
-msgstr "%s da(dи≥) Aц╖ ..."
-
-#: mail/mail-display.c:299
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "д╟ц╖и≥risini Gц╤stи≥r"
 
-#: mail/mail-display.c:334
-msgid "External Viewer"
-msgstr "Xarici Gц╤stи≥rici"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "%s da(dи≥) Aц╖ ..."
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "д╟ц╖и≥risini Gц╤stи≥r (%s ilи≥)"
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Gizlи≥t"
 
-#: mail/mail-display.c:1107
-msgid "Open link in browser"
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "Xarici Gц╤stи≥rici"
+
+#: mail/mail-display.c:1048
+msgid "Loading message content"
+msgstr "д╟smarд╠c iц╖indи≥kilи≥r yц╪klи≥nir"
+
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
 msgstr "Kц╤rpц╪nц╪ sи≥yyahda aц╖"
 
-#: mail/mail-display.c:1109
-msgid "Save as (FIXME)"
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "ц°nvanд╠ kц╤ц╖ц╪r"
+
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
 msgstr "Fи≥rqli qeyd et"
 
-#: mail/mail-display.c:1111
-msgid "Copy location (FIXME)"
-msgstr "ц°nvanд╠ kц╤ц╖ц╪r"
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "Fи≥rqli qeyd et ..."
+
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
 
-#: mail/mail-format.c:522
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr "%d saniyи≥"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s yapд╠е÷dд╠rд╠lmд╠е÷ fayl"
 
-#: mail/mail-format.c:564
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME ismarд╠cд╠ aц╖д╠la bilmи≥di: Mи≥nbи≥ kodu gц╤steriliyor."
 
-#: mail/mail-format.c:771
-msgid "Loading message content"
-msgstr "д╟smarд╠c iц╖indи≥kilи≥r yц╪klи≥nir"
+#: mail/mail-format.c:746
+msgid "Date"
+msgstr "Tarix"
+
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "ePoц╖t ц°nvanд╠: "
 
-#: mail/mail-format.c:1080
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr "Gц╤ndи≥rи≥n"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "Cavab ver"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "Gn:"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Cc:"
+
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "Heц╖ GPG/PGP proqramд╠ qurulmayд╠b."
 
-#: mail/mail-format.c:1095
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "Kodlanmд╠е÷ ismarд╠c gц╤stи≥rilmи≥di"
 
-#: mail/mail-format.c:1101
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Kodlanmд╠е÷ д╟smarд╠c"
 
-#: mail/mail-format.c:1102
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Kodu aц╖maq ц╪ц╖ц╪n timsala basд╠n."
 
-#: mail/mail-format.c:1192 mail/mail-format.c:1580
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 "Bu ismarд╠c digital olaraq imzalanmд╠е÷dд╠r vи≥ original olduд÷u "
 "dц╪е÷ц╪nц╪lц╪r."
 
-#: mail/mail-format.c:1200 mail/mail-format.c:1588
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Bu ismarд╠c digital olaraq imzalanmд╠е÷dд╠r amma original olduд÷u "
 "dц╪е÷ц╪nц╪lmц╪r."
 
-#: mail/mail-format.c:1801
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP saytд╠nд╠ gц╤stи≥rи≥n ox (%s)"
 
-#: mail/mail-format.c:1813
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Yerli faylyi gц╤stи≥rи≥n (%s) oxu \"%s\" saytд╠nda hц╤kmlц╪dц╪r"
 
-#: mail/mail-format.c:1817
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Yerli faylyi gц╤stи≥rи≥n ox (%s)"
 
-#: mail/mail-format.c:1851
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "FTP saytд╠nд╠ gц╤stи≥rи≥n ox (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Namи≥'lum xarici mи≥'lumatд╠ gц╤stи≥rи≥n ox (\"%s\" nц╤vц╪ndи≥ "
 
-#: mail/mail-format.c:1856
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr "Xи≥sи≥rli xarici proqram parц╖asд╠."
 
-#: mail/mail-local.c:509
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "'%s' Aц╖д╠lд╠r"
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" qovluд÷u \"%s\" е÷и≥klinи≥ ц╖evrilir"
 
-#: mail/mail-local.c:791
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "\"%s\" qovluд÷unu \"%s\" е÷и≥klinи≥ ц╖evir"
-
-#: mail/mail-local.c:814
-msgid "Reconfiguring folder"
-msgstr "Qovluq yenidи≥n qurulur"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:843
-msgid "Closing current folder"
-msgstr "Hazд╠rkд╠ qovluq qapadд╠lд╠r"
-
-#: mail/mail-local.c:875
-msgid "Renaming old folder and opening"
-msgstr "Kц╤hnи≥ qovluд÷un adд╠ dи≥yiе÷dirilir vи≥ aц╖д╠lд╠r"
-
-#: mail/mail-local.c:893
-msgid "Creating new folder"
-msgstr "Yeni bir qovluq yarat"
-
-#: mail/mail-local.c:907
-msgid "Copying messages"
-msgstr "д╟smarд╠clar kц╤ц╖ц╪rц╪lц╪r"
-
-#: mail/mail-local.c:924
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6530,7 +7652,7 @@ msgstr ""
 "Qovluд÷un meta mи≥'lumatд╠nд╠ qeyd eda bilmи≥dim; Bu qovluд÷u bir dи≥ aц╖a\n"
 "bilmи≥yи≥ bilи≥sи≥n: %s"
 
-#: mail/mail-local.c:963
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6538,7 +7660,17 @@ msgstr ""
 "Bu qovluд÷u bir dи≥ aц╖a bilmи≥sи≥n, onu и≥llи≥\n"
 "bи≥rpa etmи≥lisи≥n."
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "Buradakд╠ ismarд╠clarд╠ zibilи≥ gц╤ndи≥rи≥ bilmи≥zsiniz."
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "%s i(д╠) Quraе÷dд╠r"
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6547,7 +7679,7 @@ msgstr ""
 "'%s' sд╠rasд╠nda xи≥ta:\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6556,101 +7688,105 @@ msgstr ""
 "ф▐mи≥liyyat aparд╠lд╠rkи≥n xи≥ta oldu:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:880
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "д╟е÷lи≥yir"
 
-#: mail/mail-mt.c:862
-msgid "Evolution progress"
-msgstr "\"Evolution\"un gediе÷i"
-
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" Gц╤ndи≥rilir"
 
-#: mail/mail-ops.c:603
-msgid "Sending message"
-msgstr "д╟smarд╠c gц╤ndи≥rilir"
-
-#: mail/mail-ops.c:718
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d ismarд╠c gц╤ndи≥rilir"
 
-#: mail/mail-ops.c:737
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "%d/%d ismarд╠cda xи≥ta"
 
-#: mail/mail-ops.c:739 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "Qurtadд╠."
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "д╟smarд╠clar qovluд÷a qeyd edilir"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "д╟smarд╠clar \"%s\"a(и≥) daе÷д╠nд╠r"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "д╟smarд╠clar \"%s\"a(и≥) kц╤ц╖ц╪rц╪lц╪r"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Daе÷д╠nд╠r"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Kц╤ц╖ц╪rdц╪lц╪r"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" dakд╠ qovluqlar daranд╠r"
 
-#: mail/mail-ops.c:1154
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "Zibil Qutusu"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "ц┤atdд╠rд╠lmд╠е÷ ismarд╠c"
 
-#: mail/mail-ops.c:1195 mail/mail-ops.c:1333
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s qovluд÷u aц╖д╠lд╠r"
 
-#: mail/mail-ops.c:1262
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr "%s qaynaд÷д╠ aц╖д╠lд╠r"
 
-#: mail/mail-ops.c:1449
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "%s qovluд÷u aц╖д╠lд╠r"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "Qovluq yenidи≥n qurulur"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "Qovluq aц╖д╠lд╠r"
 
-#: mail/mail-ops.c:1498
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s ismarд╠cд╠ alд╠nд╠r"
 
-#: mail/mail-ops.c:1565
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "д╟smarд╠clar alд╠nд╠r"
 
-#: mail/mail-ops.c:1575
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "%d nin %d ismarд╠cд╠ alд╠nд╠r (uid \"%s\")"
-
-#: mail/mail-ops.c:1649
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "д╟smarд╠clar qeyd edilir"
 
-#: mail/mail-ops.c:1728
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6659,12 +7795,7 @@ msgstr ""
 "Nи≥ticи≥ faylд╠ yaradд╠la bilmir: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1741
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "%d nin %d ismarд╠cд╠ qeyd edilir (uid \"%s\")"
-
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6673,11 +7804,11 @@ msgstr ""
 "д╟smarд╠clarд╠n buraya qeyd edilmи≥ xatasд╠: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "Yapд╠е÷dд╠rд╠lmд╠е÷ Fayl Qeyd Edilir"
 
-#: mail/mail-ops.c:1844
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6686,233 +7817,196 @@ msgstr ""
 "Yekun faylд╠ yaradд╠la bilmir: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1872
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Data yazд╠la bilmи≥di: %s"
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "A_xtar"
+#: mail/mail-ops.c:2101
+#, c-format
+msgid "Disconnecting from %s"
+msgstr ""
+
+#: mail/mail-search.c:138
+#, fuzzy
+msgid "(Untitled Message)"
+msgstr "( Adsд╠z )"
+
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "ц┤oxlu д╟smarд╠c"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "д╟smarд╠cд╠ Dц╪zи≥lt"
+
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "д╟smarд╠cд╠ Dц╪zи≥lt"
+
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-search.c:315
+#, fuzzy
+msgid "Search Forward"
+msgstr "ц┤atdд╠r"
+
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
+msgstr "Axtar"
 
-#: mail/mail-send-recv.c:138
-msgid "Cancelling ..."
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "Yol:"
+
+#: mail/mail-send-recv.c:141
+#, fuzzy
+msgid "Cancelling..."
 msgstr "Lи≥д÷v Edilir ..."
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "ePoц╖t Gц╤ndи≥r vи≥ Al"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "Alд╠nд╠r"
 
-#: mail/mail-send-recv.c:285
-msgid "Updating ..."
+#: mail/mail-send-recv.c:302
+#, fuzzy
+msgid "Updating..."
 msgstr "Gц╪ncи≥llи≥nir ..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
-msgid "Waiting ..."
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#, fuzzy
+msgid "Waiting..."
 msgstr "Gц╤zlи≥nilir ..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "Gц╤ndи≥rilir"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "Lи≥д÷v Edildi."
 
-#: mail/mail-summary.c:110
-msgid "Incomplete message written on pipe!"
-msgstr "Borulamadan xи≥sи≥rli bir ismarд╠c gи≥ldi !"
-
-#: mail/mail-summary.c:468
-msgid "Mail Summary"
-msgstr "Poц╖t Mц╪ndи≥ricatд╠"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
+msgstr "д╟stifadи≥ц╖i и≥mи≥liyyatд╠ lи≥д÷v etdi."
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Mц╪vи≥qqи≥ti '%s' mboxu yaradд╠la bilmir: %s"
 
-#: mail/mail-tools.c:188
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (ц╖atdд╠rilmiе÷ ismarд╠c)"
-
-#: mail/mail-tools.c:198
-msgid "Fwd: (no subject)"
-msgstr "Dvm: (mц╤vzusuz)"
-
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "ц┤atdд╠rд╠lmд╠е÷ ismarд╠c - %s"
 
-#: mail/mail-tools.c:217
-msgid "Forwarded message (no subject)"
-msgstr "ц┤atdд╠rд╠lmд╠е÷ ismarд╠c (mц╤vzusuz)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "ц┤atdд╠rд╠lmд╠е÷ ismarд╠c"
 
-#: mail/mail-tools.c:415
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----ц┤atdд╠rд╠lmд╠е÷ д╟smarд╠c-----<br><b>Gц╤ndи≥rи≥n:</b> "
-"%s<br><b>Gц╤ndи≥rilи≥n:</b> %s<br><b>Mц╤vzu:</b> %s<br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "ц┤atdд╠rд╠lmд╠е÷ ismarд╠c"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "VFolderlи≥r"
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Yeni VFolder"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:64
-msgid "Reply"
-msgstr "Cavab ver"
-
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:70
-msgid "Reply to the sender of this message"
-msgstr "д╟smarд╠cд╠ gц╤ndи≥rene cavab ver"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:65
-msgid "Reply to All"
-msgstr "Hamд╠sд╠na cavab ver"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:68
-msgid "Reply to all recipients of this message"
-msgstr "д╟smarд╠cд╠n bц╪tц╪n alд╠cд╠larд╠na cavab ver"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:25
-msgid "Forward"
-msgstr "ц┤atdд╠r"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:29
-msgid "Forward this message"
-msgstr "Bu ismarд╠cд╠ ц╖atdд╠r"
-
-#: mail/message-browser.c:200 ui/evolution-mail.xml.h:61
-msgid "Print the selected message"
-msgstr "Seц╖ili ismarд╠cд╠ ц╖ap et"
-
-#: mail/message-browser.c:203 ui/evolution-mail.xml.h:13
-msgid "Delete this message"
-msgstr "Bu ismarд╠cд╠ sil"
-
-#: mail/message-browser.c:208 ui/evolution-event-editor.xml.h:33
-#: ui/evolution-mail.xml.h:54 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "ф▐vvи≥lki"
-
-#: mail/message-browser.c:208
-msgid "Previous message"
-msgstr "ф▐vvи≥lki д╟smarд╠c"
-
-#: mail/message-browser.c:211 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:50
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "д╟rи≥li"
-
-#: mail/message-browser.c:211
-msgid "Next message"
-msgstr "Sonrakд╠ д╟smarд╠c"
-
-#: mail/message-list.c:679
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "Gц╤rц╪lmи≥miе÷"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "Gц╤rц╪lmц╪е÷"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Cavab cerilmiе÷"
 
-#: mail/message-list.c:682
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "ц┤oxlu Gц╤rц╪lmи≥miе÷ д╟smarд╠c"
 
-#: mail/message-list.c:683
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "ц┤oxlu д╟smarд╠c"
 
-#: mail/message-list.c:687
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "ф▐n Alц╖aq"
 
-#: mail/message-list.c:688
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "Alц╖alt"
 
-#: mail/message-list.c:692
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "Yц╪ksи≥k"
 
-#: mail/message-list.c:693
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "ф▐n Yц╪ksи≥k"
 
-#: mail/message-list.c:943
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "Bugц╪n %l:%M %p"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "Sabah: %l:%M %p"
 
-#: mail/message-list.c:971
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %l %M %p"
 
-#: mail/message-list.c:979
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:981
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "д╟smarд╠clar qeyd edilir"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Bayraqlд╠"
 
-#: mail/message-list.c:1084
-msgid "From"
-msgstr "Gц╤ndи≥rи≥n"
-
-#: mail/message-list.c:1084
-msgid "Date"
-msgstr "Tarix"
-
-#: mail/message-list.c:1084
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Alд╠ndд╠"
 
-#: mail/message-list.c:1085
-msgid "To"
-msgstr "Gn:"
-
-#: mail/message-list.c:1085
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "Bц╤yц╪klц╪k"
 
-#: mail/mail-session.c:161
-msgid "User canceled operation."
-msgstr "д╟stifadи≥ц╖i и≥mи≥liyyatд╠ lи≥д÷v etdi."
-
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:47
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Qovluq"
 
@@ -6940,15 +8034,1456 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "\"%s\" qovluд÷una qeydiyyat silinir"
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "ц°zvlц╪klи≥ri Dц╪zи≥lt"
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr "д╟cracд╠ mц╪ndи≥ricat ц╪ц╖ц╪n 'Evolution' parц╖asд╠."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr "'Evolution'un icracд╠ mц╪ndи≥ricat parц╖asд╠ e'malatxanasд╠."
+
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Evolutionun д╟cracд╠ Mц╪ndи≥ricat parц╖asд╠nд╠ baе÷lada bilmи≥dim ."
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+msgid "Appointments"
+msgstr "Gц╤rц╪е÷lи≥r"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "Gц╤rц╪е÷lи≥ri gц╤stи≥r"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%I:%M%p"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%a %l %M %p"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Poц╖t Mц╪ndи≥ricatд╠"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "Evolution qurulmasд╠"
+
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
+msgstr "Tи≥qvim faylд╠ yц╪klи≥nи≥rkи≥n xи≥ta oldu."
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Tи≥qvim yц╪klи≥mи≥ xи≥tasд╠</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "Vи≥zifи≥lи≥ri gц╤stи≥r"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "Bц╤lmи≥lи≥r :"
+
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A, %e %B %Y"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "д╟smarд╠larд╠n ц╖ap edilmи≥si bacarд╠lmadд╠"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): Bonobonu baе÷lada bilmи≥dim"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "Tи≥mizlи≥"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
+
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "Variable"
+msgstr "Baд÷la"
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "Qeyd"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "_Qeydlи≥r:"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "Mц╤vcuddur"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "Qaynaqlar"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "ay"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "ф▐n Alц╖aq"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Sд╠naq"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "ф▐n Alц╖aq"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "Gц╤stи≥r"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "Radio"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Drifting rain"
+msgstr "д╟zah daxil edи≥n"
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "Yenidи≥n Axtar"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "indi"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Moderate snow"
+msgstr "д╟ndi gц╪ncи≥llи≥"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+#, fuzzy
+msgid "Drifting snow grains"
+msgstr "д╟zah daxil edи≥n"
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "ePoц╖t"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "Hamд╠sд╠nд╠ Gц╤stи≥r"
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "д╟lk ePoц╖t ц╪nvanд╠"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "E-poц╖t Alд╠nд╠r"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Shallow small hail"
+msgstr "Hamд╠sд╠nд╠ Gц╤stи≥r"
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Showers of small hail"
+msgstr "Hamд╠sд╠nд╠ Gц╤stи≥r"
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown precipitation"
+msgstr "Namи≥'lum tanд╠tma vи≥ziyyи≥ti."
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "Namи≥'lum xи≥ta"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "Gц╤rц╪е÷ Dи≥vи≥tlи≥ri"
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "Miss"
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "Portret"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Drifting mist"
+msgstr "Mи≥ktublaе÷ma qrupu"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Shallow fog"
+msgstr "Hamд╠sд╠nд╠ Gц╤stи≥r"
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "Bu pи≥ncи≥rи≥ni qapat"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "Xal"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "Vи≥zifи≥lи≥ri gц╤stи≥r"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "Bu pи≥ncи≥rи≥ni qapat"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "Gц╤ndи≥r"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "Baе÷lд╠q"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "gц╪n"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "Avqust"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Raging tornado"
+msgstr "Edilи≥cи≥klи≥r"
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Thunderous tornado"
+msgstr "Edilи≥cи≥klи≥r"
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "Cavab cerilmiе÷"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Qovluqlar"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "Bц╪tц╪n Ziyarи≥tц╖ilи≥r"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Bunula baе÷layan qovluqlarд╠ gц╤stи≥r:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "Gц╤stи≥rmи≥ Seц╖и≥nи≥klи≥ri :"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "Ekran"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "Cц╪mи≥"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "ц┤и≥rе÷и≥nbи≥"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "ay"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr "2 hи≥ftи≥"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr ""
+"Vaxt\n"
+"Planlaе÷dд╠r"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Vи≥zifи≥lи≥ri gц╤stи≥r"
+
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "bц╪tц╪n fи≥al uzaq qovluqlarla"
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "Vи≥zifи≥lи≥ri gц╤stи≥r"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "Vи≥zifи≥"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
+msgstr ""
+"\n"
+"   Bц╤lmи≥:\t"
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Baе÷qa"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "Seц╖kilи≥ri tи≥mizlи≥"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "Aprel"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "'Evolution' qabд╠д÷д╠."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "ф▐traflд╠"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "Gц╤rц╪е÷ц╪ Lи≥д÷v Et"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Xц╪susi Cи≥rgи≥lи≥r"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Evolution qurulmasд╠"
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6956,29 +9491,26 @@ msgstr ""
 "Evolutionun bu yeni qurulmasд╠nд╠n е÷и≥xsi Evolution qovluд÷una\n"
 "bи≥'zi и≥lavи≥ fayllar kц╤ц╖ц╪rmи≥lidir"
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Lц╪tfи≥n \"Oldu\"'ya tд╠qlayд╠b, fayllarд╠ qurun, ya da \"Lи≥д÷v Et\"и≥ "
 "basaraq ц╖д╠xд╠n."
 
-#: shell/e-setup.c:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "Fayllar dц╪zgц╪n gц╪ncи≥llи≥nи≥ bilmи≥di"
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr "\"Evolution\" fayllarд╠ mц╪vи≥ffи≥qiyyи≥tlи≥ quruldu."
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Dи≥yи≥sи≥n \"Evolution\"д╠ ilk dи≥fи≥ iе÷и≥ salд╠rsan."
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr "\"Oldu\"'ya tд╠qlayд╠b, \"Evolution\" istifadи≥ц╖i fayllarд╠nд╠ buraya qur"
+msgstr ""
+"\"Oldu\"'ya tд╠qlayд╠b, \"Evolution\" istifadи≥ц╖i fayllarд╠nд╠ buraya qur"
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6989,16 +9521,14 @@ msgstr ""
 "\n"
 "Xи≥ta : %s"
 
-#: shell/e-setup.c:230
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
-msgstr ""
-"Fayllarд╠ `%s''yи≥\n"
-"kц╤ц╖ц╪rdи≥ bilmи≥dim ."
+msgstr "Faylд╠ oxurkи≥n bir xи≥ta oldu ."
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7009,7 +9539,16 @@ msgstr ""
 "\"Evolution\" istifadи≥ц╖i fayllarд╠nin qurulmasд╠\n"
 "ц╪ц╖ц╪n onu sil."
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7020,21 +9559,58 @@ msgstr ""
 "\"Evolution\" qovluд÷unda yerlи≥е÷mir. \"Evolution\" \n"
 "istifadи≥ц╖i fayllarд╠nin qurulmasд╠ ц╪ц╖ц╪n onu sil."
 
-#: shell/e-shell.c:388
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "Qovluq alд╠na bilmи≥di: %s: %s"
+
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"Fayllarд╠ `%s''yи≥\n"
+"kц╤ц╖ц╪rdи≥ bilmи≥dim ."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
 #, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Yerli qeydi quraе÷dд╠ra bilmи≥dim -- %s"
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "Qovluд÷a Kц╤ц╖ц╪rt"
 
-#: shell/e-shell.c:1273
+#: shell/e-shell-folder-commands.c:313
 #, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
-"Vaxsey! `%s' nц╪mayiе÷i gц╤zlи≥nilmи≥z е÷и≥kildи≥ sonlandд╠. :-(\n"
-"Bu, %s qisminin ц╖ц╤kdц╪yц╪nи≥ iе÷arи≥t edir."
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "Qovluд÷a Kц╤ц╖ц╪r"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "%s gц╪n sonra sil"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "Bu `%s' vи≥zifи≥sini hи≥qiqи≥tи≥n dи≥ silmи≥k istи≥yirsiniz?"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "%s qovluд÷u aц╖д╠lд╠r"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -7043,15 +9619,15 @@ msgstr ""
 "Bildirilи≥n qovluq yaradд╠la bilmи≥di:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "Bildirilи≥n qovluq adд╠ hц╤kmlц╪ deyildir ."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "\"Evolution\" - Yeni qovluq yarat"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -7059,41 +9635,133 @@ msgstr ""
 "Bildirilи≥n gediе÷ ц╪ц╖ц╪n bu seц╖ili qovluq nц╤vц╪ \n"
 "hц╤kmlц╪ deyildir ."
 
-#: shell/e-shell-folder-selection-dialog.c:321
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Yeni ..."
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "( Adsд╠z )"
 
-#: shell/e-shell-view.c:148
-msgid "(No folder displayed)"
-msgstr "( Heц╖ bir qovluq gц╤stи≥rilmir )"
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"\"Evolution\" iц╖inи≥ almaq istи≥diyiniz faylд╠ seц╖in. Aе÷aд÷д╠dakд╠ "
+"siyahд╠dan alacaд÷д╠nд╠z faylд╠n nц╤vц╪nц╪ dи≥ seц╖in.\n"
+"\n"
+"ф▐gи≥r tи≥sи≥vvц╪rц╪nц╪z yoxdursa \"Avtomatik\" seц╖и≥nи≥yini seц╖in, "
+"\"Evolution\" ц╤zц╪ bildiyi kimi edи≥r."
 
-#: shell/e-shell-view.c:1203
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
 #, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+"%s Alд╠nд╠r\n"
+"Alд╠cд╠ hazд╠r deyil.\n"
+"Yenidи≥n sд╠namaq ц╪ц╖ц╪n 5 saniyи≥ gц╤zlи≥nir."
 
-#: shell/e-shell-view.c:1205
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
 #, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"%s Alд╠nд╠r\n"
+"%d ц╪zvц╪ alд╠nд╠r."
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"д╟е÷ gц╤rи≥cи≥k alд╠cд╠ mц╤vcud deyildir\n"
+"%s"
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr "Alд╠nд╠r"
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"%s Alд╠nд╠r.\n"
+"%s Baе÷ladд╠lд╠r"
+
+#: shell/e-shell-importer.c:383
+#, c-format
+msgid "Error starting %s"
+msgstr "%s baе÷ladд╠rkи≥n xи≥ta oldu"
+
+#: shell/e-shell-importer.c:402
+#, c-format
+msgid "Error loading %s"
+msgstr "%s yц╪klи≥nи≥rkи≥n xи≥ta oldu"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"%s Alд╠nд╠r\n"
+"Alд╠nan ц╪zv 1."
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr "Avtomatik"
+
+#: shell/e-shell-importer.c:538
+msgid "Filename:"
+msgstr "Fayl adд╠:"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "Fayl seц╖"
+
+#: shell/e-shell-importer.c:553
+msgid "File type:"
+msgstr "Fayl nц╤vц╪:"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "Qovluq Seц╖in"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy $PATH yolunda tapд╠la bilmи≥di."
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "\"Bug-buddy\" iе÷и≥ salд╠na bilmи≥di."
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Tи≥lif haqqд╠ 1999, 2000, 2001 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -7102,31 +9770,88 @@ msgstr ""
 "\"Evolution\" GNOME masa ц╪stц╪ ц╪ц╖ц╪n gц╤zи≥l bir ePoц╖t, \n"
 "tи≥qvim vи≥ и≥laqи≥lи≥r idarи≥ proqramд╠dд╠r."
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Qovluд÷a get ..."
 
-#: shell/e-shell-view-menu.c:562
-msgid "Work online"
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Yeni bir qд╠sa yol qrupu yarat"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
 msgstr "Xи≥tdи≥ д╟е÷lи≥"
 
-#: shell/e-shell-view-menu.c:574 shell/e-shell-view-menu.c:586
-msgid "Work offline"
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
 msgstr "Xи≥tdи≥n Qopuq д╟е÷lи≥"
 
-#: shell/e-shortcuts.c:381
-msgid "Error saving shortcuts."
-msgstr "Qд╠sa yollarд╠ qeyd edи≥rkи≥n xи≥ta oldu."
+#: shell/e-shell-view.c:175
+msgid "(No folder displayed)"
+msgstr "( Heц╖ bir qovluq gц╤stи≥rilmir )"
+
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shell-view.c:1411
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
+
+#: shell/e-shell-view.c:1413
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Yerli qeydi quraе÷dд╠ra bilmи≥dim -- %s"
+
+#: shell/e-shell.c:1311
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"Vaxsey! `%s' nц╪mayiе÷i gц╤zlи≥nilmи≥z е÷и≥kildи≥ sonlandд╠. :-(\n"
+"Bu, %s qisminin ц╖ц╤kdц╪yц╪nи≥ iе÷arи≥t edir."
+
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Yeni bir qд╠sa yol qrupu yarat"
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Qrup adд╠ :"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -7135,119 +9860,202 @@ msgstr ""
 "`%s' Qrupunu qд╠sa yol ц╖ubuд÷undan hи≥qiqи≥tи≥n \n"
 "dи≥ silmи≥k istи≥yisiniz?"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "Silmи≥"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "Bu qд╠sa yol qrupunusil"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "Bu qд╠sa yol qrupunusil"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "_Kiц╖ik Timsallar"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Qд╠sa yollarд╠ kiц╖ik timsallar olaraq gц╤stи≥r"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "_Bц╤yц╪k Timsallar"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Qд╠sa yollarд╠ bц╤yц╪k timsallar olaraq gц╤stи≥r"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_Yeni Qrup..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Yeni bir qд╠sa yol qrupu yarat"
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "Bu Qrupu _Sil..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Bu qд╠sa yol qrupunusil"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "Bu Qrupu _Sil..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "Bu qд╠sa yol qrupunusil"
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "Qд╠sa yol ц┤ubuд÷unu _Gizlи≥t"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Qд╠sa yol ц┤ubuд÷unu Gizlи≥t"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "Fи≥allaе÷dд╠r"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "Bu qд╠sa yol qrupunusil"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "Bu qд╠sa yol qrupunusil"
+
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Aц╖"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr "Yeni Pи≥ncи≥rи≥dи≥ Aц╖"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
-msgstr "Bu qд╠sa yolu fи≥allaе÷dд╠rs"
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Gц╪ncи≥l ismarд╠clarд╠ yeni pи≥ncи≥rи≥dи≥ aц╖"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "Qayda adд╠ :"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "Bu qд╠sa yol qrupunusil"
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Bu qд╠sa yolu qд╠sa yol ц╖ubuд÷undan sil"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:585
+msgid "Error saving shortcuts."
+msgstr "Qд╠sa yollarд╠ qeyd edи≥rkи≥n xи≥ta oldu."
+
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "_Qд╠sa Yol ц┤ubuд÷u"
+
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "_ф▐laqи≥"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "( Adsд╠zdд╠r )"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Xи≥ta yoxdur"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "ц°mumi xи≥ta"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "Eyni adlд╠ bir qovluq onsuz da var"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "Bildirilи≥n qovluq nц╤vц╪ hц╤kmlц╪ deyildir"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "G/ц┤ xи≥tasд╠"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "Qovluд÷u yaratmaq ц╪ц╖ц╪n lazд╠mi disk sahи≥si yoxdur"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "Bildirilи≥n qovluq tapд╠la bilmи≥di"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "Funksiya yazд╠lmamд╠е÷dд╠r"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "Qadaд÷andд╠r"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "ф▐mи≥liyyat dи≥stи≥klи≥nmir"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "Bu qeydlи≥rdи≥ mц╪и≥yyи≥nlи≥е÷dirilи≥n nц╤v dи≥stи≥klи≥nmir"
 
-#: shell/e-storage-set-view.c:650 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:44
-msgid "_View"
-msgstr "_Gц╤stи≥r"
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
 
-#: shell/e-storage-set-view.c:650
-msgid "View the selected folder"
-msgstr "Seц╖ili qovluд÷u gц╤stи≥r"
+#: shell/e-task-widget.c:173
+#, fuzzy
+msgid "%s (%d%% complete)"
+msgstr "% _Qurtardд╠:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "Daxil edи≥n hи≥r hansд╠ ц╪zv"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "Ev Sahibi:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
 
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
@@ -7261,107 +10069,6 @@ msgstr "Qovluq nц╤vц╪:"
 msgid "Specify where to create the folder:"
 msgstr "Qovluд÷un yaradд╠lacaд÷д╠ yeri gц╤stи≥rin:"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "'Evolution' qabд╠д÷д╠."
-
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"\"Evolution\" iц╖inи≥ almaq istи≥diyiniz faylд╠ seц╖in. Aе÷aд÷д╠dakд╠ "
-"siyahд╠dan alacaд÷д╠nд╠z faylд╠n nц╤vц╪nц╪ dи≥ seц╖in.\n"
-"\n"
-"ф▐gи≥r tи≥sи≥vvц╪rц╪nц╪z yoxdursa \"Avtomatik\" seц╖и≥nи≥yini seц╖in, "
-"\"Evolution\" ц╤zц╪ bildiyi kimi edи≥r."
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"%s Alд╠nд╠r\n"
-"Alд╠cд╠ hazд╠r deyil.\n"
-"Yenidи≥n sд╠namaq ц╪ц╖ц╪n 5 saniyи≥ gц╤zlи≥nir."
-
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"%s Alд╠nд╠r\n"
-"%d ц╪zvц╪ alд╠nд╠r."
-
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"д╟е÷ gц╤rи≥cи≥k alд╠cд╠ mц╤vcud deyildir\n"
-"%s"
-
-#: shell/importer/importer.c:351
-msgid "Importing"
-msgstr "Alд╠nд╠r"
-
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"%s Alд╠nд╠r.\n"
-"%s Baе÷ladд╠lд╠r"
-
-#: shell/importer/importer.c:372
-#, c-format
-msgid "Error starting %s"
-msgstr "%s baе÷ladд╠rkи≥n xи≥ta oldu"
-
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
-msgstr "%s yц╪klи≥nи≥rkи≥n xи≥ta oldu"
-
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"%s Alд╠nд╠r\n"
-"Alд╠nan ц╪zv 1."
-
-#: shell/importer/importer.c:473
-msgid "Automatic"
-msgstr "Avtomatik"
-
-#: shell/importer/importer.c:523
-msgid "Filename:"
-msgstr "Fayl adд╠:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
-msgstr "Fayl seц╖"
-
-#: shell/importer/importer.c:538
-msgid "File type:"
-msgstr "Fayl nц╤vц╪:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
-msgstr "Al"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -7386,26 +10093,36 @@ msgstr ""
 "Bu vasitи≥ ila xarici fayllarд╠ \"Evolution\" iц╖inи≥\n"
 "alacaqsд╠nд╠z."
 
-#: shell/importer/intelligent.c:143
+#: shell/importer/intelligent.c:191
+#, fuzzy
+msgid "Importers"
+msgstr "Al"
+
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "Silmи≥"
+
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "Mи≥nи≥ bir dи≥ soruе÷ma"
 
-#: shell/main.c:82
-#, no-c-format
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
@@ -7421,7 +10138,7 @@ msgstr ""
 "fikirlи≥rinizi\n"
 "gц╤zlи≥yirik!\n"
 
-#: shell/main.c:107
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7429,236 +10146,324 @@ msgstr ""
 "Minnи≥tdarд╠q\n"
 "\"Evolution\" Dи≥stи≥si\n"
 
-#: shell/main.c:138
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "\"Evolution\" qabд╠д÷д╠nд╠ baе÷lada bilmи≥dim ."
 
-#: shell/main.c:184
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "Aц╖д╠lд╠е÷ ekranд╠nд╠ gц╤sdи≥rmи≥"
 
-#: shell/main.c:185
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr "Bц╪tц╪n xи≥ta ayд╠qlama verilи≥nlи≥rini bir fayla yazdд╠r."
 
-#: shell/main.c:217
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo parц╖alar sistemini baе÷lada bilmи≥dim."
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Kц╤ц╖ц╪rt"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
+msgstr "Seц╖ilи≥ni kц╤ц╖ц╪rt"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "Yeni bir hesab yarat"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "ф▐laqи≥ni sil"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "Yeni bir hesab yarat"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Axtar"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Kи≥s"
+
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr "Seц╖ilи≥ni kи≥s"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Bir и≥laqи≥ni axtar"
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "ф▐laqи≥ni sil"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Yeni и≥laqи≥"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:53
-msgid "Previews the message to be printed"
-msgstr "ц┤ap edilи≥cи≥k ismarд╠cд╠ nц╪mayiе÷ etdirи≥r"
-
 #: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+#, fuzzy
+msgid "New list"
+msgstr "Xи≥bи≥rlи≥r"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Yapд╠е÷dд╠r"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "Ara yaddaе÷д╠ yapд╠е÷dд╠r"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
+msgstr "ц┤ap edilи≥cи≥k tи≥qvimi nц╪mayiе÷ etdirи≥r"
+
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "ф▐laqи≥lи≥ri ц╖ap et"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:84
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "Hamд╠sд╠nд╠ Seц╖"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "ф▐laqи≥ni sil"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Dayan"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Yц╪klи≥mи≥ni Dayandд╠r"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "Hamд╠sд╠nд╠ Gц╤stи≥r"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "Bц╪tц╪n и≥laqи≥lи≥ri gц╤stи≥r"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "_ц°nvan Dи≥ftи≥ri Qaynaд÷д╠..."
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "_ф▐laqи≥"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "_ф▐laqи≥"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "_ц┤ap Et ..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "ф▐laqи≥lи≥ri a_xtar"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:117
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:43
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
+msgstr "Hamд╠sд╠nд╠ Se_ц╖"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_Vasitи≥lи≥r"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 gц╪n"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Seц╖и≥nи≥klи≥ri dи≥yiе÷dir"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a new all day Event"
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "Yeni bir bц╪tц╪n gц╪n hadisи≥si yarat"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Yeni bir iclas yarat"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Yeni bir tи≥qvim yarat"
+msgid "Create a new appointment"
+msgstr "Yeni bir iclas yarat"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "Gц╪n"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Get"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Vaxtda geri get"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Vaxtda irи≥li get"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "_Tarixи≥ Get"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
-msgstr "_Bugц╪nи≥ Get"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Xц╪susi bir tarixи≥ get"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "д╟ndiki vaxta get"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "Ay"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr "Yeni _Hadisи≥"
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "Tи≥qvimi Aц╖"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "Geri"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Yeni д╟clas"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "ц┤ap edilи≥cи≥k tи≥qvimi nц╪mayiе÷ etdirи≥r"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Tи≥qvimi ц╖ap et"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Bu Tи≥qvim ц╖ap et"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Fи≥rqli Qeyd Et"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "д╟stи≥nи≥n Mи≥'lumatlar"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "Tи≥qvimi baе÷qa е÷ey olaraq qeyd et"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "1 gц╪nц╪ gц╤stи≥r"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "1 ayд╠ gц╤stи≥r"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "2 hи≥ftи≥ni ц╤ster"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "д╟е÷ hи≥ftи≥sini gц╤stи≥r"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
-msgid "Today"
-msgstr "Bugц╪n"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "д╟_е÷  hи≥ftи≥si"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "Hи≥ftи≥"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "д╟_clas"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "_Mи≥ktub Qurд÷ularд╠..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "_Gц╪n"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "_Ay"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:39
-msgid "_New"
-msgstr "_Yeni"
-
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "_Tи≥qvimi aц╖"
-
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "_Hи≥ftи≥"
 
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Qapat"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "Bu iclasд╠ qapat"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "Bu iclasд╠ sil"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "Ana vasitи≥ ц╖ubuд÷u"
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "ц┤ap edilи≥cи≥k ismarд╠cд╠ nц╪mayiе÷ etdirи≥r"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "ц┤ap Etmи≥ Nц╪ma_yiе÷i"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "ц┤ap Qurд÷ularд╠"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Bu ц╪zvц╪ ц╖ap et"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "ц┤ap Et ..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "Qeyd Et vи≥ Qapat"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "д╟clasд╠ qeyd et vи≥ dialoqu qapat"
+
+#: ui/evolution-comp-editor.xml.h:17
+#, fuzzy
+msgid "Save this item to disk"
+msgstr "Gц╤rц╪nц╪е÷ц╪ %s a(и≥)dи≥yiе÷dir"
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr ""
+"Sи≥hifи≥ qurд÷ularд╠nд╠ hazд╠rkд╠ ц╖ap edicinizи≥ gц╤ra uyд÷unlaе÷dд╠rд╠n"
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "_Gediе÷lи≥r"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "_Fayl"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Bu ц╪zvц╪ sil"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "Sil..."
 
@@ -7670,27 +10475,12 @@ msgstr "Kц╤mи≥k"
 msgid "Print En_velope..."
 msgstr "_Zи≥rfi ц┤ap Et..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Bu ц╪zvц╪ ц╖ap et"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:62 ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "ц┤ap Et ..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "_Fи≥rqli Qeyd Et ..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Qeyd Et vи≥ Qapat"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "ф▐laqи≥ni qeyd et vи≥ dialoqu qapat"
@@ -7707,883 +10497,1004 @@ msgstr "Xи≥tdи≥ki Kц╤mи≥yи≥ bax"
 msgid "Send _message to contact..."
 msgstr "ф▐laqи≥yи≥ yeni bir _ismarд╠c gц╤ndи≥r..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
-msgid "_File"
-msgstr "_Fayl"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Qeyd Et ..."
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Bu proqram tи≥'minatд╠ haqqд╠nda"
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Haqqд╠nda..."
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "Gediе÷_lи≥r"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "Bu ц╪zvц╪ sil"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "ц°nvan _Dи≥ftи≥ri ... (FIXME)"
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "Vи≥zifи≥ni qeyd et vи≥ dialoqu qapat"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "Tи≥_mizlи≥"
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "ф▐laqи≥ni fи≥rqli yerи≥ gц╤_ndи≥r..."
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "Kи≥_s"
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "ф▐laqи≥yи≥ yeni bir _ismarд╠c gц╤ndи≥r..."
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "Adlarд╠ Y_oxla (FIXME)"
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "Gц╤rц╪е÷ц╪ Lи≥д÷v Et"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "Tи≥mizlи≥"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#, fuzzy
+msgid "Cancel the meeting for this item"
+msgstr "Bu cи≥rgи≥nin xц╪susiyyи≥tlи≥rini dи≥yiе÷dir"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "Seц╖kilи≥ri tи≥mizlи≥"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Forward as i_Calendar"
+msgstr "v_Calendar е·и≥klindи≥ ц┤atdд╠r (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Bu iclasд╠ qapat"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "Bu ismarд╠cд╠ ц╖atdд╠r"
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "Qovluд÷a Kц╤_ц╖ц╪r... (FIXME)"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Kц╤ц╖ц╪rt"
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr ""
+"Gц╤rц╪е÷\n"
+"д╟stи≥"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Seц╖ilи≥ni kц╤ц╖ц╪rt"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr "_Gц╤rц╪е÷lи≥ri Planlaе÷dд╠r"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Kи≥s"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#, fuzzy
+msgid "Schedule a meeting for this item"
+msgstr "Gц╤rц╪е÷ Cи≥dvи≥li"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Seц╖ilи≥ni kи≥s"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "_Gediе÷lи≥r"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Bu iclasд╠ sil"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "%s - Evolution %s"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "XML yekunu"
+#: ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "Lи≥д÷v Edildi"
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "UI Xml yekununu ц╖д╠xart"
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "Hazд╠rkд╠ faylд╠ qeyd et"
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "Qovluqdakд╠ _д╟lk ц°zv (FIXME)"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "Yaz"
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "ц┤at_dд╠r (FIXME)"
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Yeni bir ePoц╖t ismarд╠cд╠ yaz"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "v_Calendar е·и≥klindи≥ ц┤atdд╠r (FIXME)"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "д╟rи≥lidи≥ki ц°zvи≥ Get"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "ф▐vvи≥lki ц°zvи≥ Get"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "Nata_mam Vи≥zifи≥ (FIXME)"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr "Zibil qutusunu _boе÷alt"
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "Fayllarд╠n seц╖и≥nи≥klи≥rini tи≥kmillи≥е÷dir"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "_Parollarд╠ Unut"
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "_Sonrakд╠"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Yapд╠е÷dд╠r"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
+msgstr "Al_t Qeydlи≥ri д╟darи≥ Et..."
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Ara yaddaе÷д╠ yapд╠е÷dд╠r"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "_Geri"
+#: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Seц╖ili ismarд╠clarд╠ baе÷qa bir cи≥rgи≥yи≥ daе÷д╠"
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "ц┤ap Etmи≥ Nц╪ma_yiе÷i"
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send / Receive"
+msgstr "Al / Gц╤ndи≥r"
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "ц┤ap _Qurд÷ularд╠..."
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "Sorд÷ulanmд╠е÷ mи≥ktubu gц╤ndи≥r vи≥ yeni mи≥ktublarд╠ al"
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "ц┤ap Qurд÷ularд╠"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
-msgid "Save"
-msgstr "Qeyd Et"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "д╟clasд╠ qeyd et vи≥ dialoqu qapat"
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
+msgstr "Virtual Qovluq _Dц╪zи≥ldicisi..."
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "Hazд╠rkд╠ faylд╠ qeyd et"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
+msgstr "_Sц╪zgи≥clи≥r ..."
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "_Gц╤rц╪е÷lи≥ri Planlaе÷dд╠r"
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr "_Mи≥ktub д╟smarд╠cд╠"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "Bи≥zi nц╤v gц╤rц╪е÷lи≥ri planlaе÷dд╠r"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "_Mи≥ktub Qurд÷ularд╠..."
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "Hamд╠sд╠nд╠ Seц╖"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "Nц╪mayiе÷"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "Hи≥r е÷eyi seц╖in"
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
+msgstr "_Gц╤ndи≥r / Al"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "Sи≥hifи≥ qurд÷ularд╠nд╠ hazд╠rkд╠ ц╖ap edicinizи≥ gц╤ra uyд÷unlaе÷dд╠rд╠n"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr "Bu cи≥rgи≥nin xц╪susiyyи≥tlи≥rini dи≥yiе÷dir"
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "Vи≥zifи≥ So_rд÷usu (FIXME)"
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "Seц╖ili ismarд╠clarд╠ sil"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "_Haqqд╠nda..."
+#: ui/evolution-mail-list.xml.h:5
+#, fuzzy
+msgid "Cut selected messages"
+msgstr "Seц╖ili ismarд╠clarд╠ sil"
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Qapat"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "S_eц╖ili д╟smarд╠clarд╠ Gizlи≥t"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
-msgid "_Contact (FIXME)"
-msgstr "_ф▐laqи≥lи≥r"
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "_Silinmiе÷ д╟smarд╠clarд╠ Gizlи≥t"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_Kц╤ц╖ц╪rt"
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
+msgstr "_Oxunmuе÷ д╟smarд╠clarд╠ Gizlи≥t"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_Ayд╠qla"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:35
-msgid "_Help"
-msgstr "_Kц╤mи≥k"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "Hamд╠sд╠nд╠ O_xunmд╠е÷ olaraq д╟е÷arи≥tlи≥"
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "_ц°zv (FIXME)"
+#: ui/evolution-mail-list.xml.h:11
+#, fuzzy
+msgid "Mark all visible messages as read"
+msgstr "д╟е÷arи≥tlи≥"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "_Jurnal Giriе÷i (FIXME)"
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "Ara yaddaе÷д╠ yapд╠е÷dд╠r"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "Qovluqdakд╠ _Axд╠rд╠ncд╠ ц°zv (FIXME)"
+#: ui/evolution-mail-list.xml.h:14
+#, fuzzy
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Seц╖ili ismarд╠clarд╠ baе÷qa bir cи≥rgи≥yи≥ daе÷д╠"
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "e_Poц╖t д╟smarд╠cд╠ (FIXME)"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "_Hamд╠sд╠nд╠ Seц╖"
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "Qovluд÷a _Daе÷д╠ ... (FIXME)"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "д╟l_gи≥yi Seц╖"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "_Qeyd (FIXME)"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "_Yapд╠е÷dд╠r"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:109
-#: ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
-msgstr "_Seц╖и≥nи≥klи≥r..."
+#: ui/evolution-mail-list.xml.h:19
+#, fuzzy
+msgid "Select all visible messages"
+msgstr "Seц╖ili ismarд╠clarд╠ sil"
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "Hamд╠sд╠nд╠ Se_ц╖"
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "_Hamд╠sд╠nд╠ Gц╤stи≥r"
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:42
-msgid "_Task (FIXME)"
-msgstr "_Vи≥zifи≥"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "_Oxunmamuе÷ ц°zv (FIXME)"
+#: ui/evolution-mail-list.xml.h:22
+#, fuzzy
+msgid "Temporarily hide all messages that have already been read"
+msgstr "д╟е÷arи≥tlи≥"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Xidmи≥t ф▐lavи≥ Et"
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "Seц╖ili ismarд╠clarд╠ sil"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "д╟cracд╠ Mц╪ndи≥ricata yeni xidmи≥t и≥lavи≥ et"
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "д╟lgи≥k_lи≥nmiе÷ д╟smarд╠clar Siyahд╠sд╠"
 
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Yeni bir mи≥ktub yarat"
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "_Tи≥mizlи≥"
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "д╟cracд╠ Mц╪ndи≥ricat Qurд÷ularд╠..."
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Qovluq"
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Yeni Mи≥ktub"
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "Seц╖kiyi _Tи≥rs ц┤evir"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
-msgstr "ф▐lavи≥ Et hи≥dи≥fin"
+#: ui/evolution-mail-list.xml.h:28
+msgid "_Properties..."
+msgstr "_Seц╖и≥nи≥klи≥r..."
 
-#: ui/evolution-mail.xml.h:3
-msgid "Change the properties of this folder"
-msgstr "Bu cи≥rgи≥nin xц╪susiyyи≥tlи≥rini dи≥yiе÷dir"
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "д╟lgи≥k_lи≥nmiе÷ д╟smarд╠clar Siyahд╠sд╠"
 
-#: ui/evolution-mail.xml.h:4
-msgid "Compose"
-msgstr "Yaz"
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "Apply filter rules to the selected messages"
+msgstr "Seц╖ili ismarд╠clarд╠ sil"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
-msgstr "Yeni bir ePoц╖t ismarд╠cд╠ yaz"
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "д╟smarд╠cд╠n bц╪tц╪n alд╠cд╠larд╠na cavab ver"
 
-#: ui/evolution-mail.xml.h:6
-msgid "Configure Folder..."
-msgstr "Cи≥rgи≥ Qur..."
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
-msgstr "д╟smarд╠clarд╠ yeni bir qovluд÷a daе÷д╠"
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
+msgid "Compose a reply to the sender of the selected message"
+msgstr "д╟smarд╠cд╠ gц╤ndи≥rene cavab ver"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail-message.xml.h:6
 msgid "Copy selected messages to another folder"
 msgstr "Seц╖ili ismarд╠clarд╠ baе÷qa cи≥rgи≥yи≥ kц╤ц╖ц╪r"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail-message.xml.h:7
 msgid "Create _Virtual Folder From Message"
 msgstr "д╟smarд╠cdan _Virtual Qovluq Yarat"
 
-#: ui/evolution-mail.xml.h:12
-msgid "Delete the selected messages"
-msgstr "Seц╖ili ismarд╠clarд╠ sil"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
-msgstr "Bц╪tц╪n ismarд╠c baе÷lд╠qlarд╠nд╠ gц╤stи≥r"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:15
-msgid "Edit Message"
-msgstr "д╟smarд╠cд╠ Dц╪zи≥lt"
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:16
-msgid "Edit the current message"
-msgstr "Gц╪ncи≥l ismarд╠cд╠ dц╪zи≥lt"
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
-msgstr "Zibil qutusunu _boе÷alt"
+#: ui/evolution-mail-message.xml.h:12
+#, fuzzy
+msgid "Create a virtual folder for these recipients"
+msgstr "д╟smarд╠cdan _Virtual Qovluq Yarat"
 
-#: ui/evolution-mail.xml.h:18
-msgid "Expunge"
-msgstr "Sil"
+#: ui/evolution-mail-message.xml.h:13
+#, fuzzy
+msgid "Create a virtual folder for this mailing list"
+msgstr "д╟smarд╠cdan _Virtual Qovluq Yarat"
+
+#: ui/evolution-mail-message.xml.h:14
+#, fuzzy
+msgid "Create a virtual folder for this sender"
+msgstr "д╟smarд╠cdan _Virtual Qovluq Yarat"
+
+#: ui/evolution-mail-message.xml.h:15
+#, fuzzy
+msgid "Create a virtual folder for this subject"
+msgstr "д╟smarд╠cdan _Virtual Qovluq Yarat"
+
+#: ui/evolution-mail-message.xml.h:17
+#, fuzzy
+msgid "Display the next important message"
+msgstr "д╟smarд╠cд╠ gц╤ndи≥rene cavab ver"
+
+#: ui/evolution-mail-message.xml.h:18
+#, fuzzy
+msgid "Display the next message"
+msgstr "Sonrakд╠ ismarд╠ca get"
+
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
+msgstr "Seц╖ili ismarд╠clarд╠ sil"
+
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:21
+#, fuzzy
+msgid "Display the previous important message"
+msgstr "ф▐vvи≥lki ismarд╠ca get"
+
+#: ui/evolution-mail-message.xml.h:22
+#, fuzzy
+msgid "Display the previous message"
+msgstr "ф▐vvи≥lki ismarд╠ca get"
+
+#: ui/evolution-mail-message.xml.h:23
+#, fuzzy
+msgid "Display the previous unread message"
+msgstr "ф▐vvи≥lki ismarд╠ca get"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Filter on Mailing _List"
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "Mи≥ktublaе÷ma Q_rupundakд╠ Sц╪zgи≥c"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "Gц╤_ndи≥rи≥nи≥ gц╤rи≥ Sц╪z"
 
-#: ui/evolution-mail.xml.h:21
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "Alд╠_cд╠ya gц╤rи≥ Sц╪z"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "Mц╤v_zuya  gц╤rи≥ Sц╪z"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Finaly remove all mails tagged for deletion"
-msgstr "Axд╠rda silmи≥k ц╪ц╖ц╪n iе÷arи≥tli bц╪tц╪n mи≥ktublarд╠ sil"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:24
-msgid "Forget _Passwords"
-msgstr "_Parollarд╠ Unut"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "ц┤atdд╠r"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "Fи≥rqli ц┤atdд╠r"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Forward inline"
-msgstr "Hи≥mи≥n ц╖atdд╠r"
-
-#: ui/evolution-mail.xml.h:28
-msgid "Forward the selected mail to someone"
-msgstr "Seц╖ili ePoц╖tu birinи≥ ц╖atdд╠r"
-
-#: ui/evolution-mail.xml.h:30
-msgid "Forward this message in-line with your mail, so you can edit it"
-msgstr "Bu ismarд╠cд╠ dц╪zи≥ltdikdц╪n sonra ц╖atdд╠r"
-
-#: ui/evolution-mail.xml.h:31
-msgid "Full _Headers"
-msgstr "_Tam Baе÷lд╠qlar"
-
-#: ui/evolution-mail.xml.h:32
-msgid "Go to the next message"
-msgstr "Sonrakд╠ ismarд╠ca get"
-
-#: ui/evolution-mail.xml.h:33
-msgid "Go to the previous message"
-msgstr "ф▐vvи≥lki ismarд╠ca get"
+#: ui/evolution-mail-message.xml.h:31
+#, fuzzy
+msgid "Forward _Attached"
+msgstr "Fи≥rqli ц┤atdд╠r"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Hide Deleted Messages"
-msgstr "Silinи≥n д╟smarд╠clarд╠ Gizlи≥t"
+#: ui/evolution-mail-message.xml.h:32
+#, fuzzy
+msgid "Forward _Inline"
+msgstr "_Hи≥mи≥n ц╖atdд╠r"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Hide S_elected Messages"
-msgstr "S_eц╖ili д╟smarд╠clarд╠ Gizlи≥t"
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Forward _Quoted"
+msgstr "_Hи≥mи≥n ц╖atdд╠r"
 
-#: ui/evolution-mail.xml.h:36
-msgid "Hide _Deleted Messages"
-msgstr "_Silinmiе÷ д╟smarд╠clarд╠ Gizlи≥t"
+#: ui/evolution-mail-message.xml.h:34
+#, fuzzy
+msgid "Forward the selected message in the body of a new message"
+msgstr "Seц╖ili ePoц╖tu birinи≥ ц╖atdд╠r"
 
-#: ui/evolution-mail.xml.h:37
-msgid "Hide _Read messages"
-msgstr "_Oxunmuе÷ д╟smarд╠clarд╠ Gizlи≥t"
+#: ui/evolution-mail-message.xml.h:35
+#, fuzzy
+msgid "Forward the selected message quoted like a reply"
+msgstr "Seц╖ili ePoц╖tu birinи≥ ц╖atdд╠r"
 
-#: ui/evolution-mail.xml.h:38
-msgid "Invert Selection"
-msgstr "Seц╖imi Tи≥rsinи≥ ц┤evir"
+#: ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward the selected message to someone"
+msgstr "Seц╖ili ePoц╖tu birinи≥ ц╖atdд╠r"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Manage _Subscriptions..."
-msgstr "Al_t Qeydlи≥ri д╟darи≥ Et..."
+#: ui/evolution-mail-message.xml.h:37
+#, fuzzy
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Seц╖ili ePoц╖tu birinи≥ ц╖atdд╠r"
 
-#: ui/evolution-mail.xml.h:41
-msgid "Mark All as R_ead"
-msgstr "Hamд╠sд╠nд╠ O_xunmд╠е÷ olaraq д╟е÷arи≥tlи≥"
+#: ui/evolution-mail-message.xml.h:39
+#, fuzzy
+msgid "Load _Images"
+msgstr "ц┤atdд╠rд╠lmд╠е÷ ismarд╠c"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Mark As Read"
-msgstr "Oxunmuе÷ Olaraq д╟е÷arи≥tlи≥"
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "Vacib"
 
-#: ui/evolution-mail.xml.h:43
-msgid "Mark As U_nread"
-msgstr "Oxun_mamд╠е÷ Olaraq д╟е÷arи≥tlи≥"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
+msgstr "Ox_unmamд╠е÷ olaraq д╟е÷arи≥tlи≥"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "д╟е÷arи≥tlи≥"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "д╟е÷arи≥tlи≥"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "д╟smarд╠cд╠ и≥vvи≥l oxunmamд╠е÷ olaraq д╟е÷arи≥tlи≥"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "д╟smarд╠cд╠ и≥vvи≥l oxunmamд╠е÷ olaraq д╟е÷arи≥tlи≥"
+
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "д╟е÷arи≥tlи≥"
+
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Daе÷д╠"
 
-#: ui/evolution-mail.xml.h:48
-msgid "Move message to a new folder"
-msgstr "д╟smarд╠cд╠ yeni bir qovluд÷a daе÷д╠"
-
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "Seц╖ili ismarд╠clarд╠ baе÷qa bir cи≥rgи≥yи≥ daе÷д╠"
 
-#: ui/evolution-mail.xml.h:51
-msgid "Open in New Window"
-msgstr "Yeni Pи≥ncи≥rи≥dи≥ Aц╖"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "д╟rи≥li"
 
-#: ui/evolution-mail.xml.h:52
-msgid "Open the current message in a new window"
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Sonrakд╠ д╟smarд╠c"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Sonrakд╠ д╟smarд╠c"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "д╟l_gи≥yi Seц╖"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Sonrakд╠ д╟smarд╠c"
+
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Open the selected message in a new window"
 msgstr "Gц╪ncи≥l ismarд╠clarд╠ yeni pи≥ncи≥rи≥dи≥ aц╖"
 
-#: ui/evolution-mail.xml.h:58
-msgid "Print Preview of message..."
-msgstr "д╟smarд╠cд╠n ц╖ap etmи≥ Nц╪mayiе÷i..."
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Open the selected message in the composer to re-send it"
+msgstr "д╟е÷arи≥tlи≥"
 
-#: ui/evolution-mail.xml.h:59
-msgid "Print message to the printer"
-msgstr "д╟smarд╠cд╠ ц╖ap et"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "ц┤ap edilи≥cи≥k ismarд╠cд╠ nц╪mayiе÷ etdirи≥r"
 
-#: ui/evolution-mail.xml.h:60
-msgid "Print message..."
-msgstr "д╟smarд╠cд╠ ц╖ap et ..."
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "ф▐vvи≥lki"
 
-#: ui/evolution-mail.xml.h:63
-msgid "Redirect (FIXME: implement me)"
-msgstr "д╟stiqamи≥tlи≥ndir (FIXME: mи≥ni qи≥bul et)"
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "ф▐vvи≥lki д╟smarд╠c"
 
-#: ui/evolution-mail.xml.h:67
-msgid "Reply to all"
-msgstr "Hamд╠sд╠na cavab ver"
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "ф▐vvи≥lki д╟smarд╠c"
 
-#: ui/evolution-mail.xml.h:69
-msgid "Reply to sender"
-msgstr "Gц╤ndи≥rи≥nи≥ cavab ver"
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "ф▐vvи≥lki д╟smarд╠c"
 
-#: ui/evolution-mail.xml.h:71
-msgid "S_earch Message"
-msgstr "д╟smarд╠cд╠ A_xtar"
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
+msgid "Print Message..."
+msgstr "д╟smarд╠cд╠ ц╖ap et ..."
 
-#: ui/evolution-mail.xml.h:72
-msgid "S_ource"
-msgstr "Qa_ynaq"
+#: ui/evolution-mail-message.xml.h:65
+#, fuzzy
+msgid "Print Preview..."
+msgstr "ц┤ap Etmи≥ nц╪mayiе÷i"
 
-#: ui/evolution-mail.xml.h:73
-msgid "Save the message into a new file"
-msgstr "д╟smarд╠cд╠ yeni bir fayla qeyd et"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "д╟smarд╠cд╠ ц┤ap Et"
 
-#: ui/evolution-mail.xml.h:75 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "_Hamд╠sд╠nд╠ Seц╖"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "Cavab ver"
 
-#: ui/evolution-mail.xml.h:76
-msgid "Select _Thread"
-msgstr "д╟l_gи≥yi Seц╖"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "Hamд╠sд╠na cavab ver"
 
-#: ui/evolution-mail.xml.h:77
-msgid "Send / Receive"
-msgstr "Al / Gц╤ndи≥r"
+#: ui/evolution-mail-message.xml.h:71
+msgid "S_earch Message"
+msgstr "д╟smarд╠cд╠ A_xtar"
 
-#: ui/evolution-mail.xml.h:78
-msgid "Send a reply to the person who sent you this mail"
-msgstr "Bu ismarд╠cд╠ sizи≥ gц╤ndи≥rи≥n nи≥fи≥rи≥ bir cavab yazд╠n"
+#: ui/evolution-mail-message.xml.h:72
+#, fuzzy
+msgid "Save the message as a text file"
+msgstr "д╟smarд╠cд╠ yeni bir fayla qeyd et"
 
-#: ui/evolution-mail.xml.h:79
-msgid "Send a single mail in reply to all the selected mail"
-msgstr "Bц╪tц╪n seц╖ili mи≥ktublara tи≥k mи≥ktub yolla"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:80
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
+#: ui/evolution-mail-message.xml.h:74
+msgid "Show Email _Source"
 msgstr ""
-"Nц╤vbи≥dи≥ki ismarд╠clarд╠ gц╤ndи≥r\n"
-"    vи≥ yeni ismarд╠clarд╠ al"
 
-#: ui/evolution-mail.xml.h:82
-msgid "Send queued mail and retrieve new mail"
-msgstr "Sorд÷ulanmд╠е÷ mи≥ktubu gц╤ndи≥r vи≥ yeni mи≥ktublarд╠ al"
+#: ui/evolution-mail-message.xml.h:75
+#, fuzzy
+msgid "Show Full _Headers"
+msgstr "_Tam Baе÷lд╠qlar"
 
-#: ui/evolution-mail.xml.h:83
-msgid "Show _All"
-msgstr "_Hamд╠sд╠nд╠ Gц╤stи≥r"
+#: ui/evolution-mail-message.xml.h:76
+#, fuzzy
+msgid "Show message in the normal style"
+msgstr "Gц╪n %s е÷и≥klindи≥ girilmи≥lidir."
 
-#: ui/evolution-mail.xml.h:85
-msgid "Threaded Message list"
-msgstr "д╟lgи≥k_lи≥nmiе÷ д╟smarд╠clar Siyahд╠sд╠"
+#: ui/evolution-mail-message.xml.h:77
+#, fuzzy
+msgid "Show message with all email headers"
+msgstr "Bц╪tц╪n qovluqlarda yeni ePoц╖t ц╪ц╖ц╪n bax"
+
+#: ui/evolution-mail-message.xml.h:78
+#, fuzzy
+msgid "Show the raw email source of the message"
+msgstr "д╟smarд╠ca bir fayl и≥lavи≥ et"
 
-#: ui/evolution-mail.xml.h:86
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "Seц╖ili ismarд╠cд╠ silmи≥"
 
-#: ui/evolution-mail.xml.h:87
-msgid "Undelete"
-msgstr "Geri Qaytar"
+#: ui/evolution-mail-message.xml.h:80
+#, fuzzy
+msgid "VFolder on Mailing _List..."
+msgstr "Mи≥ktublaе÷ma Q_rupundakд╠ VFolder"
 
-#: ui/evolution-mail.xml.h:92
-msgid "View Raw Message Source"
-msgstr "ц┤iy д╟smarд╠c Qaynaд÷д╠nд╠ Gц╤stи≥r"
+#: ui/evolution-mail-message.xml.h:81
+#, fuzzy
+msgid "VFolder on Se_nder..."
+msgstr "Gц╤n_dи≥rи≥ndи≥ki vFolder"
 
-#: ui/evolution-mail.xml.h:93
-msgid "Virtual Folder _Editor..."
-msgstr "Virtual Qovluq _Dц╪zи≥ldicisi..."
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "VFolder on _Recipients..."
+msgstr "_Alд╠cд╠dakд╠ vFolder"
 
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail-message.xml.h:83
+#, fuzzy
+msgid "VFolder on _Subject..."
+msgstr "_Mц╤vzudakд╠ vFolder"
+
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "Sц╪zgи≥clи≥ri ф▐_lavи≥ Et"
 
-#: ui/evolution-mail.xml.h:95
-msgid "_Attachment"
-msgstr "_Yapд╠е÷dд╠rд╠lmд╠е÷ Fayl"
+#: ui/evolution-mail-message.xml.h:85
+#, fuzzy
+msgid "_Copy to Folder"
+msgstr "Qovluд÷a Kц╤ц╖ц╪rt"
 
-#: ui/evolution-mail.xml.h:97
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "д╟smarд╠cdan Qayda _Yarat"
 
-#: ui/evolution-mail.xml.h:99
-msgid "_Expunge"
-msgstr "_Tи≥mizlи≥"
-
-#: ui/evolution-mail.xml.h:100
-msgid "_Filters..."
-msgstr "_Sц╪zgи≥clи≥r ..."
-
-#: ui/evolution-mail.xml.h:101 ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "_Qovluq"
+#: ui/evolution-mail-message.xml.h:88
+#, fuzzy
+msgid "_Forward Message"
+msgstr "ц┤atdд╠rд╠lmд╠е÷ ismarд╠c"
 
-#: ui/evolution-mail.xml.h:103
-msgid "_Inline"
-msgstr "_Xи≥tdи≥"
+#: ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Message Display"
+msgstr "д╟smarд╠clar"
 
-#: ui/evolution-mail.xml.h:104 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "Seц╖kiyi _Tи≥rs ц┤evir"
+#: ui/evolution-mail-message.xml.h:90
+#, fuzzy
+msgid "_Move to Folder"
+msgstr "Qovluд÷a Kц╤ц╖ц╪r"
 
-#: ui/evolution-mail.xml.h:105
-msgid "_Mail Message"
-msgstr "_Mи≥ktub д╟smarд╠cд╠"
+#: ui/evolution-mail-message.xml.h:91
+#, fuzzy
+msgid "_Normal Display"
+msgstr "Ekran"
 
-#: ui/evolution-mail.xml.h:106
-msgid "_Mail Settings..."
-msgstr "_Mи≥ktub Qurд÷ularд╠..."
+#: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Open Message"
+msgstr "д╟_smarд╠clarд╠ Yenidи≥n Gц╤ndи≥r"
 
-#: ui/evolution-mail.xml.h:108
-msgid "_Open Selected Items"
-msgstr "Seц╖ili ц°zvlи≥ri _Aц╖"
+#: ui/evolution-mail-message.xml.h:93
+#, fuzzy
+msgid "_Re-send Message"
+msgstr "д╟_smarд╠clarд╠ Yenidи≥n Gц╤ndи≥r"
 
-#: ui/evolution-mail.xml.h:110
-msgid "_Quoted"
-msgstr "_Kotalanmд╠е÷"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Bu pи≥ncи≥rи≥ni qapat"
 
-#: ui/evolution-mail.xml.h:111
-msgid "_Reply"
-msgstr "_Cavabla"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr "Vasitи≥lи≥r ц┤ubuд÷unu _Xц╪susilи≥е÷dir..."
 
-#: ui/evolution-mail.xml.h:112
-msgid "_Resend Messages"
-msgstr "д╟_smarд╠clarд╠ Yenidи≥n Gц╤ndи≥r"
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "_Xц╪susilи≥е÷dir"
 
-#: ui/evolution-mail.xml.h:114
-msgid "_Save Message As..."
-msgstr "д╟smarд╠clarд╠ _Fи≥rqli Qeyd Et ..."
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "Vasitи≥lи≥r ц╖ubuд÷unu xц╪susilи≥е÷dir"
 
-#: ui/evolution-mail.xml.h:115
-msgid "_Send / Receive"
-msgstr "_Gц╤ndи≥r / Al"
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "_Qapat"
 
-#: ui/evolution-mail.xml.h:116
-msgid "_Threaded"
-msgstr "_д╟lgи≥klи≥nmiе÷"
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "_Gц╤stи≥r"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Yapд╠е÷dд╠r"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Hazд╠rkд╠ faylд╠ qapat"
 
 #: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Delete all but signature"
+msgstr "Bц╪tц╪n Hadisи≥lи≥ri sil"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "д╟smarд╠cд╠ PGP ilи≥ kodla"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "е·и≥ki_l"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "_Mи≥tn faylд╠nд╠ daxil et ... "
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Bir faylд╠ mи≥tn olaraq ismarд╠ca и≥lavи≥ et"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "_Mи≥tn faylд╠nд╠ daxil et ... "
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Fayl aц╖"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "PGP kodla"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "PGP д╟mzasд╠"
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "_Lahiyи≥ni Qeyd Et"
+#, fuzzy
+msgid "S/MIME Encrypt"
+msgstr "PGP kodla"
 
 #: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "_Qovluqda Qeyd Et ... (ABY)"
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "Qeyd Et"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Fи≥rqli Qeyd Et"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr "_Lahiyи≥ni Qeyd Et"
+
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "_Qovluqda qeyd et ..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "Hazд╠rkд╠ faylд╠ qeyd et"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Hazд╠rkд╠ faylд╠ fи≥rqli bir ad altд╠nda qeyd et"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "д╟smarд╠cд╠ bildirilи≥n qovluqda qeyd et"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Gц╤ndи≥r"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "_Sonra Gц╤ndи≥r"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "_Sonra gц╤ndи≥r"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "ePoц╖tu HTML е·и≥klindи≥ gц╤ndи≥r"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "д╟smarд╠cд╠ sonra gц╤ndи≥r"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "д╟smarд╠cд╠ indi gц╤ndи≥r"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Bu ismarд╠cд╠ indi gц╤ndи≥r"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Yapе÷dд╠rд╠lmд╠е÷ fayllarд╠ gц╤stи≥r/gizlи≥t"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "_Yapд╠е÷dд╠rд╠lmд╠е÷ Fayllarд╠ gц╤stи≥r"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Yapд╠е÷dд╠rд╠lmд╠е÷ fayllarд╠ gц╤stи≥r"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "д╟smarд╠cд╠ fи≥rqli bir ad altд╠nda qeyd et"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "д╟smarд╠cд╠ fи≥rqli bir ad altд╠nda qeyd et"
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr "BCC giriе÷inin harda olacaд÷д╠nд╠ bildirи≥r"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr "CC giriе÷inin harda olacaд÷д╠nд╠ bildirи≥r"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Gц√NDф▐Rф▐N giriе÷inin harda olacaд÷д╠nд╠ bildirи≥r"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Gц√NDф▐Rд╟Lф▐Cф▐K giriе÷inin harda olacaд÷д╠nд╠ bildirи≥r"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "_Yapд╠е÷dд╠rд╠lmд╠е÷ Fayl"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "_Bcc Giriе÷i"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "_Cc Giriе÷i"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "_Ayд╠qla"
+
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Delete all"
+msgstr "_Sil"
+
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "_Gц╤ndи≥rи≥n Giriе÷i"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Daxil Et"
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
-msgstr "_Mи≥tn faylд╠nд╠ daxil et ... ( ABY )"
-
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Aц╖ ..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "_Cavab_Verlи≥cи≥k Giriе÷i"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "_Tи≥hlц╪kи≥sizlik"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "_Kц╤mи≥k"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Qovluд÷u qeydiyyatlд╠ qovluqlar siyahд╠sд╠na al"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Qovluq"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Siyahд╠nд╠ Yenilи≥"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Qovluqlar Siyahд╠sд╠nд╠ Yenilи≥"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Qovluд÷u qeydiyyatlд╠ qovluqlar siyahд╠sд╠ndan ц╖д╠xart"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Qeydiyyatdan Keц╖"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Qeydiyyatdan ц┤д╠x"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "Ayrд╠l_mд╠е÷ Vи≥zifи≥ (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Yenidи≥n Axtar"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "Gц╤rц╪ д╟s_tи≥yi (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Yenidи≥n Et"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Geriyи≥ alд╠na gediе÷i yenidи≥n et"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Dи≥yiе÷dir"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Kи≥limи≥ni dи≥yiе÷dir"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "_Hamд╠sд╠na Cavab Ver (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "Vи≥ziyyи≥t Raportunu _Gц√ndи≥r (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "Tи≥krarlamanд╠ _Keц╖ (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "Vи≥zifи≥ni qeyd et vи≥ dialoqu qapat"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "Eyni kи≥limи≥ni yenи≥ axtar"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "Kи≥limи≥ni axtar"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Geriyи≥ Al"
+#: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Task"
+msgstr "Yeni Vи≥zifи≥"
 
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "Axд╠rд╠ncд╠ gediе÷i geriyи≥ al"
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "Bu vи≥zifи≥ni sil"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
-msgid "_Appointment (FIXME)"
-msgstr "_Gц╤rц╪е÷ (ABY)"
+#: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Re_fresh Task"
+msgstr "Siyahд╠nд╠ Yenilи≥"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "_д╟е÷arи≥tlи≥mи≥ Qurtardд╠ (FIXME)"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "_Cavab Ver (FIXME)"
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "Copy selected task"
+msgstr "Seц╖ili ц°zvlи≥ri _Aц╖"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Yeni bir vи≥zifи≥ yarat"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "Bu vи≥zifи≥ni sil"
+
+#: ui/evolution-tasks.xml.h:7
+#, fuzzy
+msgid "Delete selected tasks"
+msgstr "Bu vи≥zifи≥ni sil"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Yeni Vи≥zifи≥"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "Ara yaddaе÷д╠ yapд╠е÷dд╠r"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Vи≥zifи≥ni vи≥ baе÷qa е÷eylи≥ri dи≥ qeyd et"
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "Vи≥zifи≥ Seц╖и≥nи≥klи≥ri..."
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "_Mи≥ktub Qurд÷ularд╠..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_Vи≥zifи≥"
 
@@ -8591,132 +11502,220 @@ msgstr "_Vи≥zifи≥"
 msgid "About Evolution..."
 msgstr "\"Evolution\" Haqqд╠nda..."
 
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Bu pи≥ncи≥rи≥ni qapat"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
-msgstr "Vasitи≥lи≥r ц┤ubuд÷unu _Xц╪susilи≥е÷dir..."
+#: ui/evolution.xml.h:2
+#, fuzzy
+msgid "Add to _Shortcut Bar"
+msgstr "_Qд╠sa Yol ц┤ubuд÷u"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "_Xц╪susilи≥е÷dir"
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the name of this folder"
+msgstr "Bu cи≥rgи≥nin xц╪susiyyи≥tlи≥rini dи≥yiе÷dir"
 
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Vasitи≥lи≥r ц╖ubuд÷unu xц╪susilи≥е÷dir"
+#, fuzzy
+msgid "Copy this folder"
+msgstr "Qovluд÷a Kц╤ц╖ц╪rt"
 
 #: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "Yeni bir qovluq yarat"
+
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "Bu qд╠sa yolu qд╠sa yol ц╖ubuд÷undan sil"
+
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Yeni bir qovluq yarat"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "Bu ц╪zvц╪ sil"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Baе÷qa bir qovluд÷u gц╤stи≥r"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "ц┤д╠_x"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "Evolution _Pи≥ncи≥rи≥si"
 
-#: ui/evolution.xml.h:10
-msgid "Evolution bar _shortcut"
-msgstr "\"Evolution\" ц╖ubuд÷u _qд╠sa yolu"
-
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Proqramdan ц╖д╠x"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "Ne_cи≥ Baе÷layaram"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Xarici fayl е÷и≥klini idxal et"
 
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "Ana vasitи≥ ц╖ubuд÷u"
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "Seц╖ili ismarд╠clarд╠ baе÷qa bir cи≥rgи≥yи≥ daе÷д╠"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Open in New _Window"
+msgstr "Yeni Pи≥ncи≥rи≥dи≥ Aц╖"
+
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Open this folder in an other window"
+msgstr "Gц╪ncи≥l ismarд╠clarд╠ yeni pи≥ncи≥rи≥dи≥ aц╖"
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "\"Evolution\" haqqд╠nda mи≥'lumat gц╤stи≥r"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Xи≥ta Raportunu Gц╤ndи≥r"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "_Xи≥ta Raportunu Gц╤ndи≥r"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "\"Bug-buddy\" dи≥stи≥yi ilи≥ bir xи≥ta raportunu gц╤ndи≥r"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:30
+#, fuzzy
+msgid "Toggle"
+msgstr "Rolu"
+
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Qovluqlar ц╖ubuд÷unun nц╪mayiе÷ etdirilи≥cи≥yi yeri bildir"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Qд╠sa yol ц╖ubuд÷unun nц╪mayiе÷ etdirilи≥cи≥yi yeri bildir"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "Toggle whether we are working offline."
+msgstr "Gц√NDф▐Rф▐N giriе÷inin harda olacaд÷д╠nд╠ bildirи≥r"
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "ф▐_laqи≥lи≥r д╟darи≥cisini Necи≥ iе÷lи≥dim"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "_Tи≥qvimi Necи≥ д╟е÷lи≥dim"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "_ePoц╖t bц╤lmи≥sini necи≥ д╟е÷lи≥dim"
 
-#: ui/evolution.xml.h:24
-msgid "Work Offline"
-msgstr "Xи≥tdи≥n Qopuq д╟е÷lи≥"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr "Seц╖ili qovluд÷u gц╤stи≥r"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "_Evolution Haqqд╠nda..."
 
-#: ui/evolution.xml.h:26
-msgid "_Actions"
-msgstr "_Gediе÷lи≥r"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "_Gц╤rц╪е÷ (ABY)"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "_ф▐laqи≥lи≥r"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Kц╤ц╖ц╪rt"
+
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "_Qovluq ц┤ubuд÷u"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "Qovluд÷a _Get ..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "Faylд╠ _д╟daxl Et ... "
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "_д╟ndeks"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "_Mи≥ktub д╟smarд╠cд╠"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "Daе÷д╠"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Yeni"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "_Yeni Qovluq"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Aц╖ ..."
+
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "_Qд╠sa Yol ц┤ubuд÷u"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "_Qд╠sa Yol ц┤ubuд÷u"
 
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "_Vи≥zifи≥"
+
+#: ui/evolution.xml.h:64
+#, fuzzy
+msgid "_Work Offline"
+msgstr "Xи≥tdи≥n Qopuq д╟е÷lи≥"
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "_Mи≥ktub Qurд÷ularд╠..."
+
 #: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
+#, fuzzy
+msgid "Address Cards"
 msgstr "ц°nvan Kartlarд╠"
 
 #: views/addressbook/galview.xml.h:2
@@ -8747,9 +11746,12 @@ msgstr "д╟smarд╠clar"
 msgid "With Category"
 msgstr "Kateqoriya ilи≥"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "Giriе÷imli"
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%a %B %d %Y"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
@@ -8823,68 +11825,139 @@ msgstr "д╟clas sonlanma saatд╠ :"
 msgid "All Attendees"
 msgstr "Bц╪tц╪n Ziyarи≥tц╖ilи≥r"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%a %B %d %Y"
-
-#: widgets/menus/gal-view-menus.c:177
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "_Hazд╠rkд╠ Gц╤rц╪nц╪е÷"
 
-#: widgets/menus/gal-view-menus.c:196
+#: widgets/menus/gal-view-menus.c:259
 msgid "Define Views"
 msgstr "Gц╤rц╪nц╪е÷lи≥ri Mц╪и≥yyи≥nlи≥е÷dir"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:422
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "д╟ndi"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Bugц╪n"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "Oldu"
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Gц╪n %s е÷и≥klindи≥ girilmи≥lidir."
 
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "hи≥ftи≥"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "Zibil Qutusu"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "Nи≥qliyyat bacarд╠lmadд╠"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "Xи≥bи≥rlи≥r"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Namи≥'lum xи≥ta: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "Baе÷qa"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "ф▐laqи≥ dц╪zи≥ldicisi"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "Axtarд╠е÷д╠ Qeyd Et"
 
-#: widgets/misc/e-filter-bar.c:237
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "ф▐traflд╠ Axtarд╠е÷"
 
-#: widgets/misc/e-filter-bar.c:317
-msgid "Advanced ..."
-msgstr "ф▐traflд╠ ..."
-
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "Fи≥rqli Qeyd Et ..."
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "Hamд╠sд╠nд╠ Gц╤stи≥r"
 
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Dц╪zи≥lt..."
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "ф▐traflд╠..."
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
@@ -8894,6 +11967,10 @@ msgstr "Mи≥'lumat"
 msgid "Warning"
 msgstr "Xи≥bи≥rdarlд╠q"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Xи≥ta"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Sual"
@@ -8907,7 +11984,7 @@ msgstr "д╟smarд╠c"
 msgid "Don't show this message again."
 msgstr "Bu ismarд╠cд╠ bir dи≥ gц╤stи≥rmи≥."
 
-#: widgets/misc/e-search-bar.c:148
+#: widgets/misc/e-search-bar.c:155
 msgid "Sear_ch"
 msgstr "Ax_tar"
 
@@ -8931,3 +12008,659 @@ msgstr "init_corba(): GNOME baе÷ladд╠la bilmи≥di"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobonu baе÷lada bilmи≥dim"
 
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "Seц╖и≥nи≥klи≥ri dи≥yiе÷dir"
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "Vи≥zifи≥ Seц╖и≥nи≥klи≥ri..."
+
+#~ msgid "???"
+#~ msgstr "???"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "_ф▐laqи≥lи≥r ..."
+
+#~ msgid "_Company:"
+#~ msgstr "е·_irkи≥t :"
+
+#~ msgid "As _Minicards"
+#~ msgstr "_Balaca kartlar olaraq"
+
+#~ msgid "As _Table"
+#~ msgstr "_Cи≥dvи≥l olaraq"
+
+#~ msgid ""
+#~ "We were unable to open this addressbook.  This either\n"
+#~ "means you have entered an incorrect URI, or have tried\n"
+#~ "to access an LDAP server and don't have LDAP support\n"
+#~ "compiled in.  If you've entered a URI, check the URI for\n"
+#~ "correctness and reenter.  If not, you probably have\n"
+#~ "attempted to access an LDAP server.  If you wish to be\n"
+#~ "able to use LDAP, you'll need to download and install\n"
+#~ "OpenLDAP and recompile and install Evolution.\n"
+#~ msgstr ""
+#~ "Bu ц╪nvan dи≥ftи≥rini aц╖a bilmи≥dik. Bu ya sи≥hv bir\n"
+#~ "URI'nin bildirilmи≥sindи≥n ц╤trц╪ ya da LDAP dи≥stи≥yi \n"
+#~ "olmayan bir vericiyи≥ ц╖atmaq istи≥mи≥sindи≥n ц╤trц╪dц╪r.\n"
+#~ "Bir URI bildirdin isи≥, URI'nin dц╪z olduд÷unu yoxla vи≥\n"
+#~ "yenи≥ sд╠na. Bir URI bildirimи≥din isи≥, bir LDAP vericisinи≥\n"
+#~ "ц╖atmaq istи≥din. LDAp'д╠ istifadи≥ etmи≥k istи≥yirsи≥nsи≥ , OpenLDAPi(д╠)\n"
+#~ "qurub, Evolution'u yenidи≥n yoxlayд╠b yenidи≥n qurmaq "
+#~ "mи≥cburiyyи≥tindи≥sи≥n.\n"
+
+#~ msgid "SASL"
+#~ msgstr "SASL"
+
+#~ msgid "Find..."
+#~ msgstr "Tap..."
+
+#~ msgid "Open calendar"
+#~ msgstr "Tи≥qvimi aц╖"
+
+#~ msgid "Save calendar"
+#~ msgstr "Tи≥qvimi qeyd et"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>Tи≥qvim yц╪klи≥mи≥ xи≥tasд╠:<br>Bu yol dи≥stи≥klanmir"
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "Zд╠nqд╠rovun sи≥s kи≥silmи≥si mц╪ddи≥ti"
+
+#~ msgid "Colors"
+#~ msgstr "Rи≥nglи≥r"
+
+#~ msgid "Enable snoozing for"
+#~ msgstr "Xи≥bardarlд╠д÷д╠ Fи≥allaе÷dд╠r"
+
+#~ msgid "Highlight"
+#~ msgstr "д╟е÷arи≥tlи≥"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "Bц╪gunkц╪ д╟е÷lи≥r:"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Hи≥lи≥ Bitirilmи≥miе÷ д╟е÷lи≥r"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Hи≥lи≥ Bitirilmи≥miе÷ д╟е÷lи≥r:"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "Vaxtд╠ Keц╖miе÷ д╟е÷lи≥r:"
+
+#~ msgid "TaskPad"
+#~ msgstr "Vи≥zifи≥ Taxtasд╠"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Keц╖mи≥sinи≥ qи≥dи≥r qalan vaxt"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Gц╤stи≥riе÷li Xи≥bи≥rdarlд╠qlar"
+
+#~ msgid "Work week"
+#~ msgstr "д╟е÷ Hи≥ftи≥si"
+
+#~ msgid "Edit Task"
+#~ msgstr "Vи≥zifи≥ni Dц╪zи≥lt"
+
+#~ msgid "Percent complete"
+#~ msgstr "Faiz Qurtardд╠"
+
+#~ msgid "Mark the task complete"
+#~ msgstr "Vи≥zifи≥ qurtarmasд╠nд╠ iе÷arи≥tlи≥"
+
+#~ msgid "Edit this task..."
+#~ msgstr "Bu vи≥zifи≥ni dц╪zи≥lt ..."
+
+#~ msgid "Edit the task"
+#~ msgstr "Vи≥zifи≥ni Dц╪zи≥lt"
+
+#~ msgid "Go to Today"
+#~ msgstr "Gц╪nи≥ Get"
+
+#~ msgid "Component successfully updated."
+#~ msgstr "Komponenet mц╪vи≥ffи≥qiyyи≥tlи≥ gц╪ncи≥llи≥ndi."
+
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "Tи≥qvim faylд╠nд╠ yц╪klи≥yи≥ bilmirи≥m!\n"
+
+#~ msgid "I couldn't read your calendar file!\n"
+#~ msgstr "Tи≥qvim faylд╠nд╠ oxuya bilmirи≥m!\n"
+
+#~ msgid "This is a reply from someone who was uninvited!"
+#~ msgstr "Bu, dи≥vи≥t edilmи≥miе÷ biri tи≥rи≥findи≥n verilи≥n cavabdд╠r!"
+
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "Tи≥qvim mи≥'lumatlarд╠nд╠ gц╪ncи≥llи≥yи≥ bilmirи≥m."
+
+#~ msgid "I couldn't delete the calendar component!\n"
+#~ msgstr "Tи≥qvim komponenetini silи≥ bilmirи≥m!\n"
+
+#~ msgid "Component successfully deleted."
+#~ msgstr "Komponenet mц╪vи≥ffи≥qiyyи≥tlи≥ silindi."
+
+#~ msgid "I don't recognize this type of calendar component."
+#~ msgstr "Bu cц╪r tи≥qvim parц╖asд╠ndan baе÷д╠m ц╖д╠xmд╠r."
+
+#~ msgid "Add to Calendar"
+#~ msgstr "Tи≥qvimи≥ ф▐lavи≥ Et"
+
+#~ msgid " Tentative "
+#~ msgstr " Giriе÷imli"
+
+#~ msgid "Update Calendar"
+#~ msgstr "Tи≥qvimi Gц╪ncи≥llи≥"
+
+#~ msgid "Attendee address"
+#~ msgstr "Ziyarи≥tц╖ilи≥rin ц╪nvanlarд╠"
+
+#~ msgid "Attendees: "
+#~ msgstr "Ziyarи≥tц╖ilи≥r:"
+
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr ""
+#~ "Gц╤rц╪е÷ц╪\n"
+#~ "Lи≥д÷v Et"
+
+#~ msgid "Organizer: "
+#~ msgstr "Tи≥е÷kilatц╖д╠:"
+
+#~ msgid ""
+#~ "Publish\n"
+#~ "Event"
+#~ msgstr ""
+#~ "Hadisи≥ni\n"
+#~ "Dи≥rc Et"
+
+#~ msgid "Show a dialog"
+#~ msgstr "Dialoqu gц╤stи≥r"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "Gц╤rц╪е÷ ф▐saslarд╠"
+
+#~ msgid "_Starting date:"
+#~ msgstr "_Baе÷lama Tarixi"
+
+#~ msgid "Summary contains"
+#~ msgstr "Xц╪lasи≥ daxil edи≥n"
+
+#~ msgid "Comment contains"
+#~ msgstr "е·и≥rh daxil edи≥n"
+
+#~ msgid "Has category"
+#~ msgstr "Kateqoriyaya sahib olan"
+
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "%s ц╪ц╖ц╪n qд╠fд╠l faylд╠ sд╠nana bilmи≥di: %s"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "IMAP qovluд÷u daranд╠r"
+
+#~ msgid "Inline attachment"
+#~ msgstr "Daxili yapд╠е÷dд╠rma"
+
+#~ msgid "Send as:"
+#~ msgstr "Fи≥rqli gц╤ndи≥r:"
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s imza faylд╠ aц╖д╠la bilmи≥di:\n"
+#~ "%s"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "Bu normal bir fayl deyildir ."
+
+#~ msgid "That file exists but is not readable."
+#~ msgstr "Bu fayl vardд╠r amma oxuna bilи≥n deyildir ."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr ""
+#~ "Bu fayl и≥l ц╖atд╠la bilи≥ndi dи≥yи≥sи≥n amma open(2)-ц╖aд÷д╠rд╠е÷д╠ iflas "
+#~ "etdi ."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "Bu fayl ц╖ox bц╤yц╪kdц╪r ( 100 KB'dи≥n bц╤yц╪k ! ) .\n"
+#~ "Bu faylд╠ daxil etmи≥k istи≥yirsanmi?"
+
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr "%I:%M:%S %p%n"
+
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Html Faylд╠nд╠ aц╖a bilmи≥dim:\n"
+#~ "%s"
+
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "Faylд╠nд╠n xidmи≥tlи≥r ц╪ц╖ц╪n ayrд╠lmд╠е÷ sahи≥si yoxdur.\n"
+
+#~ msgid "Select a service"
+#~ msgstr "Xidmц╕t seц╖"
+
+#~ msgid ""
+#~ "You can select a different HTML page for the background of the Executive "
+#~ "Summary.\n"
+#~ "\n"
+#~ "Just leave it blank for the default"
+#~ msgstr ""
+#~ "д╟cracд╠ Mц╪ndи≥ricatд╠nд╠n arxaplanд╠ ц╪ц╖ц╪n baе÷qa HTML sи≥hifи≥si seц╖и≥ "
+#~ "bilи≥rsiniz\n"
+#~ "\n"
+#~ "Ana seц╖и≥nи≥k ц╪ц╖ц╪n boе÷ buraxд╠n"
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "%s i и≥sas GNOME proqramд╠ ilи≥ aц╖"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "%s i и≥sas GNOME sи≥yyahд╠ ilи≥ aц╖"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "%s a(и≥) mи≥ktub gц╤ndи≥r"
+
+#~ msgid "Run %s"
+#~ msgstr "%s i(д╠) д╟е÷и≥ sal"
+
+#~ msgid "Close %s"
+#~ msgstr "%s i(д╠) Qapat"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "%s i(д╠) sola kц╤ц╖ц╪r"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "%s i(д╠) saд÷a kц╤ц╖ц╪r"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "%s i(д╠) и≥vvи≥lki sи≥tirи≥ kц╤ц╖ц╪r"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "%s i(д╠) sonrakд╠ sи≥tirи≥ kц╤ц╖ц╪r"
+
+#~ msgid "Appearance"
+#~ msgstr "Gц√rц╪nц╪е÷"
+
+#~ msgid "Background:"
+#~ msgstr "Arxaplan:"
+
+#~ msgid ""
+#~ "Executive summary component could not initialize Bonobo.\n"
+#~ "If there was a warning message about the RootPOA, it probably means\n"
+#~ "you compiled Bonobo against GOAD instead of OAF."
+#~ msgstr ""
+#~ "д╟cracд╠ mц╪ndи≥ricatд╠ ц╪zvц╪ Bonoboyu baе÷lada bilmи≥di.\n"
+#~ "ф▐gи≥r RootPOA haqqд╠nda xи≥bи≥rdarlд╠q aldд╠nд╠z isи≥, demи≥li Bonoboyu OAG "
+#~ "yerinи≥\n"
+#~ "GOAD ila dayд╠qladд╠nд╠z."
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "RDF mц╪ndи≥ricatд╠ e'malatxanasд╠."
+
+#~ msgid "RDF Summary"
+#~ msgstr "RDF Mц╪ndи≥ricatд╠"
+
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Sд╠naq bonobo parц╖asд╠ e'malatxanasд╠."
+
+#~ msgid "Factory for the test component."
+#~ msgstr "Sд╠naq parц╖asд╠ e'malatxanasд╠."
+
+#~ msgid "Test bonobo service"
+#~ msgstr "Bonobo xidmи≥ti"
+
+#~ msgid "Test service"
+#~ msgstr "Sд╠naq xidmи≥ti"
+
+#~ msgid "Update automatically"
+#~ msgstr "Avtomatik gц╪ncи≥llи≥"
+
+#~ msgid "Forward to Address"
+#~ msgstr "д╟smarд╠cд╠ ц╪nvana irи≥lilи≥t"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "\"%s\" qovluд÷unu \"%s\" е÷и≥klinи≥ ц╖evir"
+
+#~ msgid "Closing current folder"
+#~ msgstr "Hazд╠rkд╠ qovluq qapadд╠lд╠r"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Kц╤hnи≥ qovluд÷un adд╠ dи≥yiе÷dirilir vи≥ aц╖д╠lд╠r"
+
+#~ msgid "Copying messages"
+#~ msgstr "д╟smarд╠clar kц╤ц╖ц╪rц╪lц╪r"
+
+#~ msgid "Evolution progress"
+#~ msgstr "\"Evolution\"un gediе÷i"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "%d nin %d ismarд╠cд╠ alд╠nд╠r (uid \"%s\")"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "%d nin %d ismarд╠cд╠ qeyd edilir (uid \"%s\")"
+
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "Borulamadan xи≥sи≥rli bir ismarд╠c gи≥ldi !"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (ц╖atdд╠rilmiе÷ ismarд╠c)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Dvm: (mц╤vzusuz)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "ц┤atdд╠rд╠lmд╠е÷ ismarд╠c (mц╤vzusuz)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----ц┤atdд╠rд╠lmд╠е÷ д╟smarд╠c-----<br><b>Gц╤ndи≥rи≥n:</b> "
+#~ "%s<br><b>Gц╤ndи≥rilи≥n:</b> %s<br><b>Mц╤vzu:</b> %s<br>"
+
+#~ msgid "Print the selected message"
+#~ msgstr "Seц╖ili ismarд╠cд╠ ц╖ap et"
+
+#~ msgid "Delete this message"
+#~ msgstr "Bu ismarд╠cд╠ sil"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "\"Evolution\" fayllarд╠ mц╪vи≥ffи≥qiyyи≥tlи≥ quruldu."
+
+#~ msgid "Activate"
+#~ msgstr "Fи≥allaе÷dд╠r"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "Bu qд╠sa yolu fи≥allaе÷dд╠rs"
+
+#~ msgid "Find a contact"
+#~ msgstr "Bir и≥laqи≥ni axtar"
+
+#~ msgid "View All"
+#~ msgstr "Hamд╠sд╠nд╠ Gц╤stи≥r"
+
+#~ msgid "View all contacts"
+#~ msgstr "Bц╪tц╪n и≥laqи≥lи≥ri gц╤stи≥r"
+
+#~ msgid "5 Days"
+#~ msgstr "5 gц╪n"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Yeni bir tи≥qvim yarat"
+
+#~ msgid "Day"
+#~ msgstr "Gц╪n"
+
+#~ msgid "New _Event"
+#~ msgstr "Yeni _Hadisи≥"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Tи≥qvimi Aц╖"
+
+#~ msgid "Prev"
+#~ msgstr "Geri"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Tи≥qvimi baе÷qa е÷ey olaraq qeyd et"
+
+#~ msgid "Week"
+#~ msgstr "Hи≥ftи≥"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Tи≥qvimi aц╖"
+
+#~ msgid "About this application"
+#~ msgstr "Bu proqram tи≥'minatд╠ haqqд╠nda"
+
+#~ msgid "About..."
+#~ msgstr "Haqqд╠nda..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "Gediе÷_lи≥r"
+
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "ц°nvan _Dи≥ftи≥ri ... (FIXME)"
+
+#~ msgid "C_lear"
+#~ msgstr "Tи≥_mizlи≥"
+
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "Adlarд╠ Y_oxla (FIXME)"
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "Qovluд÷a Kц╤_ц╖ц╪r... (FIXME)"
+
+#~ msgid "Dump XML"
+#~ msgstr "XML yekunu"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "UI Xml yekununu ц╖д╠xart"
+
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "Qovluqdakд╠ _д╟lk ц°zv (FIXME)"
+
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "ц┤at_dд╠r (FIXME)"
+
+#~ msgid "Go to the next item"
+#~ msgstr "д╟rи≥lidи≥ki ц°zvи≥ Get"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "ф▐vvи≥lki ц°zvи≥ Get"
+
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "Nata_mam Vи≥zifи≥ (FIXME)"
+
+#~ msgid "N_ext"
+#~ msgstr "_Sonrakд╠"
+
+#~ msgid "Pre_vious"
+#~ msgstr "_Geri"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "ц┤ap _Qurд÷ularд╠..."
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "Bи≥zi nц╤v gц╤rц╪е÷lи≥ri planlaе÷dд╠r"
+
+#~ msgid "Select everything"
+#~ msgstr "Hи≥r е÷eyi seц╖in"
+
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "Vи≥zifи≥ So_rд÷usu (FIXME)"
+
+#~ msgid "_About..."
+#~ msgstr "_Haqqд╠nda..."
+
+#~ msgid "_Item (FIXME)"
+#~ msgstr "_ц°zv (FIXME)"
+
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "_Jurnal Giriе÷i (FIXME)"
+
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "Qovluqdakд╠ _Axд╠rд╠ncд╠ ц°zv (FIXME)"
+
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "e_Poц╖t д╟smarд╠cд╠ (FIXME)"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "Qovluд÷a _Daе÷д╠ ... (FIXME)"
+
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_Qeyd (FIXME)"
+
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "_Oxunmamuе÷ ц°zv (FIXME)"
+
+#~ msgid "Add Service"
+#~ msgstr "Xidmи≥t ф▐lavи≥ Et"
+
+#~ msgid "Add a new service to the Executive Summary"
+#~ msgstr "д╟cracд╠ Mц╪ndи≥ricata yeni xidmи≥t и≥lavи≥ et"
+
+#~ msgid "Create a new email"
+#~ msgstr "Yeni bir mи≥ktub yarat"
+
+#~ msgid "Executive Summary Settings..."
+#~ msgstr "д╟cracд╠ Mц╪ndи≥ricat Qurд÷ularд╠..."
+
+#~ msgid "New Mail"
+#~ msgstr "Yeni Mи≥ktub"
+
+#~ msgid "Apply any new filters to the mail in this box"
+#~ msgstr "ф▐lavи≥ Et hи≥dи≥fin"
+
+#~ msgid "Configure Folder..."
+#~ msgstr "Cи≥rgи≥ Qur..."
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "д╟smarд╠clarд╠ yeni bir qovluд÷a daе÷д╠"
+
+#~ msgid "Edit the current message"
+#~ msgstr "Gц╪ncи≥l ismarд╠cд╠ dц╪zи≥lt"
+
+#~ msgid "Expunge"
+#~ msgstr "Sil"
+
+#~ msgid "Finaly remove all mails tagged for deletion"
+#~ msgstr "Axд╠rda silmи≥k ц╪ц╖ц╪n iе÷arи≥tli bц╪tц╪n mи≥ktublarд╠ sil"
+
+#~ msgid "Forward inline"
+#~ msgstr "Hи≥mи≥n ц╖atdд╠r"
+
+#~ msgid "Forward this message in-line with your mail, so you can edit it"
+#~ msgstr "Bu ismarд╠cд╠ dц╪zи≥ltdikdц╪n sonra ц╖atdд╠r"
+
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "Silinи≥n д╟smarд╠clarд╠ Gizlи≥t"
+
+#~ msgid "Invert Selection"
+#~ msgstr "Seц╖imi Tи≥rsinи≥ ц┤evir"
+
+#~ msgid "Mark As Read"
+#~ msgstr "Oxunmuе÷ Olaraq д╟е÷arи≥tlи≥"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Oxun_mamд╠е÷ Olaraq д╟е÷arи≥tlи≥"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "д╟smarд╠cд╠ yeni bir qovluд÷a daе÷д╠"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "д╟smarд╠cд╠n ц╖ap etmи≥ Nц╪mayiе÷i..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "д╟smarд╠cд╠ ц╖ap et"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "д╟stiqamи≥tlи≥ndir (FIXME: mи≥ni qи≥bul et)"
+
+#~ msgid "Reply to all"
+#~ msgstr "Hamд╠sд╠na cavab ver"
+
+#~ msgid "Reply to sender"
+#~ msgstr "Gц╤ndи≥rи≥nи≥ cavab ver"
+
+#~ msgid "S_ource"
+#~ msgstr "Qa_ynaq"
+
+#~ msgid "Send a reply to the person who sent you this mail"
+#~ msgstr "Bu ismarд╠cд╠ sizи≥ gц╤ndи≥rи≥n nи≥fи≥rи≥ bir cavab yazд╠n"
+
+#~ msgid "Send a single mail in reply to all the selected mail"
+#~ msgstr "Bц╪tц╪n seц╖ili mи≥ktublara tи≥k mи≥ktub yolla"
+
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr ""
+#~ "Nц╤vbи≥dи≥ki ismarд╠clarд╠ gц╤ndи≥r\n"
+#~ "    vи≥ yeni ismarд╠clarд╠ al"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "ц┤iy д╟smarд╠c Qaynaд÷д╠nд╠ Gц╤stи≥r"
+
+#~ msgid "_Reply"
+#~ msgstr "_Cavabla"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "д╟smarд╠clarд╠ _Fи≥rqli Qeyd Et ..."
+
+#~ msgid "_Threaded"
+#~ msgstr "_д╟lgи≥klи≥nmiе÷"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "_Qovluqda Qeyd Et ... (ABY)"
+
+#~ msgid "Send the message now"
+#~ msgstr "д╟smarд╠cд╠ indi gц╤ndи≥r"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_Mи≥tn faylд╠nд╠ daxil et ... ( ABY )"
+
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "Ayrд╠l_mд╠е÷ Vи≥zifи≥ (FIXME)"
+
+#~ msgid "Meeting Re_quest (FIXME)"
+#~ msgstr "Gц╤rц╪ д╟s_tи≥yi (FIXME)"
+
+#~ msgid "Redo"
+#~ msgstr "Yenidи≥n Et"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Geriyи≥ alд╠na gediе÷i yenidи≥n et"
+
+#~ msgid "Replace"
+#~ msgstr "Dи≥yiе÷dir"
+
+#~ msgid "Replace a string"
+#~ msgstr "Kи≥limи≥ni dи≥yiе÷dir"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "_Hamд╠sд╠na Cavab Ver (FIXME)"
+
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "Vи≥ziyyи≥t Raportunu _Gц√ndи≥r (FIXME)"
+
+#~ msgid "S_kip Occurrence (FIXME)"
+#~ msgstr "Tи≥krarlamanд╠ _Keц╖ (FIXME)"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "Eyni kи≥limи≥ni yenи≥ axtar"
+
+#~ msgid "Search for a string"
+#~ msgstr "Kи≥limи≥ni axtar"
+
+#~ msgid "Undo"
+#~ msgstr "Geriyи≥ Al"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Axд╠rд╠ncд╠ gediе÷i geriyи≥ al"
+
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "_д╟е÷arи≥tlи≥mи≥ Qurtardд╠ (FIXME)"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "_Cavab Ver (FIXME)"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "\"Evolution\" ц╖ubuд÷u _qд╠sa yolu"
+
+#~ msgid "Advanced ..."
+#~ msgstr "ф▐traflд╠ ..."
diff --git a/po/ca.po b/po/ca.po
index a2426ff409..80203ca752 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.0.6\n"
-"POT-Creation-Date: 2001-04-14 08:51-0400\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2000-11-01 00:40+0100\n"
 "Last-Translator: Quico Llach <tradgnome@softcatala.org>\n"
 "Language-Team: Catalan <linux@softcatala.org>\n"
@@ -15,208 +15,216 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3605
 #, fuzzy
 msgid "Card: "
 msgstr "Cotxe"
 
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3607
 #, fuzzy
 msgid ""
 "\n"
 "Name: "
 msgstr "Nom:"
 
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3612
 #, fuzzy
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr "_Sufix:"
 
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3626
 #, fuzzy
 msgid ""
 "\n"
 "Birth Date: "
 msgstr "Data d'ini_ci:"
 
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3637
 #, fuzzy
 msgid ""
 "\n"
 "Address:"
 msgstr "_AdreГa:"
 
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3645
 #, fuzzy
 msgid ""
 "\n"
 "  Country:     "
 msgstr "PaМ_s:"
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3697
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr "AdreГa electrРnica 2"
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3700
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:"
 msgstr "AdreГa electrРnica 2"
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3737
 #, fuzzy
 msgid ""
 "\n"
 "Business Role: "
 msgstr "Feina 2"
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3750
 #, fuzzy
 msgid ""
 "\n"
 "  Name:  "
 msgstr "Nom:"
 
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3758
 #, fuzzy
 msgid ""
 "\n"
 "Categories: "
 msgstr "categories"
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3759
 #, fuzzy
 msgid ""
 "\n"
@@ -233,36 +241,38 @@ msgstr "Comentaris sobre l'element:"
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3775
 #, fuzzy
 msgid ""
 "\n"
 "Public Key: "
 msgstr "PЗblic"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:4037
+#, fuzzy
+msgid "Multiple VCards"
+msgstr "Mou el missatge"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:4045
+#, fuzzy, c-format
+msgid "VCard for %s"
+msgstr "Si us plau, introduОu la contrasenya NNTP per a %s@%s"
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:43
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
@@ -275,14 +285,14 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "No s'ha pogut iniciar el servidor wombat"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "No s'ha pogut iniciar el wombat"
 
@@ -291,762 +301,880 @@ msgstr "No s'ha pogut iniciar el wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicaciС d'adreГa del Pilot"
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#, fuzzy
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr ""
+"Utilitat de configuraciС per al conducte de la llibreta d'adreces de "
+"l'Evolution\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#, fuzzy
+msgid "Factory for the Addressbook's address popup"
+msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution addressbook component."
+msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#, fuzzy
+msgid "Factory for the sample Addressbook control"
+msgstr "Feu clic aquМ per a la llibreta d'adreces"
+
+#: addressbook/gui/component/addressbook-config.c:148
+#, fuzzy
+msgid "LDAP Server"
+msgstr "Servidor LDAP:"
+
+#: addressbook/gui/component/addressbook-config.c:150
+#, fuzzy
+msgid "File"
+msgstr "_Fitxer"
+
+#: addressbook/gui/component/addressbook-config.c:153
+#, fuzzy
+msgid "Unknown addressbook type"
+msgstr "No es pot obrir la llibreta d'adreces"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Contrasenya"
+
+#: addressbook/gui/component/addressbook-config.c:168
+#, fuzzy
+msgid "Unknown auth type"
+msgstr "Error desconegut"
+
+#: addressbook/gui/component/addressbook-config.c:177
+#, fuzzy
+msgid "Base"
+msgstr "Enganxa"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:181
+#, fuzzy
+msgid "Subtree"
+msgstr "Subscriu-me"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Host:"
+msgstr "Hores"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "DN arrel:"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:411
+#, fuzzy
+msgid "Port:"
+msgstr "Prioritat:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:432
+#, fuzzy
+msgid "Search Scope:"
+msgstr "Cerca"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "AutenticaciС:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "CamМ:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:528
+#, fuzzy
+msgid "Create path if it doesn't exist."
+msgstr "Aquest fitxer no existeix."
+
+#: addressbook/gui/component/addressbook-config.c:663
+#, fuzzy
+msgid "Edit Addressbook"
+msgstr "Desa a la llibreta d'adreces"
+
+#: addressbook/gui/component/addressbook-config.c:665
+#, fuzzy
+msgid "Add Addressbook"
+msgstr "Desa a la llibreta d'adreces"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Nom:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "DescripciС:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr ""
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "Afegeix"
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "Afegeix una font"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Suprimeix"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Nom"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+#, fuzzy
+msgid "URI"
+msgstr "URL:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "_Afegeix"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "_Edita"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+#, fuzzy
+msgid "Other Contacts"
+msgstr "Contacte _nou"
+
+#: addressbook/gui/component/addressbook.c:345
+#, fuzzy, c-format
+msgid "Enter password for %s"
+msgstr "Si us plau, introduОu la contrasenya NNTP per a %s@%s"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "No es pot obrir la llibreta d'adreces"
+
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:554
+#, fuzzy
+msgid "Any field contains"
+msgstr "El cos contИ"
+
+#: addressbook/gui/component/addressbook.c:555
+#, fuzzy
+msgid "Name contains"
+msgstr "contИ"
+
+#: addressbook/gui/component/addressbook.c:556
+#, fuzzy
+msgid "Email contains"
+msgstr "contИ"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "contИ"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "L'URI que mostrarЮ el navegador de carpetes"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "AdreГa electrРnica principal"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "AdreГa electrРnica 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "AdreГa electrРnica 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "Fitxer de signatura:"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Crea un nou contacte"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "Desa a la llibreta d'adreces"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "Contacte _nou"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "AdreГa electrРnica:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+#, fuzzy
+msgid "Disable Queries"
+msgstr "Categories disponibles:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr ""
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#, fuzzy
+msgid "Evolution's addressbook name selection interface."
+msgstr "Conducte de la llibreta d'adreces de l'Evolution"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Elimina"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+#, fuzzy
+msgid "Remove All"
+msgstr "Elimina"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "Sendmail"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Contacte _nou"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "Destinataris del missatge"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "Seleccioneu els noms"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "Seleccioneu un nom de la llista:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "categories"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+#, fuzzy
+msgid "_Search"
+msgstr "Cerca"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "Ani_versari:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "F_eina"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "Fax de la feina"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "C_ontactes..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ca_tegories..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Contacta l'editor"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Detalls"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Arxiva com:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "General"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Nou tipus de telХfon"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "No_tes:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "OrganitzaciС:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Tipus de telХfon"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
-msgstr "AdreГa electrРnica principal"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "Vol rebre correu _HTML"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "AdreГa de pЮgina web:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
-msgstr "_Afegeix"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "_AdreГa..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "_Nom de l'assistent:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "_Data de naixement:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Feina"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Empresa:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "_Contactes..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:91 ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Suprimeix"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "_Departament:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "Nom _complet..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_Particular"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "_CЮrrec:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "_Nom del gestor:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_MРbil"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "_Sobrenom:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "_Oficina"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_ProfessiС:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "_CРnjuge:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "_Aquesta Иs l'adreГa de correu"
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "Voleu suprimir el contacte?"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 #, fuzzy
 msgid "This contact belongs to these categories:"
 msgstr "El(s) element(s) pertanyen a aquestes categories:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Feina"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Feina 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Fax de la feina"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Crida de retorn"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Cotxe"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Empresa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Particular 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Fax particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "XDSI"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "MРbil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Altres"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Un altre fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Busca"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Primari"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "RЮdio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "TХlex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
-msgid "Email 2"
-msgstr "AdreГa electrРnica 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
-msgid "Email 3"
-msgstr "AdreГa electrРnica 3"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:223
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:225
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 #, fuzzy
 msgid "Edit Full"
 msgstr "Filtres d'ediciС"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:262
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 #, fuzzy
 msgid "Full Name"
 msgstr "Nom complet:"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:268
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 #, fuzzy
 msgid "E-mail"
 msgstr "AdreГa electrРnica 2"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "AdreГa _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "CanadЮ"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Comprova l'adreГa"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "PaМ_s:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "FinlЮndia"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "EUA"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_AdreГa:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_PoblaciС:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "_Apartat de correus:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "_Comarca:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "_Codi postal:"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Comprova el nom complet"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 #, fuzzy
 msgid "I"
 msgstr "Si"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 #, fuzzy
 msgid "Miss"
 msgstr "Иs"
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Primer:"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_зltim:"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Mig:"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_Sufix:"
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_TМtol:"
 
-#: addressbook/gui/component/addressbook.c:241
-msgid "As _Minicards"
-msgstr "Com a _Minicards"
-
-#: addressbook/gui/component/addressbook.c:247
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Com a _taula"
-
-#: addressbook/gui/component/addressbook.c:399
-#, fuzzy, c-format
-msgid "Enter password for %s"
-msgstr "Si us plau, introduОu la contrasenya NNTP per a %s@%s"
-
-#: addressbook/gui/component/addressbook.c:427
-msgid "Unable to open addressbook"
-msgstr "No es pot obrir la llibreta d'adreces"
-
-#: addressbook/gui/component/addressbook.c:432
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Ha estat impossible obrir aquesta llibreta d'adreces.\n"
-"AixР pot ser perquХ, o bИ heu introduОt un URI incorrecte,\n"
-"o bИ heu intentat accedir a un servidor LDAP sense tenir\n"
-"compilat el suport per a LDAP. Si heu introduОt un URI,\n"
-"comproveu que sigui correcte i torneu-lo a introduir. Altrament,\n"
-"segurament heu intentat accedir a un servidor LDAP. Si\n"
-"voleu poder utilitzar LDAP, necessitareu descarregar i instal╥lar\n"
-"l'OpenLDAP i recompilar i instal╥lar l'Evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:555
-#, fuzzy
-msgid "Show All"
-msgstr "Mostra"
-
-#: addressbook/gui/component/addressbook.c:557
-#, fuzzy
-msgid "Advanced..."
-msgstr "Afegeix..."
-
-#: addressbook/gui/component/addressbook.c:587
-#, fuzzy
-msgid "Any field contains"
-msgstr "El cos contИ"
-
-#: addressbook/gui/component/addressbook.c:588
-#, fuzzy
-msgid "Name contains"
-msgstr "contИ"
-
-#: addressbook/gui/component/addressbook.c:589
-#, fuzzy
-msgid "Email contains"
-msgstr "contИ"
-
-#: addressbook/gui/component/addressbook.c:732
-msgid "The URI that the Folder Browser will display"
-msgstr "L'URI que mostrarЮ el navegador de carpetes"
-
-#: addressbook/gui/component/addressbook-storage.c:99
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #, fuzzy
-msgid "Other Contacts"
-msgstr "Contacte _nou"
-
-#: addressbook/gui/component/addressbook-config.c:148
-#, fuzzy
-msgid "LDAP Server"
-msgstr "Servidor LDAP:"
-
-#: addressbook/gui/component/addressbook-config.c:150
-#, fuzzy
-msgid "File"
-msgstr "_Fitxer"
+msgid "List _name:"
+msgstr "Nom d'usuari:"
 
-#: addressbook/gui/component/addressbook-config.c:153
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
 #, fuzzy
-msgid "Unknown addressbook type"
-msgstr "No es pot obrir la llibreta d'adreces"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
-msgid "Password"
-msgstr "Contrasenya"
+msgid "Members"
+msgstr "desembre"
 
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:170
-#, fuzzy
-msgid "Unknown auth type"
-msgstr "Error desconegut"
-
-#: addressbook/gui/component/addressbook-config.c:179
-#, fuzzy
-msgid "Base"
-msgstr "Enganxa"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "One"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:183
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 #, fuzzy
-msgid "Subtree"
-msgstr "Subscriu-me"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Unknown scope type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:353
-msgid "Bind DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:354
-msgid "FIXME Bind DN Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
-msgstr ""
+msgid "_Remove"
+msgstr "Elimina"
 
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 #, fuzzy
-msgid "Host:"
-msgstr "Hores"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Host help text here."
-msgstr ""
+msgid "contact-list-editor"
+msgstr "Contacta l'editor"
 
-#: addressbook/gui/component/addressbook-config.c:409
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
 #, fuzzy
-msgid "Port:"
-msgstr "Prioritat:"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
-msgstr "DN arrel:"
+msgid "Contact List Editor"
+msgstr "Contacta l'editor"
 
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:435
-#, fuzzy
-msgid "Search Scope:"
-msgstr "Cerca"
-
-#: addressbook/gui/component/addressbook-config.c:489
-msgid "Authentication:"
-msgstr "AutenticaciС:"
-
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
-msgid "Path:"
-msgstr "CamМ:"
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "FIXME Path Help text here"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:513
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
 #, fuzzy
-msgid "Create path if it doesn't exist."
-msgstr "Aquest fitxer no existeix."
-
-#: addressbook/gui/component/addressbook-config.c:647
-#, fuzzy
-msgid "Edit Addressbook"
-msgstr "Desa a la llibreta d'adreces"
+msgid "New Contact:"
+msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/component/addressbook-config.c:649
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
 #, fuzzy
-msgid "Add Addressbook"
-msgstr "Desa a la llibreta d'adreces"
+msgid "Original Contact:"
+msgstr "Autor original:"
 
-#: addressbook/gui/component/addressbook-config.c:665
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
-msgid "Name:"
-msgstr "Nom:"
-
-#: addressbook/gui/component/addressbook-config.c:672
-msgid "FIXME Name help text here"
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:674
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "DescripciС:"
-
-#: addressbook/gui/component/addressbook-config.c:675
-msgid "FIXME Description help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-#, fuzzy
-msgid "Addressbook Sources"
-msgstr "Afegeix una font"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:8 mail/folder-browser.c:597
-#: mail/mail-config.glade.h:19 mail/mail-view.c:156
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Suprimeix"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "Edita"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Nom"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
-msgid "URI"
-msgstr "URL:"
-
-#: addressbook/gui/component/e-address-widget.c:365
-#, fuzzy
-msgid "Disable Queries"
-msgstr "Categories disponibles:"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr ""
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
-msgstr ""
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
-#, fuzzy
-msgid "Add to Contacts"
+msgid "Changed Contact:"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#, fuzzy
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr ""
-"Utilitat de configuraciС per al conducte de la llibreta d'adreces de "
-"l'Evolution\n"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Conducte de la llibreta d'adreces de l'Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-#, fuzzy
-msgid "Factory for the Addressbook's address popup"
-msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-#, fuzzy
-msgid "Factory for the Evolution addressbook component."
-msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-#, fuzzy
-msgid "Factory for the sample Addressbook control"
-msgstr "Feu clic aquМ per a la llibreta d'adreces"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-#, fuzzy
-msgid "Evolution's addressbook name selection interface."
-msgstr "Conducte de la llibreta d'adreces de l'Evolution"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:402
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
-msgstr "Elimina"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
-#, fuzzy
-msgid "Remove All"
-msgstr "Elimina"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Cerca..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Destinataris del missatge"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Seleccioneu els noms"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-#, fuzzy
-msgid "Select name from:"
-msgstr "Seleccioneu un nom de la llista:"
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Cerca"
 
@@ -1158,184 +1286,279 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "Desa com a VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 #, fuzzy
 msgid "Send message to contact"
 msgstr "FIXME: Nou _missatge per contactar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/folder-browser.c:572
-#: mail/mail-view.c:154 ui/evolution-addressbook.xml.h:9
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:50
-#: ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Imprimeix"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Imprimeix el missatge..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Suprimeix"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "Error en carregar el fitxer: %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "Fonts"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Error desconegut"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "S'estЮ movent"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "PermМs denegat"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "No s'ha trobat el fitxer"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "OperaciС no suportada"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "Cancel╥lat"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "Error d'E/S"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "Error en carregar el fitxer: %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Error en carregar el fitxer: %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Error en carregar el fitxer: %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "Error en carregar el fitxer: %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr "Error en llegir el fitxer de correu: %s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 #, fuzzy
 msgid "* Click here to add a contact *"
 msgstr "<feu clic aquМ per seleccionar una data>"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 #, fuzzy
 msgid "File As"
 msgstr "Arxiva com:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 #, fuzzy
 msgid "Email"
 msgstr "AdreГa electrРnica 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 #, fuzzy
 msgid "Primary Phone"
 msgstr "Primari"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 #, fuzzy
 msgid "Assistant Phone"
 msgstr "Assistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 #, fuzzy
 msgid "Business Phone"
 msgstr "Feina 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 #, fuzzy
 msgid "Callback Phone"
 msgstr "Crida de retorn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 #, fuzzy
 msgid "Company Phone"
 msgstr "Empresa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 #, fuzzy
 msgid "Home Phone"
 msgstr "Particular 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "OrganitzaciС"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 #, fuzzy
 msgid "Business Address"
 msgstr "Feina 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 #, fuzzy
 msgid "Home Address"
 msgstr "Comprova l'adreГa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 #, fuzzy
 msgid "Mobile Phone"
 msgstr "MРbil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 #, fuzzy
 msgid "Business Phone 2"
 msgstr "Feina 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "Particular 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 #, fuzzy
 msgid "Other Phone"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 #, fuzzy
 msgid "TTY"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 #, fuzzy
 msgid "Other Address"
 msgstr "Comprova l'adreГa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 #, fuzzy
 msgid "Department"
 msgstr "_Departament:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 #, fuzzy
 msgid "Office"
 msgstr "_Oficina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 #, fuzzy
 msgid "Title"
 msgstr "_TМtol:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #, fuzzy
 msgid "Profession"
 msgstr "_ProfessiС:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 #, fuzzy
 msgid "Manager"
 msgstr "Busca"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 #, fuzzy
 msgid "Nickname"
 msgstr "_Sobrenom:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 #, fuzzy
 msgid "Spouse"
 msgstr "_CРnjuge:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 #, fuzzy
 msgid "Note"
 msgstr "Cap"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "Cap"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "Imprimeix l'agenda"
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Desa a la llibreta d'adreces"
 
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1379,7 +1602,8 @@ msgid "Dimensions:"
 msgstr "Dimensions:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Lletra..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1439,7 +1663,6 @@ msgid "Margins"
 msgstr "Marges"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "Nombre de columnes:"
 
@@ -1519,142 +1742,330 @@ msgstr "Tipus:"
 msgid "Width:"
 msgstr "Amplada:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Lletra..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Error en comunicar-se amb el servidor d'agenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicaciС d'agenda del Pilot"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicaciС de coses per fer del Pilot"
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
-msgstr "No s'ha trobat el fitxer"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
-msgstr "Obre l'agenda"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#, fuzzy
+msgid "Evolution calendar executive summary component."
+msgstr ""
+"No es pot inicialitzar el component de resum del correu de l'Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Conducte de l'agenda de l'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
-msgstr "Desa l'agenda"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#, fuzzy
+msgid "Factory for the Calendar Summary component."
+msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
 
-#: calendar/gui/calendar-commands.c:468
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the calendar iTip view control"
+msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the sample Calendar control"
+msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "NotificaciС sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "NotificaciС sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "NotificaciС sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "NotificaciС sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "NotificaciС sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "NotificaciС sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "NotificaciС sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "Mostra informaciС referent a l'Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "Alarma el %A %d de %b de %Y, a les %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Tanca"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "'Snooze'"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "Durada de l'snooze (minuts)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "Edita una cita"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "No hi ha cap resum disponible."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "Recordatori de la vostra cita a "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "'Snooze'"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "D'acord"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
+#, c-format
+msgid ""
+"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+"know."
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
+#, fuzzy
+msgid "Could not create the alarm notify service factory"
+msgstr "No s'ha pogut crear el directori temporal: %s"
+
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A, %d de %B de %Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "PЗblic"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1592
-#: calendar/gui/event-editor.c:1619
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:660
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Alta"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
-#: calendar/gui/calendar-model.c:1569
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:659
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:658
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Baixa"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Transparent"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Opac"
 
-#: calendar/gui/calendar-model.c:635 calendar/gui/calendar-model.c:1173
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "No iniciat"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1175
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "En procИs"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1177
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 #, fuzzy
 msgid "Completed"
 msgstr "% comp_let:"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1179
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
-#: camel/camel-service.c:586
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: camel/camel-service.c:580
 #, fuzzy
 msgid "Cancelled"
 msgstr "Cancel╥lat"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:799
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1665,23 +2076,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:879
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:893 calendar/gui/calendar-model.c:1117
-#: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1129
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:430
-#: widgets/misc/e-dateedit.c:1339 widgets/misc/e-dateedit.c:1454
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Cap"
 
-#: calendar/gui/calendar-model.c:967
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1691,149 +2106,302 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1007
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "El valor de percentatge ha d'estar entre 0 i 100, ambdСs inclosos"
 
-#: calendar/gui/calendar-model.c:1048
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1061
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1102
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1571
+#: calendar/gui/calendar-model.c:1710
 #, fuzzy
 msgid "Recurring"
 msgstr "RecurrХncia"
 
-#: calendar/gui/calendar-model.c:1573
+#: calendar/gui/calendar-model.c:1712
 #, fuzzy
 msgid "Assigned"
 msgstr "Assigna una puntuaciС"
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 #, fuzzy
 msgid "No"
 msgstr "Ara"
 
-#: calendar/gui/calendar-summary.c:196
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
 #, fuzzy
-msgid "%A, %e %B %Y"
-msgstr "%A, %d de %B de %Y"
+msgid "Day View"
+msgstr "Cotxe"
 
-#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
 #, fuzzy
-msgid "%I:%M%p"
-msgstr "%I:%M %p"
+msgid "Work Week View"
+msgstr "Setmana de treball"
 
-#: calendar/gui/calendar-summary.c:437
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
 #, fuzzy
-msgid "<b>Error loading calendar</b>"
-msgstr "Error en carregar el fitxer: %s"
+msgid "Week View"
+msgstr "Setmana"
 
-#: calendar/gui/calendar-summary.c:449
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr ""
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "Mes"
+
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "La URI que mostrarЮ l'agenda"
 
-#: calendar/gui/calendar-summary.c:616
+#: calendar/gui/dialogs/alarm-options.c:354
 #, fuzzy
-msgid "Display"
-msgstr "_VisualitzaciС"
+msgid "Audio Alarm Options"
+msgstr "Alarmes acЗstiques"
 
-#: calendar/gui/calendar-summary.c:621
+#: calendar/gui/dialogs/alarm-options.c:363
 #, fuzzy
-msgid "Show appointments"
-msgstr "Mostra les hores d'acabament de les cites"
+msgid "Message Alarm Options"
+msgstr "Destinataris del missatge"
 
-#: calendar/gui/calendar-summary.c:629
+#: calendar/gui/dialogs/alarm-options.c:372
 #, fuzzy
-msgid "Show tasks"
-msgstr "Mostra les _adjuncions"
+msgid "Mail Alarm Options"
+msgstr "Opcions de visualitzaciС"
 
-#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:1
 #, fuzzy
-msgid "Loading Calendar"
-msgstr "Imprimeix l'agenda"
+msgid "Alarm Repeat"
+msgstr "Propietats de l'alarma"
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "La URI que mostrarЮ l'agenda"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "Recordatori de la vostra cita a "
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "Esborra la visualitzaciС del missatge"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "'Snooze'"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Final del dia:"
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "D'acord"
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "_Executa el programa:"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "dies"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "_Actualitza lliure/ocupat"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "hores"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "minuts"
+
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr "dies"
+
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr "Mostra 1 dia"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr "setmanes"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr "Mostra 1 setmana"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr "hores"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr "hora"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr "minuts"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr "10 minuts"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr " segons"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr " segons"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:52
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
 #, fuzzy
-msgid "Could not initialize GNOME"
-msgstr "No s'ha pogut inicialitzar el Bonobo"
+msgid "Display a message"
+msgstr "Visualitza l'UID del missatge \"%s\""
 
-#: calendar/gui/alarm-notify/notify-main.c:77
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
 #, fuzzy
-msgid "Could not create the alarm notify service factory"
-msgstr "No s'ha pogut crear el directori temporal: %s"
+msgid "Send an email"
+msgstr "S'estЮ recollint el correu des de %s"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarma el %A %d de %b de %Y, a les %H:%M"
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+#, fuzzy
+msgid "Run a program"
+msgstr "_Executa el programa:"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "NotificaciС sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr "Crea una nova cita"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
-msgstr "No hi ha cap resum disponible."
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr "Crea una nova cita"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
+#: calendar/gui/dialogs/alarm-page.c:374
 #, fuzzy
-msgid "Close"
-msgstr "Tanca"
+msgid "before end of appointment"
+msgstr "Recorda'm totes les cites"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Edita una cita"
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr "Crea una nova cita"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Durada de l'snooze (minuts)"
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "Enganxa"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "Data d'enviament"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "Recordatoris"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Resum:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_Opcions"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "desprИs de"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "abans de"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "dia(es)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+#, fuzzy
+msgid "end of appointment"
+msgstr "Recorda'm totes les cites"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+#, fuzzy
+msgid "hour(s)"
+msgstr "hores"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#, fuzzy
+msgid "minute(s)"
+msgstr "minuts"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+#, fuzzy
+msgid "start of appointment"
+msgstr "Edita una cita"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
@@ -1864,36 +2432,40 @@ msgid "60 minutes"
 msgstr "60 minuts"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Les alarmes es desactiven desprИs de"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Alarmes acЗstiques"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "Fes un so quan aparegui una finestra d'alarma."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Agenda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "PreferХncies de l'agenda"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#, fuzzy
+msgid "Color for tasks due today"
+msgstr "Element per fer que venГ avui:"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Colors"
+#, fuzzy
+msgid "Colors for Tasks"
+msgstr "Colors per a la visualitzaciС"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+#, fuzzy
+msgid "Compress weekends in month view"
 msgstr "Comprimeix els caps de setmana"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+#, fuzzy
+msgid "Date Navigator"
 msgstr "Opcions del navegador de dates"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1901,1110 +2473,1226 @@ msgid "Defaults"
 msgstr "Valors predeterminats"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Opcions de visualitzaciС"
+#: mail/mail-config.glade.h:30
+#, fuzzy
+msgid "Display"
+msgstr "_VisualitzaciС"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
-msgstr "Data de venciment"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Habilita l'snoozing per a"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Final del dia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "primer dia de la setmana:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "dv."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Divendres"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Ressalta"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "Elemts que vencen avui"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Elements que vencen avui:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Elements que encara no han venГut"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Elements que encara no han venГut:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "dl."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Dilluns"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Elements venГuts"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "Elements que ja han venГut:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
-msgstr "Agafa un color"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "Prioritat"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#, fuzzy
+msgid "Overdue tasks"
+msgstr "Elements venГuts"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Recorda'm totes les cites"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Recordatoris"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "ds."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Mostra"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #, fuzzy
-msgid "Show appointment end times"
+msgid "Show appointment end times in week and month views"
 msgstr "Mostra les hores d'acabament de les cites"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Mostra els nЗmeros de les setmanes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "Inici del dia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "dg."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Diumenge"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "TaskPad"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "Tasques"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "Elemts que vencen avui"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "dj."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Dijous"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Temps fins al venciment"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "Time"
+msgstr "Temps"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "Divisions de temps:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Format de l'hora:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr "Divisions de temps:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "dm."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Dimarts"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Alarmes visuals"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "dc."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
 msgstr "Setmana de treball"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "minuts abans que es produeixin."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
-msgid "seconds."
-msgstr "segons."
-
-#: calendar/gui/dialogs/delete-comp.c:70
-#, fuzzy, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
-"Esteu segur que voleu\n"
-"suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:73
+#: calendar/gui/dialogs/cancel-comp.c:58
 #, fuzzy
-msgid "Are you sure you want to delete this untitled appointment?"
+msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:79
-#, fuzzy, c-format
-msgid "Are you sure you want to delete the task `%s'?"
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:82
+#: calendar/gui/dialogs/cancel-comp.c:68
 #, fuzzy
-msgid "Are you sure you want to delete this untitled task?"
+msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:88
-#, fuzzy, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
 msgstr ""
-"Esteu segur que voleu\n"
-"suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:91
-#, fuzzy
-msgid "Are you sure want to delete this untitled journal entry?"
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
 msgstr ""
-"Esteu segur que voleu\n"
-"suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% comp_let:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Classification"
-msgstr "ClassificaciС"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
-#, fuzzy
-msgid "Date & Time"
-msgstr "Data d'enviament"
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Data completa:"
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Pri_vate"
-msgstr "Pri_vat"
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-#, fuzzy
-msgid "Progress"
-msgstr "En procИs"
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Pu_blic"
-msgstr "PЗ_blic"
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-#, fuzzy
-msgid "Sta_rt Date:"
-msgstr "Data d'ini_ci:"
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Su_mmary:"
-msgstr "Resu_m:"
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Tasca"
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
 #, fuzzy
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Confidential"
-msgstr "_Confidencial"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "_Contactes..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "_Data de venciment:"
+msgid " (Completed "
+msgstr "% comp_let:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_Prioritat:"
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "% comp_let:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "_Estat:"
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:697
-msgid "Edit Task"
-msgstr "Edita la tasca"
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#, fuzzy
+msgid "Due "
+msgstr "Data de venciment"
 
-#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
-msgid "No summary"
-msgstr "Sense resum"
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "Edita una cita"
 
-#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
+#: calendar/gui/dialogs/comp-editor.c:454
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
+#: calendar/gui/dialogs/comp-editor.c:457
 #, c-format
 msgid "Task - %s"
 msgstr "Tasca - %s"
 
-#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
+#: calendar/gui/dialogs/comp-editor.c:460
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada al diari - %s"
 
-#: calendar/gui/e-calendar-table.c:157
-#, fuzzy
-msgid "Categories"
-msgstr "categories"
-
-#: calendar/gui/e-calendar-table.c:159
-#, fuzzy
-msgid "Completion Date"
-msgstr "Completat"
-
-#: calendar/gui/e-calendar-table.c:160
-#, fuzzy
-msgid "End Date"
-msgstr "Hora de _finalitzaciС:"
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Sense resum"
 
-#: calendar/gui/e-calendar-table.c:161
-#, fuzzy
-msgid "Start Date"
-msgstr "Data d'ini_ci:"
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "Voleu sobreescriure el fitxer?"
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
 msgstr ""
+"Ja existeix una fitxer amb aquest nom.\n"
+"El voleu sobreescriure?"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
 #, fuzzy
-msgid "Percent complete"
-msgstr "Marca la tasca com a completa"
+msgid "Save As..."
+msgstr "Anomena i desa..."
 
-#: calendar/gui/e-calendar-table.c:166
-#, fuzzy
-msgid "Summary"
-msgstr "R_esum"
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:167
-#, fuzzy
-msgid "Transparency"
-msgstr "Transparent"
+#: calendar/gui/dialogs/delete-comp.c:84
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
 
-#: calendar/gui/e-calendar-table.c:168
+#: calendar/gui/dialogs/delete-comp.c:87
 #, fuzzy
-msgid "URL"
-msgstr "URL:"
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
-msgstr "Alarmes"
+#: calendar/gui/dialogs/delete-comp.c:93
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
 
-#: calendar/gui/e-calendar-table.c:170
+#: calendar/gui/dialogs/delete-comp.c:96
 #, fuzzy
-msgid "Click here to add a task"
-msgstr "Feu clic aquМ per a la llibreta d'adreces"
-
-#: calendar/gui/e-calendar-table.c:374
-#, c-format
-msgid "0%"
+msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
 
-#: calendar/gui/e-calendar-table.c:375
-#, c-format
-msgid "10%"
+#: calendar/gui/dialogs/delete-comp.c:102
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
 
-#: calendar/gui/e-calendar-table.c:376
-#, c-format
-msgid "20%"
+#: calendar/gui/dialogs/delete-comp.c:105
+#, fuzzy
+msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
 
-#: calendar/gui/e-calendar-table.c:377
-#, c-format
-msgid "30%"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointments?"
 msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
 
-#: calendar/gui/e-calendar-table.c:378
-#, c-format
-msgid "40%"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d tasks?"
 msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
 
-#: calendar/gui/e-calendar-table.c:379
-#, c-format
-msgid "50%"
+#: calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
 
-#: calendar/gui/e-calendar-table.c:380
-#, c-format
-msgid "60%"
-msgstr ""
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Fitxer de signatura:"
 
-#: calendar/gui/e-calendar-table.c:381
-#, c-format
-msgid "70%"
-msgstr ""
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Seccions:"
 
-#: calendar/gui/e-calendar-table.c:382
-#, c-format
-msgid "80%"
-msgstr ""
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr "Divisions de temps:"
 
-#: calendar/gui/e-calendar-table.c:383
-#, c-format
-msgid "90%"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:384
-#, c-format
-msgid "100%"
-msgstr ""
+#: calendar/gui/dialogs/event-editor.c:154
+#, fuzzy
+msgid "Appointment"
+msgstr "Cites:"
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "Marca com a completa"
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
+msgstr "Recordatori"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
-msgstr "Marca la tasca com a completa"
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
+msgstr "RecurrХncia"
 
-#: calendar/gui/e-calendar-table.c:557
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
 #, fuzzy
-msgid "Edit this task..."
-msgstr "Edita aquest element..."
+msgid "Meeting"
+msgstr "Cancel╥lat"
 
-#: calendar/gui/e-calendar-table.c:558
-#, fuzzy
-msgid "Edit the task"
-msgstr "Edita la tasca"
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "Esdeveniment per a _tot el dia"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
+msgid "Classification"
+msgstr "ClassificaciС"
+
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 #, fuzzy
-msgid "Delete this task"
-msgstr "Suprimeix la tasca"
+msgid "Date & Time"
+msgstr "Data d'enviament"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
-msgstr "Suprimeix la tasca"
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
+msgid "Pri_vate"
+msgstr "Pri_vat"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i divisions de minut"
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
+msgid "Pu_blic"
+msgstr "PЗ_blic"
 
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
-msgid "%A %d %B"
-msgstr "%A, %d de %B"
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
+msgid "Su_mmary:"
+msgstr "Resu_m:"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
+msgid "_Confidential"
+msgstr "_Confidencial"
 
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
-#: calendar/gui/e-week-view-main-item.c:348
-msgid "%d %b"
-msgstr "%d %b"
+#: calendar/gui/dialogs/event-page.glade.h:10
+#, fuzzy
+msgid "_End time:"
+msgstr "Hora de _finalitzaciС:"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
-msgstr "am"
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "Hora d'_inici:"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
 #, fuzzy
-msgid "New Appointment"
-msgstr "Nova cita..."
+msgid "Group"
+msgstr "Grup %i"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
 #, fuzzy
-msgid "New All Day Event"
-msgstr "Esdeveniment per a _tot el dia"
+msgid "Resource"
+msgstr "Font"
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
-#, fuzzy
-msgid "Go to Today"
-msgstr "VИs a avui"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
 #, fuzzy
-msgid "Go to Date..."
-msgstr "VИs a una data"
+msgid "Chair"
+msgstr "Cotxe"
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: mail/folder-browser.c:566 ui/evolution-calendar.xml.h:19
-#: ui/evolution-message-composer.xml.h:10
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
 #, fuzzy
-msgid "Open"
-msgstr "_Obre"
+msgid "Required Participant"
+msgstr "Persones _requerides"
 
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
-#, fuzzy
-msgid "Delete this Appointment"
-msgstr "Suprimeix aquesta cita"
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-#, fuzzy
-msgid "Schedule Meeting"
-msgstr "Seleccioneu una carpeta"
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
 #, fuzzy
-msgid "Make this Occurrence Movable"
-msgstr "Fes aquesta cita movible"
+msgid "Needs Action"
+msgstr "Elimina una acciС"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
 #, fuzzy
-msgid "Delete this Occurrence"
-msgstr "Suprimeix-ne aquesta apariciС"
+msgid "Accepted"
+msgstr "set"
 
-#: calendar/gui/e-day-view.c:3179
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
 #, fuzzy
-msgid "Delete all Occurrences"
-msgstr "Suprimeix-ne totes les aparicions"
+msgid "Declined"
+msgstr "Suprimeix"
 
-#: calendar/gui/e-itip-control.c:161
-#, fuzzy
-msgid "I couldn't update your calendar file!\n"
-msgstr "No s'ha pogut crear una agenda a `%s'"
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Tentatiu"
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
 #, fuzzy
-msgid "Component successfully updated."
-msgstr "Els fitxers de l'Evolution s'han instal╥lat amb Хxit."
+msgid "Delegated"
+msgstr "Suprimeix"
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "En procИs"
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
 #, fuzzy
-msgid "I couldn't read your calendar file!\n"
-msgstr "No s'ha pogut crear una agenda a `%s'"
-
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
-msgstr ""
+msgid "Required Participants"
+msgstr "Persones _requerides"
 
-#: calendar/gui/e-itip-control.c:499
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
 #, fuzzy
-msgid "I couldn't update your calendar store."
-msgstr "No s'ha pogut crear una agenda a `%s'"
+msgid "Optional Participants"
+msgstr "Persones _requerides"
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Persones _requerides"
 
-#: calendar/gui/e-itip-control.c:550
+#: calendar/gui/dialogs/meeting-page.c:891
 #, fuzzy
-msgid "Component successfully deleted."
-msgstr "Els fitxers de l'Evolution s'han instal╥lat amb Хxit."
+msgid "Sent By:"
+msgstr "Vist"
 
-#: calendar/gui/e-itip-control.c:694
+#: calendar/gui/dialogs/meeting-page.c:1442
 #, fuzzy
-msgid "I don't recognize this type of calendar component."
-msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
+msgid "_Delegate To..."
+msgstr "Suprimeix"
 
-#: calendar/gui/e-itip-control.c:780
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
 #, fuzzy
-msgid "Add to Calendar"
-msgstr "Sobre l'agenda"
+msgid "Attendee"
+msgstr "Tots els assistents"
 
-#: calendar/gui/e-itip-control.c:814
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
 #, fuzzy
-msgid " Accept "
-msgstr "set"
+msgid "Common Name"
+msgstr "Completat"
 
-#: calendar/gui/e-itip-control.c:815
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
 #, fuzzy
-msgid " Decline "
+msgid "Delegated From"
 msgstr "Suprimeix"
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
 #, fuzzy
-msgid " Tentative "
-msgstr "Tentatiu"
+msgid "Delegated To"
+msgstr "Suprimeix"
 
-#: calendar/gui/e-itip-control.c:860
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
 #, fuzzy
-msgid "Update Calendar"
-msgstr "_Obre una agenda"
+msgid "Language"
+msgstr "Busca"
 
-#: calendar/gui/e-itip-control.c:883
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
 #, fuzzy
-msgid "Cancel Meeting"
-msgstr "Cancel╥lat"
-
-#: calendar/gui/e-itip-control.glade.h:2
-#, fuzzy, no-c-format
-msgid "%P %%"
-msgstr "%A, %d de %B"
+msgid "Member"
+msgstr "desembre"
 
-#: calendar/gui/e-itip-control.glade.h:3
-msgid "--to--"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
 #, fuzzy
-msgid "Calendar Message"
-msgstr "Agenda"
+msgid "Role"
+msgstr "MРbil"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
 #, fuzzy
-msgid "Date:"
-msgstr "Data de venciment"
+msgid "Status"
+msgstr "_Estat:"
 
-#: calendar/gui/e-itip-control.glade.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
 #, fuzzy
-msgid "Loading calendar..."
-msgstr "Imprimeix l'agenda"
+msgid "Type"
+msgstr "Tipus:"
 
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-itip-control.glade.h:9
 #, fuzzy
 msgid "Organizer:"
 msgstr "OrganitzaciС:"
 
-#: calendar/gui/e-itip-control.glade.h:10
+#: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Server Message:"
-msgstr "Anomena i desa..."
+msgid "_Change Organizer"
+msgstr "OrganitzaciС:"
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Resum:"
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "_Invita a altres..."
 
-#: calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "OrganitzaciС:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a, %d de %b de %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:13
-#, fuzzy
-msgid "date-start"
-msgstr "Inici del dia:"
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr "el"
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-#, fuzzy
-msgid "Attendee"
-msgstr "Tots els assistents"
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "dia"
 
-#: calendar/gui/e-meeting-dialog.glade.h:3
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
-msgid "Attendee address"
-msgstr "Tots els assistents"
+msgid "on the"
+msgstr "mes"
 
-#: calendar/gui/e-meeting-dialog.glade.h:4
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
-msgid "Attendees: "
-msgstr "Tots els assistents"
+msgid "th"
+msgstr "4"
 
-#: calendar/gui/e-meeting-dialog.glade.h:5
+#: calendar/gui/dialogs/recurrence-page.c:1274
 #, fuzzy
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr "Cancel╥lat"
+msgid "occurrences"
+msgstr "aparicions"
 
-#: calendar/gui/e-meeting-dialog.glade.h:7
-#, fuzzy
-msgid "Chair"
-msgstr "Cotxe"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
+msgstr "RecurrХncia personalitzada"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Cada"
 
-#: calendar/gui/e-meeting-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "Excepcions"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
+msgstr "Sense recurrХncia"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 #, fuzzy
-msgid "Meeting Invitations"
-msgstr "Hora d'_inici de la reuniС:"
+msgid "Preview"
+msgstr "PrevisualitzaciС:"
 
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
+msgstr "Regla de recurrХncia"
 
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
+msgstr "RecurrХncia simple"
 
-#: calendar/gui/e-meeting-dialog.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 #, fuzzy
-msgid "Organizer: "
-msgstr "OrganitzaciС:"
+msgid "_Modify"
+msgstr "Modifica"
 
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "per a"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "per sempre"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "mes(os)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr "fins a"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "setmana(es)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
+msgstr "any(s)"
+
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:20
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "Data completa:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
 #, fuzzy
-msgid "Required Participant"
-msgstr "Persones _requerides"
+msgid "Delegated From:"
+msgstr "Suprimeix"
 
-#: calendar/gui/e-meeting-dialog.glade.h:21
+#: calendar/gui/dialogs/task-details-page.glade.h:5
 #, fuzzy
-msgid "Role"
-msgstr "MРbil"
+msgid "Delegated To:"
+msgstr "Suprimeix"
 
-#: calendar/gui/e-meeting-dialog.glade.h:22
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "Cap"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:33
-#: mail/message-list.c:1052
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
 #, fuzzy
-msgid "Status"
-msgstr "_Estat:"
+msgid "URL:"
+msgstr "URL:"
 
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
-msgid "All"
-msgstr ""
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "Tasca"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% comp_let:"
 
-#: calendar/gui/e-tasks.c:155
+#: calendar/gui/dialogs/task-page.glade.h:14
 #, fuzzy
-msgid "Category:"
-msgstr "categories"
+msgid "Progress"
+msgstr "En procИs"
 
-#: calendar/gui/e-tasks.c:298
-#, fuzzy, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "No s'ha pogut carregar l'agenda en `%s'"
+#: calendar/gui/dialogs/task-page.glade.h:16
+#, fuzzy
+msgid "Sta_rt Date:"
+msgstr "Data d'ini_ci:"
 
-#: calendar/gui/e-tasks.c:310
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "El mХtode necessari per carregar `%s' no estЮ suportat"
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
+msgstr "_Data de venciment:"
 
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
-msgid "%d %B"
-msgstr "%d %B"
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
+msgstr "_Prioritat:"
 
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-#, fuzzy
-msgid "New Appointment..."
-msgstr "Nova cita..."
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
+msgstr "_Estat:"
 
-#: calendar/gui/e-week-view.c:3314
-#, fuzzy
-msgid "Delete All Occurrences"
-msgstr "Suprimeix-ne totes les aparicions"
+#: calendar/gui/e-calendar-table.c:351
+#, c-format
+msgid "0%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Esdeveniment per a _tot el dia"
+#: calendar/gui/e-calendar-table.c:352
+#, c-format
+msgid "10%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:3
-#, fuzzy
-msgid "Appointment"
-msgstr "Cites:"
+#: calendar/gui/e-calendar-table.c:353
+#, c-format
+msgid "20%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "Temes fonamentals sobre les cites"
+#: calendar/gui/e-calendar-table.c:354
+#, c-format
+msgid "30%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "RecurrХncia personalitzada"
+#: calendar/gui/e-calendar-table.c:355
+#, c-format
+msgid "40%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Cada"
+#: calendar/gui/e-calendar-table.c:356
+#, c-format
+msgid "50%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Excepcions"
+#: calendar/gui/e-calendar-table.c:357
+#, c-format
+msgid "60%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Modifica"
+#: calendar/gui/e-calendar-table.c:358
+#, c-format
+msgid "70%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Sense recurrХncia"
+#: calendar/gui/e-calendar-table.c:359
+#, c-format
+msgid "80%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1579
-msgid "Play a sound"
+#: calendar/gui/e-calendar-table.c:360
+#, c-format
+msgid "90%"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:15
-#, fuzzy
-msgid "Preview"
-msgstr "PrevisualitzaciС:"
+#: calendar/gui/e-calendar-table.c:361
+#, c-format
+msgid "100%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "RecurrХncia"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+#, fuzzy
+msgid "_Open"
+msgstr "_Obre"
 
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Regla de recurrХncia"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+#, fuzzy
+msgid "C_ut"
+msgstr "Personalitzat"
 
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Recordatori"
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+#, fuzzy
+msgid "_Copy"
+msgstr "Copia"
 
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1588
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
 #, fuzzy
-msgid "Run a program"
-msgstr "_Executa el programa:"
+msgid "_Paste"
+msgstr "Enganxa"
 
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1585
+#: calendar/gui/e-calendar-table.c:861
 #, fuzzy
-msgid "Send an email"
-msgstr "S'estЮ recollint el correu des de %s"
+msgid "_Mark as Complete"
+msgstr "Marca com a completa"
 
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
-msgid "Settings..."
-msgstr "_ParЮmetres"
+msgid "_Delete this Task"
+msgstr "Suprimeix la tasca"
 
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1582
+#: calendar/gui/e-calendar-table.c:866
 #, fuzzy
-msgid "Show a dialog"
-msgstr "Mostra 1 dia"
+msgid "_Mark Tasks as Complete"
+msgstr "Marca com a completa"
 
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "RecurrХncia simple"
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
+msgstr "Suprimeix la tasca"
 
-#: calendar/gui/event-editor-dialog.glade.h:30
+#: calendar/gui/e-calendar-table.c:1137
 #, fuzzy
-msgid "_End time:"
-msgstr "Hora de _finalitzaciС:"
+msgid "Click here to add a task"
+msgstr "Feu clic aquМ per a la llibreta d'adreces"
 
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "Hora d'_inici:"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% comp_let:"
 
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "Data d'_inici:"
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Alarmes"
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:36
-msgid "after"
-msgstr "desprИs de"
+#: calendar/gui/e-calendar-table.etspec.h:4
+#, fuzzy
+msgid "Categories"
+msgstr "categories"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
-msgid "before"
-msgstr "abans de"
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+#, fuzzy
+msgid "Complete"
+msgstr "% comp_let:"
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "dia(es)"
+#: calendar/gui/e-calendar-table.etspec.h:7
+#, fuzzy
+msgid "Completion Date"
+msgstr "Completat"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "Data de venciment"
 
-#: calendar/gui/event-editor-dialog.glade.h:36
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
-msgid "end of appointment"
-msgstr "Recorda'm totes les cites"
+msgid "End Date"
+msgstr "Hora de _finalitzaciС:"
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "per a"
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "per sempre"
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Prioritat"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
+#: calendar/gui/e-calendar-table.etspec.h:12
 #, fuzzy
-msgid "hour(s)"
-msgstr "hores"
+msgid "Start Date"
+msgstr "Data d'ini_ci:"
 
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
+#: calendar/gui/e-calendar-table.etspec.h:14
 #, fuzzy
-msgid "minute(s)"
-msgstr "minuts"
+msgid "Summary"
+msgstr "R_esum"
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr "mes(os)"
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "Tasques"
 
-#: calendar/gui/event-editor-dialog.glade.h:42
+#: calendar/gui/e-calendar-table.etspec.h:16
 #, fuzzy
-msgid "start of appointment"
-msgstr "Edita una cita"
+msgid "Transparency"
+msgstr "Transparent"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "until"
-msgstr "fins a"
+#: calendar/gui/e-calendar-table.etspec.h:18
+#, fuzzy
+msgid "URL"
+msgstr "URL:"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "week(s)"
-msgstr "setmana(es)"
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i divisions de minut"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "year(s)"
-msgstr "any(s)"
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
+msgid "%A %d %B"
+msgstr "%A, %d de %B"
 
-#: calendar/gui/event-editor.c:373
-msgid "Edit Appointment"
-msgstr "Edita una cita"
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
+#: calendar/gui/e-week-view-main-item.c:348
+msgid "%d %b"
+msgstr "%d %b"
 
-#: calendar/gui/event-editor.c:451
-msgid "on"
-msgstr "el"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "am"
 
-#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
-msgid "day"
-msgstr "dia"
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "pm"
 
-#: calendar/gui/event-editor.c:603
+#: calendar/gui/e-day-view.c:3306
 #, fuzzy
-msgid "on the"
-msgstr "mes"
+msgid "New _Appointment"
+msgstr "Nova cita..."
 
-#: calendar/gui/event-editor.c:610
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
 #, fuzzy
-msgid "th"
-msgstr "4"
+msgid "New All Day _Event"
+msgstr "Esdeveniment per a _tot el dia"
 
-#: calendar/gui/event-editor.c:756
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
 #, fuzzy
-msgid "occurrences"
-msgstr "aparicions"
+msgid "Go to _Today"
+msgstr "VИs a avui"
 
-#: calendar/gui/event-editor.c:873
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
+msgstr "VИs a una data"
 
-#: calendar/gui/event-editor.c:1534
-#, fuzzy, c-format
-msgid " %d days"
-msgstr "dies"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
+msgstr "Suprimeix aquesta cita"
 
-#: calendar/gui/event-editor.c:1536
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
 #, fuzzy
-msgid " 1 day"
-msgstr "Mostra 1 dia"
+msgid "Make this Occurrence _Movable"
+msgstr "Fes aquesta cita movible"
 
-#: calendar/gui/event-editor.c:1539
-#, fuzzy, c-format
-msgid " %d weeks"
-msgstr "setmanes"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
+msgstr "Suprimeix-ne aquesta apariciС"
 
-#: calendar/gui/event-editor.c:1541
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
 #, fuzzy
-msgid " 1 week"
-msgstr "Mostra 1 setmana"
+msgid "Delete _All Occurrences"
+msgstr "Suprimeix-ne totes les aparicions"
 
-#: calendar/gui/event-editor.c:1544
-#, fuzzy, c-format
-msgid " %d hours"
-msgstr "hores"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1546
+#: calendar/gui/e-itip-control.c:697
 #, fuzzy
-msgid " 1 hour"
-msgstr "hora"
+msgid "This is a meeting request."
+msgstr "_Aquesta Иs l'adreГa de correu"
 
-#: calendar/gui/event-editor.c:1549
-#, fuzzy, c-format
-msgid " %d minutes"
-msgstr "minuts"
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1551
-#, fuzzy
-msgid " 1 minute"
-msgstr "10 minuts"
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1554
-#, fuzzy, c-format
-msgid " %d seconds"
-msgstr " segons"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1556
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 #, fuzzy
-msgid " 1 second"
-msgstr " segons"
+msgid "The message is not understandable."
+msgstr ""
+"Aquest missatge no tИ cap assumpte.\n"
+"Voleu que l'enviО igualment?"
+
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1603
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:834
+msgid "The message does not appear to be properly formed"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:989
 #, fuzzy
-msgid " before start of appointment"
-msgstr "Crea una nova cita"
+msgid "I couldn't update your calendar file!\n"
+msgstr "No s'ha pogut crear una agenda a `%s'"
 
-#: calendar/gui/event-editor.c:1605
+#: calendar/gui/e-itip-control.c:1015
 #, fuzzy
-msgid " after start of appointment"
-msgstr "Crea una nova cita"
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "No s'ha pogut crear una agenda a `%s'"
 
-#: calendar/gui/event-editor.c:1613
+#: calendar/gui/e-itip-control.glade.h:2
+#, fuzzy, no-c-format
+msgid "%P %%"
+msgstr "%A, %d de %B"
+
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:4
 #, fuzzy
-msgid " before end of appointment"
-msgstr "Recorda'm totes les cites"
+msgid "Calendar Message"
+msgstr "Agenda"
 
-#: calendar/gui/event-editor.c:1615
+#: calendar/gui/e-itip-control.glade.h:5
 #, fuzzy
-msgid " after end of appointment"
-msgstr "Crea una nova cita"
+msgid "Date:"
+msgstr "Data de venciment"
 
-#: calendar/gui/event-editor.c:3123 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%a, %d de %b de %Y"
+#: calendar/gui/e-itip-control.glade.h:7
+#, fuzzy
+msgid "Loading Calendar"
+msgstr "Imprimeix l'agenda"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
+#: calendar/gui/e-itip-control.glade.h:8
+#, fuzzy
+msgid "Loading calendar..."
+msgstr "Imprimeix l'agenda"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#: calendar/gui/e-itip-control.glade.h:10
 #, fuzzy
-msgid "Evolution calendar executive summary component."
+msgid "Server Message:"
+msgstr "Anomena i desa..."
+
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
 msgstr ""
-"No es pot inicialitzar el component de resum del correu de l'Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/e-itip-control.glade.h:13
 #, fuzzy
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Conducte de l'agenda de l'Evolution"
+msgid "date-start"
+msgstr "Inici del dia:"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
+msgid "All"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/e-tasks.c:252
 #, fuzzy
-msgid "Factory for the Calendar Summary component."
-msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
+msgid "Category:"
+msgstr "categories"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
+#: calendar/gui/e-tasks.c:403
+#, fuzzy, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "No s'ha pogut carregar l'agenda en `%s'"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the calendar iTip view control"
-msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
+#: calendar/gui/e-tasks.c:415
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr "El mХtode necessari per carregar `%s' no estЮ suportat"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
+msgid "%d %B"
+msgstr "%d %B"
+
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
 #, fuzzy
-msgid "Factory for the sample Calendar control"
-msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
+msgid "New _Appointment..."
+msgstr "Nova cita..."
 
-#: calendar/gui/gnome-cal.c:700
+#: calendar/gui/gnome-cal.c:999
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: calendar/gui/gnome-cal.c:711
+#: calendar/gui/gnome-cal.c:1010
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "El mХtode necessari per carregar `%s' no estЮ suportat"
@@ -3036,244 +3724,264 @@ msgstr "VИs a una data"
 
 #: calendar/gui/goto-dialog.glade.h:6
 #, fuzzy
-msgid "Go To Today"
-msgstr "VИs a avui"
-
-#: calendar/gui/goto-dialog.glade.h:7
-#, fuzzy
 msgid "January"
 msgstr "gener"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 #, fuzzy
 msgid "July"
 msgstr "juliol"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 #, fuzzy
 msgid "June"
 msgstr "juny"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 #, fuzzy
 msgid "March"
 msgstr "marГ"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 #, fuzzy
 msgid "May"
 msgstr "Dilluns"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 #, fuzzy
 msgid "November"
 msgstr "novembre"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 #, fuzzy
 msgid "October"
 msgstr "octubre"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 #, fuzzy
 msgid "September"
 msgstr "setembre"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "VИs a avui"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Dg"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Dl"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Dm"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "Dc"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Dj"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Dv"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "Ds"
 
-#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tasques"
 
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "Avui (%a, %d de %b de %Y)"
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1104
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Aquesta setmana (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Aquest mes (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Enguany (%Y)"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Imprimeix l'agenda"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1342
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:52
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "PrevisualitzaciС d'impressiС"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Imprimeix aquest element"
+
+#: calendar/gui/print.c:2398
+#, fuzzy
+msgid "Print Setup"
+msgstr "ConfiguraciС de la pЮgina:"
+
+#: calendar/gui/tasks-control.c:126
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "La URI que mostrarЮ l'agenda"
@@ -3311,92 +4019,111 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "DDDDDDD"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 #, fuzzy
 msgid "Signing is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:207
+#: camel/camel-cipher-context.c:211
 #, fuzzy
 msgid "Clearsigning is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:245
+#: camel/camel-cipher-context.c:251
 #, fuzzy
 msgid "Verifying is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:294
 #, fuzzy
 msgid "Encryption is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:326
+#: camel/camel-cipher-context.c:336
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 #, fuzzy
 msgid "Syncing folders"
 msgstr "S'estЮ sincronitzant \"%s\""
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "No es pot obrir la llibreta d'adreces"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 #, fuzzy
 msgid "Getting message %d (%d%%)"
 msgstr "S'estЮ escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, fuzzy, c-format
-msgid "Failed message %d"
+msgid "Failed on message %d"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 #, fuzzy
 msgid "Cannot open message"
 msgstr "No es pot recuperar el missatge: %s"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 #, fuzzy
 msgid "Syncing folder"
 msgstr "S'estЮ sincronitzant \"%s\""
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-#, fuzzy
-msgid "Complete"
-msgstr "% comp_let:"
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "S'estЮ escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "S'estЮ escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error en desar el fitxer: %s"
@@ -3432,14 +4159,33 @@ msgstr ""
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "No s'ha pogut crear el conducte: %s"
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "No es pot bifurcar %s: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "No s'ha pogut bifurcar: %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "No s'ha pogut crear el fitxer de blocatge per a %s: %s"
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3456,113 +4202,108 @@ msgstr ""
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "No s'ha pogut comprovar el fitxer de correu %s: %s"
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "No s'ha pogut obrir el fitxer de correu %s: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "No s'ha pogut obrir el fitxer temporal de correu %s: %s"
 
-#: camel/camel-movemail.c:199
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "No s'ha pogut comprovar el fitxer de blocatge per a %s: %s"
-
-#: camel/camel-movemail.c:245
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Error en llegir el fitxer de correu: %s"
-
-#: camel/camel-movemail.c:256
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Error en escriure el fitxer temporal de correu: %s"
-
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "No s'ha pogut emmagatzemar el correu en el fitxer temporal %s: %s"
 
-#: camel/camel-movemail.c:306
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "No s'ha pogut crear el conducte: %s"
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "No s'ha pogut bifurcar: %s"
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "El programa Movemail ha fallat: %s"
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Error desconegut)"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Error en llegir el fitxer de correu: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Error en escriure el fitxer temporal de correu: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, fuzzy, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Error en escriure el fitxer temporal de correu: %s"
 
-#: camel/camel-pgp-context.c:186
+#: camel/camel-pgp-context.c:193
 #, fuzzy, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Si us plau, introduОu la vostra contrasenya PGP/GPG."
 
-#: camel/camel-pgp-context.c:189
+#: camel/camel-pgp-context.c:196
 #, fuzzy, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Si us plau, introduОu la vostra contrasenya PGP/GPG."
 
-#: camel/camel-pgp-context.c:509
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
-#: camel/camel-pgp-context.c:1021 camel/camel-pgp-context.c:1235
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "No s'ha indicat cap contrasenya."
 
-#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
-#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1028
-#: camel/camel-pgp-context.c:1242
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "No s'ha pogut crear cap conducte a GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:681
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:871
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr ""
 
-#: camel/camel-pgp-context.c:888
+#: camel/camel-pgp-context.c:903
 #, fuzzy, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "No s'ha pogut crear el conducte: %s"
 
-#: camel/camel-pgp-context.c:1011
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr ""
 
-#: camel/camel-pgp-context.c:1037
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1227
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -3582,39 +4323,39 @@ msgid "Could not load %s: No initialization code in module."
 msgstr ""
 "No s'ha pogut carregar %s: el mРdul no contИ cap codi d'inicialitzaciС."
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "Servidor %s %s"
 
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "Servei %s per a %s en %s"
 
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
 #, fuzzy
 msgid "Connection cancelled"
 msgstr "Cancel╥lat"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "No s'ha pogut connectar a %s (port %d): %s"
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr "(ordinador central desconegut)"
 
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:264
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Obre l'agenda"
 
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:489
 #, fuzzy
 msgid "Server unexpectedly disconnected"
 msgstr "El servidor ha rebutjat el nom d'usuari"
@@ -3731,72 +4472,81 @@ msgid ""
 msgstr "No s'ha pogut crear el conducte: %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:417
+#: camel/providers/imap/camel-imap-store.c:440
 #, fuzzy
 msgid "Bad authentication response from server."
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
+msgstr ""
+
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 #, fuzzy
 msgid "This option will connect to the server using a simple password."
 msgstr ""
 "Aquesta opciС es connectarЮ al servidor IMAP mitjanГant una contrasenya de "
 "text net."
 
-#: camel/camel-search-private.c:110
+#: camel/camel-sasl-login.c:127
+#, fuzzy
+msgid "Unknown authentication state."
+msgstr "AutenticaciС:"
+
+#: camel/camel-search-private.c:111
 #, fuzzy, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Error en escriure a la bЗstia de correu temporal: %s"
 
-#: camel/camel-service.c:152
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "L'URL '%s' necessita un component de nom d'usuari"
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "L'URL '%s' necessita un component d'ordinador central"
 
-#: camel/camel-service.c:168
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "L'URL '%s' necessita un component de camМ"
 
-#: camel/camel-service.c:554
+#: camel/camel-service.c:548
 #, fuzzy, c-format
 msgid "Resolving: %s"
 msgstr "S'estЮ comprovant \"%s\""
 
-#: camel/camel-service.c:581
+#: camel/camel-service.c:575
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:606
+#: camel/camel-service.c:600
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:608
+#: camel/camel-service.c:602
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:57
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr "ProveОdor de correu de la carpeta virtual"
 
-#: camel/camel-session.c:59
+#: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
 msgstr "Per llegir correu com a consulta d'un altre joc de carpetes"
 
-#: camel/camel-session.c:274 camel/camel-session.c:364
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "No hi ha cap proveОdor disponible per al protocol `%s'"
 
-#: camel/camel-session.c:462
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3805,12 +4555,73 @@ msgstr ""
 "No s'ha pogut crear el directori %s:\n"
 "%s"
 
-#. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:994 mail/mail-ops.c:1001
-#: mail/mail-ops.c:1019 mail/mail-ops.c:1020
+#: camel/camel-smime-context.c:173
+#, fuzzy, c-format
+msgid "Please enter your password for %s"
+msgstr "Si us plau, introduОu la vostra contrasenya PGP/GPG."
+
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "Aquest fitxer no existeix."
+
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "Aquest fitxer no existeix."
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, fuzzy, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "No s'ha pogut enviar el nom d'usuari al servidor"
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
 #, fuzzy
-msgid "Trash"
-msgstr "Tasca"
+msgid "Failed to decode message."
+msgstr "Missatge de _correu (FIXME)"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
+#, fuzzy, c-format
+msgid ""
+"Issuer: %s\n"
+"Subject: %s"
+msgstr "Assumpte"
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
 
 #: camel/camel-url.c:289
 #, fuzzy, c-format
@@ -3819,69 +4630,96 @@ msgstr ""
 "No s'ha pogut obrir el fitxer `%s':\n"
 "%s"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/camel-vee-folder.c:545
+#: camel/camel-vee-folder.c:547
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/providers/imap/camel-imap-command.c:209
+#: camel/camel-vtrash-folder.c:109
+#, fuzzy
+msgid "You cannot copy messages from this trash folder."
+msgstr ""
+"NomИs podeu editar els missatges que s'hagin desat\n"
+"a la carpeta Esborranys."
+
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:217
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "L'ordre IMAP ha fallat: %s"
 
-#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Error desconegut"
-
-#: camel/providers/imap/camel-imap-command.c:272
+#: camel/providers/imap/camel-imap-command.c:390
 #, fuzzy
 msgid "Server response ended too soon."
 msgstr "La resposta del servidor IMAP no contenia la informaciС %s"
 
-#: camel/providers/imap/camel-imap-command.c:456
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "La resposta del servidor IMAP no contenia la informaciС %s"
 
-#: camel/providers/imap/camel-imap-command.c:490
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta D'acord inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:172
+#: camel/providers/imap/camel-imap-folder.c:192
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr "No s'ha pogut crear el directori %s: %s"
+
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "No s'ha pogut carregar el resum per a %s"
 
-#: camel/providers/imap/camel-imap-folder.c:351
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
+msgstr ""
+
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
 #, fuzzy
-msgid "Scanning IMAP folder"
-msgstr "S'estan escanejant les carpetes de \"%s\""
+msgid "Scanning for changed messages"
+msgstr "S'estan desant els canvis al missatge..."
 
-#: camel/providers/imap/camel-imap-folder.c:986
-#: camel/providers/imap/camel-imap-folder.c:1197
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 #, fuzzy
 msgid "This message is not currently available"
 msgstr ""
 "Aquest missatge no tИ cap assumpte.\n"
 "Voleu que l'enviО igualment?"
 
-#: camel/providers/imap/camel-imap-folder.c:1016
-#: camel/providers/imap/camel-imap-folder.c:1231
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "CРpia de missatges"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "No s'ha pogut trobar el cos del missatge en la resposta al FETCH."
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, fuzzy, c-format
+msgid "Could not open cache directory: %s"
+msgstr "No s'ha pogut crear el directori %s: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 #, fuzzy
 msgid "Checking for new mail"
 msgstr "Comprova si hi ha nou correu"
@@ -3891,7 +4729,7 @@ msgstr "Comprova si hi ha nou correu"
 msgid "Check for new messages in all folders"
 msgstr "Comprova si hi ha nou correu"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:484
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Carpetes"
 
@@ -3927,30 +4765,30 @@ msgstr ""
 "Aquesta opciС es connectarЮ al servidor IMAP mitjanГant una contrasenya de "
 "text net."
 
-#: camel/providers/imap/camel-imap-store.c:440
+#: camel/providers/imap/camel-imap-store.c:463
 #, fuzzy, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "No hi ha suport per al mecanisme d'autenticaciС sol╥licitat."
 
-#: camel/providers/imap/camel-imap-store.c:450
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "AutenticaciС:"
 
-#: camel/providers/imap/camel-imap-store.c:475
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sSi us plau, introduОu la contrasenya IMAP per a %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:490
-#: camel/providers/smtp/camel-smtp-transport.c:403
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3961,101 +4799,111 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:865
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, fuzzy, c-format
-msgid "%s is not a selectable folder"
-msgstr "Visualitza la carpeta seleccionada"
-
-#: camel/providers/imap/camel-imap-store.c:879
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "No s'ha pogut crear el directori %s: %s"
+msgid "No such folder %s"
+msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/imap/camel-imap-store.c:1382
-msgid "You must be working online to complete this operation"
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/local/camel-local-provider.c:40
 #, fuzzy
 msgid "MH-format mail directories"
 msgstr "Directoris de correu en format MH d'UNIX"
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 #, fuzzy
 msgid "For storing local mail in standard mbox format"
 msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 #, fuzzy
 msgid "For storing local mail in qmail maildir directories"
 msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-provider.c:70
+#, fuzzy
+msgid "Unix mbox spool-format mail files"
+msgstr "Fitxers de correu en format mbox d'UNIX"
+
+#: camel/providers/local/camel-local-provider.c:71
+#, fuzzy
+msgid "For storing local mail in standard Unix spool directories"
+msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
+
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:136
+#: camel/providers/local/camel-local-store.c:134
 #, fuzzy, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "`%s' no Иs un fitxer habitual."
 
-#: camel/providers/local/camel-local-store.c:144
-#: camel/providers/local/camel-local-store.c:160
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/local/camel-local-store.c:175
+#: camel/providers/local/camel-local-store.c:173
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fitxer de correu local %s"
 
-#: camel/providers/local/camel-local-store.c:241
+#: camel/providers/local/camel-local-store.c:237
 #, fuzzy, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:283
+#: camel/providers/local/camel-local-store.c:279
 #, fuzzy, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:293
+#: camel/providers/local/camel-local-store.c:289
 #, fuzzy, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
+msgid "Unable to add message to summary: unknown reason"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:176
 #, fuzzy, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "No es pot afegir cap missatge a la carpeta mh: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4064,19 +4912,20 @@ msgstr ""
 "No es pot recuperar el missatge: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 #, fuzzy
 msgid "No such message"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4086,14 +4935,14 @@ msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4103,29 +4952,44 @@ msgstr ""
 "No s'ha pogut crear la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, fuzzy, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' no Иs un directori."
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 #, fuzzy
 msgid "not a maildir directory"
 msgstr "Directori de correu local %s"
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"No s'ha pogut crear la carpeta `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
+#, fuzzy, c-format
+msgid "Cannot open maildir directory path: %s: %s"
+msgstr "No es pot obrir la bЗstia de correu temporal: %s"
+
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "No es pot obrir la bЗstia de correu temporal: %s"
@@ -4135,9 +4999,12 @@ msgstr "No es pot obrir la bЗstia de correu temporal: %s"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "No es pot afegir el missatge al fitxer mbox: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4146,11 +5013,13 @@ msgstr ""
 "No es pot recuperar el missatge: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -4195,86 +5064,103 @@ msgstr "La carpeta `%s' no Иs buida. No s'ha suprimit."
 
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 #, fuzzy
 msgid "Summarising folder"
 msgstr "S'estЮ sincronitzant \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, fuzzy, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
 
-#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, fuzzy, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:501
-#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "S'estЮ sincronitzant \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:506
-#: camel/providers/local/camel-mbox-summary.c:707
+#: camel/providers/local/camel-mbox-summary.c:507
+#: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, fuzzy, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:523
+#: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "No es pot obrir la bЗstia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:556
-#: camel/providers/local/camel-mbox-summary.c:745
-#: camel/providers/local/camel-mbox-summary.c:753
+#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:557
+#: camel/providers/local/camel-mbox-summary.c:746
+#: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 #, fuzzy
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "IncongruХncia del resum, s'estЮ interrompent la sincronitzaciС"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Error en escriure a la bЗstia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:616
+#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, fuzzy, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Error en escriure a la bЗstia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:634
-#: camel/providers/local/camel-mbox-summary.c:803
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "No s'ha pogut tancar la carpeta font %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:643
+#: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "No es pot tancar la carpeta temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:654
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, fuzzy, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "No es pot afegir cap missatge a la carpeta mh: %s"
@@ -4284,39 +5170,99 @@ msgstr "No es pot afegir cap missatge a la carpeta mh: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' no Иs un directori."
 
+#: camel/providers/local/camel-mh-summary.c:218
+#, fuzzy, c-format
+msgid "Cannot open MH directory path: %s: %s"
+msgstr "No es pot obrir la bЗstia de correu temporal: %s"
+
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "No es pot afegir el missatge al fitxer mbox: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "`%s' no Иs un fitxer habitual."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "La carpeta `%s' no existeix."
+
+#: camel/providers/local/camel-spool-store.c:176
+msgid "Spool stores do not have an inbox"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Fitxer de correu local %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+#, fuzzy
+msgid "Spool folders cannot be renamed"
+msgstr "Les carpetes Mbox no es poden imbricar."
+
+#: camel/providers/local/camel-spool-store.c:230
+#, fuzzy
+msgid "Spool folders cannot be deleted"
+msgstr "Les carpetes Mbox no es poden imbricar."
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "No s'ha pogut obrir el fitxer temporal de correu %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "No s'ha pogut tancar la carpeta font %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Si us plau, introduОu la contrasenya NNTP per a %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "El servidor ha rebutjat el nom d'usuari"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "No s'ha pogut enviar el nom d'usuari al servidor"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "El servidor ha rebutjat el nom d'usuari/la contrasenya"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "No s'ha trobat el missatge %s."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "No s'ha pogut aconseguir la llista de grups del servidor"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "No es pot carregar el fitxer de llista de grups per a %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
@@ -4329,17 +5275,17 @@ msgstr "NotМcies d'USENET"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "ProveОdor per llegir i publicar als grups de notМcies d'USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:226
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "No s'ha pogut obrir el directori per al servidor de notМcies: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:288
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "NotМcies d'USENET mitjanГant %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:295
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4347,8 +5293,8 @@ msgstr ""
 "Aquesta opciС us autentica al servidor NNTP mitjanГant una contrasenya en "
 "text net"
 
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "No es pot obrir o crear el fitxer .newsrc per a %s: %s"
@@ -4358,21 +5304,31 @@ msgstr "No es pot obrir o crear el fitxer .newsrc per a %s: %s"
 msgid "Retrieving POP summary"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:192
+#: camel/providers/pop3/camel-pop3-folder.c:155
+#, fuzzy, c-format
+msgid "Could not check POP server for new messages: %s"
+msgstr "No s'ha pogut connectar al servidor POP en %s."
+
+#: camel/providers/pop3/camel-pop3-folder.c:199
 msgid "Could not open folder: message listing was incomplete."
 msgstr "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:292
 #, c-format
 msgid "No message with uid %s"
 msgstr "No hi ha cap missatge amb l'uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:289
+#: camel/providers/pop3/camel-pop3-folder.c:296
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:307
+#: camel/providers/pop3/camel-pop3-folder.c:303
+#, fuzzy, c-format
+msgid "Could not fetch message: %s"
+msgstr "No s'ha pogut enviar el missatge: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:320
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "No s'ha pogut recuperar el missatge %s del servidor POP: %s"
@@ -4392,7 +5348,7 @@ msgstr "No suprimeixis els missatges del servidor"
 msgid "Delete after %s day(s)"
 msgstr "Suprimeix la tasca"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4430,22 +5386,27 @@ msgstr ""
 "AixР us connectarЮ al servidor POP i utilitzarЮ el Kerberos 4 per "
 "autenticar-vos-hi."
 
-#: camel/providers/pop3/camel-pop3-store.c:207
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "No se us ha pogut autenticar al servidor KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:319
+#: camel/providers/pop3/camel-pop3-store.c:215
+#, fuzzy, c-format
+msgid "Could not connect to server: %s"
+msgstr "No s'ha pogut connectar al servidor POP en %s."
+
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "No s'ha pogut connectar al servidor POP en %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:358
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sSi us plau, introduОu la contrasenya POP3 per a %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:377
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4454,12 +5415,12 @@ msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar el nom d'usuari: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:380
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr "(Desconegut)"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4467,7 +5428,7 @@ msgstr ""
 "No es pot connectar al servidor POP.\n"
 "No hi ha suport per al mecanisme d'autenticaciС sol╥licitat."
 
-#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4476,13 +5437,13 @@ msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar la contrasenya: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:483
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr "La carpeta `%s' no existeix."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4538,7 +5499,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Lliurament de correu mitjanГant el programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr ""
 
@@ -4549,132 +5510,132 @@ msgstr ""
 "Per al lliurament de correu mitjanГant la connexiС a un concentrador de "
 "correu utilitzant SMTP."
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 #, fuzzy
 msgid "Help message"
 msgstr "Mou el missatge"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 #, fuzzy
 msgid "Service ready"
 msgstr "Amaga"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "No s'ha indicat cap contrasenya."
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 #, fuzzy
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "No hi ha suport per al mecanisme d'autenticaciС sol╥licitat."
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "AutenticaciС:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 #, fuzzy
 msgid "Authentication required"
 msgstr "AutenticaciС:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "No hi ha suport per al mecanisme d'autenticaciС sol╥licitat."
 
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sSi us plau, introduОu la contrasenya IMAP per a %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4685,203 +5646,207 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:527
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, fuzzy, c-format
 msgid "SMTP server %s"
 msgstr "Servidor %s %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, fuzzy, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Lliurament de correu mitjanГant el programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:575
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#, fuzzy
+msgid "Sending message"
+msgstr "Envia aquest missatge"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:721
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:736
 #: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "AutenticaciС:"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:782
+#, fuzzy
+msgid "AUTH request failed."
+msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 #, fuzzy
 msgid "Bad authentication response from server.\n"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:824
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:843
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 "No s'ha pogut crear el conducte al sendmail: %s: no s'ha enviat el correu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:887
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, fuzzy, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, fuzzy, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "No s'ha pogut bifurcar el sendmail: %s: no s'ha enviat el correu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:952
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, fuzzy, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "El sendmail ha acabat amb el senyal %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 octet"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u octets"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "adjunciС"
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Adjunta un fitxer"
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "Elimina els elements seleccionats de la llista d'adjuncions"
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Afegeix una adjunciС..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "Adjunta un fitxer al missatge"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
-#, fuzzy
-msgid "Attachment"
-msgstr "adjunciС"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "Propietats de l'adjunciС"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Nom del fitxer:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-#, fuzzy
-msgid "Inline attachment"
-msgstr "adjunciС"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "Tipus de MIME:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-#, fuzzy
-msgid "Send as:"
-msgstr "Envia \"%s\""
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
+msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:321
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "Feu clic aquМ per a la llibreta d'adreces"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
+#: composer/e-msg-composer-hdrs.c:365
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Respon"
@@ -4889,31 +5854,31 @@ msgstr "Respon"
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Assumpte:"
 
-#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "Per a:"
 
-#: composer/e-msg-composer-hdrs.c:384
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "IntroduОu els destinataris del missatge"
 
-#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "нntroduОu les adreces que rebran una cРpia del missatge"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4921,41 +5886,96 @@ msgstr ""
 "introduОu les adreces que rebran una cРpia del missatge sense aparХixer a la "
 "llista de destinataris del missatge."
 
-#: composer/e-msg-composer.c:528
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Adjunta un fitxer"
+
+#: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
 "%s"
 msgstr ""
-"No s'ha pogut obrir el fitxer de signatura %s:\n"
+"No s'ha pogut obrir el fitxer %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:716
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr ""
+"Error en preparar-se per a %s:\n"
+"%s"
+
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Anomena i desa..."
 
-#: composer/e-msg-composer.c:727
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "S'estЮ movent"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: composer/e-msg-composer.c:819
+#: composer/e-msg-composer.c:997
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: composer/e-msg-composer.c:877 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
-msgstr "Evolution"
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Error en desar el fitxer: %s"
+
+#: composer/e-msg-composer.c:1055
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "No s'ha pogut recuperar el missatge %s del servidor POP: %s"
 
-#: composer/e-msg-composer.c:883
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
+
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
+
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr "Error en desar el fitxer: %s"
+
+#: composer/e-msg-composer.c:1173
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4965,53 +5985,35 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Obre un fitxer"
 
-#: composer/e-msg-composer.c:1034
-msgid "That file does not exist."
-msgstr "Aquest fitxer no existeix."
-
-#: composer/e-msg-composer.c:1044
-msgid "That is not a regular file."
-msgstr "Aquest fitxer no Иs habitual."
-
-#: composer/e-msg-composer.c:1054
-msgid "That file exists but is not readable."
-msgstr "Aquest fitxer existeix perР no es pot llegir."
-
-#: composer/e-msg-composer.c:1064
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Aquest fitxer sembla accessible perР n'ha fallat l'obertura(2)."
-
-#: composer/e-msg-composer.c:1086
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"El fitxer Иs molt gran (mИs de 100 kB).\n"
-"Segur que voleu inserir-lo?"
-
-#: composer/e-msg-composer.c:1107
-msgid "An error occurred while reading the file."
-msgstr "S'ha produОt un error en llegir el fitxer."
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "FIXME: Insereix el fitxer..."
 
-#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Redacta un missatge"
 
-#: composer/e-msg-composer.c:1829
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "No s'ha pogut crear la finestra del redactor."
 
-#: composer/evolution-composer.c:355
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:370
+#: composer/evolution-composer.c:374
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
@@ -5032,307 +6034,126 @@ msgid "calendar information"
 msgstr "Cap informaciС"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+#, fuzzy
+msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+#, fuzzy
+msgid "%H:%M:%S"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %d/%m/%Y"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:303
 #, fuzzy
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
+#: e-util/e-time-utils.c:312
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1257
-#: widgets/misc/e-dateedit.c:1316 widgets/misc/e-dateedit.c:1495
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-#, fuzzy
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S%n"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1260
-#: widgets/misc/e-dateedit.c:1319 widgets/misc/e-dateedit.c:1498
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-#, fuzzy
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p%n"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-#, fuzzy
-msgid "Evolution component for the executive summary."
-msgstr ""
-"No es pot inicialitzar el component de resum del correu de l'Evolution."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the Evolution executive summary component."
-msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
-
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "No es pot inicialitzar el component de correu de l'Evolution."
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "S'estЮ recollint el correu des de %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:75
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Tanca"
-
-#: executive-summary/component/e-summary-url.c:76
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Mou a la carpeta"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, fuzzy, c-format
-msgid "Move %s into the previous row"
-msgstr "VИs a l'element anterior"
-
-#: executive-summary/component/e-summary-url.c:79
-#, fuzzy, c-format
-msgid "Move %s into the next row"
-msgstr "VИs a l'element segЭent"
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "_Configura la carpeta"
-
-#: executive-summary/component/e-summary.c:924
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"No s'ha pogut obrir el fitxer %s:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:938
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "Error en llegir el fitxer de correu: %s"
-
-#: executive-summary/component/e-summary.c:956
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr ""
-
-#: executive-summary/component/main.c:62
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-#, fuzzy
-msgid "RDF Summary"
-msgstr "R_esum"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-#, fuzzy
-msgid "Factory for the test bonobo component."
-msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the test component."
-msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-#, fuzzy
-msgid "Error"
-msgstr "Cap error"
-
-#: executive-summary/test-service/rdf-summary.c:768
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:778
-msgid "Update now"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:788
-#, fuzzy
-msgid "Update every "
-msgstr "_Actualitza lliure/ocupat"
-
-#: executive-summary/test-service/rdf-summary.c:796
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "minuts"
-
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "any"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "anys"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "mes"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "mesos"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "setmana"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "setmanes"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "dies"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "hora"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "hores"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "minut"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "segon"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "segons"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -5342,7 +6163,7 @@ msgstr ""
 "sigui quina sigui, en quХ s'executi el filtre\n"
 "o s'obri la vfolder."
 
-#: filter/filter-datespec.c:298
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5350,7 +6171,7 @@ msgstr ""
 "La data del missatge es compararЮ amb l'hora\n"
 "que indiqueu aquМ."
 
-#: filter/filter-datespec.c:338
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5361,28 +6182,37 @@ msgstr ""
 "\"fa una setmana\", per exemple."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "l'hora actual"
 
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "una hora que indiqueu"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "una hora relativa a l'actual"
 
 #. The label
-#: filter/filter-datespec.c:432
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Compara-la amb"
 
-#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "ara"
 
-#: filter/filter-datespec.c:706
+#: filter/filter-datespec.c:575
+#, fuzzy
+msgid " ago"
+msgstr "fa"
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr "fa"
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<feu clic aquМ per seleccionar una data>"
 
@@ -5391,11 +6221,11 @@ msgid "Filter Rules"
 msgstr "Regles del filtre"
 
 #. and now for the action area
-#: filter/filter-filter.c:453
+#: filter/filter-filter.c:452
 msgid "Then"
 msgstr "Aleshores"
 
-#: filter/filter-filter.c:467
+#: filter/filter-filter.c:466
 msgid "Add action"
 msgstr "Afegeix una acciС"
 
@@ -5405,20 +6235,20 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Seleccioneu una carpeta"
 
-#: filter/filter-folder.c:247
+#: filter/filter-folder.c:250
 msgid "Enter folder URI"
 msgstr "IntroduОu l'URI de la carpeta"
 
-#: filter/filter-folder.c:293
+#: filter/filter-folder.c:296
 msgid "<click here to select a folder>"
 msgstr "<feu clic aquМ per seleccionar una carpeta>"
 
-#: filter/filter-input.c:194
+#: filter/filter-input.c:193
 #, fuzzy, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -5427,7 +6257,7 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: filter/filter-part.c:475
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr "Comprova"
 
@@ -5439,26 +6269,49 @@ msgstr "Nom de la regla: "
 msgid "Untitled"
 msgstr "Sense tМtol"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Executa les accions"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "si es compleixen tots els criteris"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "si es compleix qualsevol criteri"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "Afegeix un criteri"
 
+#: filter/filter-rule.c:771
+#, fuzzy
+msgid "incoming"
+msgstr ""
+"Entrant\n"
+"Sortint\n"
+
+#: filter/filter-rule.c:771
+#, fuzzy
+msgid "outgoing"
+msgstr "Agrupament"
+
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Afegeix"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Edita"
+
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Filtres d'ediciС"
@@ -5505,400 +6358,539 @@ msgstr ""
 msgid "with all local folders"
 msgstr "Crea una carpeta nova"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
+#: filter/libfilter-i18n.h:3
+#, fuzzy
+msgid "Assign Color"
 msgstr "Assigna un color"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Assigna una puntuaciС"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 #, fuzzy
 msgid "Attachments"
 msgstr "adjunciС"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "contИ"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copia a la carpeta"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Data de recepciС"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Data d'enviament"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 #, fuzzy
 msgid "Deleted"
 msgstr "Suprimeix"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "no contИ"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "no acaba amb "
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "no existeix"
+
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not sound like"
+msgstr "no acaba amb "
+
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
+msgstr "no comenГa per"
+
+#: filter/libfilter-i18n.h:18
 #, fuzzy
 msgid "Do Not Exist"
 msgstr "no existeix"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:19
 #, fuzzy
 msgid "Draft"
 msgstr "Data de venciment"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:20
+msgid "ends with"
+msgstr "acaba amb"
+
+#: filter/libfilter-i18n.h:21
 #, fuzzy
 msgid "Exist"
 msgstr "S_urt"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:22
+msgid "exists"
+msgstr "existeix"
+
+#: filter/libfilter-i18n.h:23
 msgid "Expression"
 msgstr "ExpressiС"
 
-#: filter/libfilter-i18n.h:14
-msgid "Forward to Address"
-msgstr "Reenvia-ho a l'adreГa"
-
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:24
 msgid "Important"
 msgstr ""
 
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "Is Not"
-msgstr "no Иs"
+#: filter/libfilter-i18n.h:25
+msgid "is"
+msgstr "Иs"
 
-#: filter/libfilter-i18n.h:17
-#, fuzzy
-msgid "Is"
-msgstr "Si"
+#: filter/libfilter-i18n.h:26
+msgid "is greater than"
+msgstr "Иs mИs gran que"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:27
+msgid "is less than"
+msgstr "Иs mИs petit que"
+
+#: filter/libfilter-i18n.h:28
+msgid "is not"
+msgstr "no Иs"
+
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "Mailing list"
 msgstr "Llista de correu %s"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Cos del missatge"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:31
 #, fuzzy
 msgid "Message Header"
 msgstr "Cos del missatge"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "S'ha rebut el missatge"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "S'ha enviat el missatge"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Mou a la carpeta"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:35
+msgid "on or after"
+msgstr "el o desprИs del"
+
+#: filter/libfilter-i18n.h:36
+msgid "on or before"
+msgstr "el o abans del"
+
+#: filter/libfilter-i18n.h:37
 #, fuzzy
 msgid "Read"
 msgstr "RЮdio"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Destinataris"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Replied to"
 msgstr "Respon a tots"
 
-#: filter/libfilter-i18n.h:28 filter/score-rule.c:203 filter/score-rule.c:205
-#: mail/message-list.c:1052
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "PuntuaciС"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Remitent"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:43
 #, fuzzy
 msgid "Set Status"
 msgstr "Estat de la connexiС"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Mida"
+
+#: filter/libfilter-i18n.h:45
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:46
 #, fuzzy
 msgid "Source Account"
 msgstr "contИ"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr "Especifiqueu la capГalera"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:48
+msgid "starts with"
+msgstr "comenГa per"
+
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Atura el processament"
 
-#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Assumpte"
 
-#: filter/libfilter-i18n.h:38
-msgid "contains"
-msgstr "contИ"
+#: filter/libfilter-i18n.h:52
+msgid "was after"
+msgstr "ha estat desprИs de"
 
-#: filter/libfilter-i18n.h:39
-msgid "does not contain"
-msgstr "no contИ"
+#: filter/libfilter-i18n.h:53
+msgid "was before"
+msgstr "ha estat abans de"
 
-#: filter/libfilter-i18n.h:40
-msgid "does not end with"
-msgstr "no acaba amb "
+#: filter/rule-editor.c:147
+#, fuzzy
+msgid "Rules"
+msgstr "MРbil"
 
-#: filter/libfilter-i18n.h:41
-msgid "does not exist"
-msgstr "no existeix"
+#: filter/rule-editor.c:240
+msgid "Add Rule"
+msgstr "Afegeix una regla"
 
-#: filter/libfilter-i18n.h:42
+#: filter/rule-editor.c:299
 #, fuzzy
-msgid "does not sound like"
-msgstr "no acaba amb "
+msgid "Edit Rule"
+msgstr "Filtres d'ediciС"
 
-#: filter/libfilter-i18n.h:43
-msgid "does not start with"
-msgstr "no comenГa per"
+#: filter/score-editor.c:130
+#, fuzzy
+msgid "Score Rules"
+msgstr "Edita la regla de puntuaciС"
 
-#: filter/libfilter-i18n.h:44
-msgid "ends with"
-msgstr "acaba amb"
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
 
-#: filter/libfilter-i18n.h:45
-msgid "exists"
-msgstr "existeix"
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
+msgstr ""
 
-#: filter/libfilter-i18n.h:46
-msgid "is greater than"
-msgstr "Иs mИs gran que"
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "Mail"
+msgstr "_Correu"
 
-#: filter/libfilter-i18n.h:47
-msgid "is less than"
-msgstr "Иs mИs petit que"
+#: importers/elm-importer.c:498
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
 
-#: filter/libfilter-i18n.h:48
-msgid "is not"
-msgstr "no Иs"
+#: importers/elm-importer.c:527
+#, fuzzy
+msgid "Elm mail"
+msgstr "AdreГa electrРnica 2"
 
-#: filter/libfilter-i18n.h:49
-msgid "is"
-msgstr "Иs"
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "Desa a la llibreta d'adreces"
 
-#: filter/libfilter-i18n.h:50
-msgid "on or after"
-msgstr "el o desprИs del"
+#: importers/evolution-gnomecard-importer.c:253
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
 
-#: filter/libfilter-i18n.h:51
-msgid "on or before"
-msgstr "el o abans del"
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "_ParЮmetres"
 
-#: filter/libfilter-i18n.h:52
-msgid "sounds like"
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: filter/libfilter-i18n.h:53
-msgid "starts with"
-msgstr "comenГa per"
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
 
-#: filter/libfilter-i18n.h:54
-msgid "was after"
-msgstr "ha estat desprИs de"
+#: importers/pine-importer.c:691
+#, fuzzy
+msgid "Pine mail"
+msgstr "AdreГa electrРnica principal"
 
-#: filter/libfilter-i18n.h:55
-msgid "was before"
-msgstr "ha estat abans de"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr ""
 
-#: filter/score-editor.c:130
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
 #, fuzzy
-msgid "Score Rules"
-msgstr "Edita la regla de puntuaciС"
+msgid "Evolution mail composer."
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/component-factory.c:329
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Evolution mail executive summary component."
+msgstr ""
+"No es pot inicialitzar el component de resum del correu de l'Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Evolution mail folder display component."
+msgstr ""
+"No es pot inicialitzar el component de resum del correu de l'Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Evolution mail folder factory component."
+msgstr ""
+"No es pot inicialitzar el component de resum del correu de l'Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution composer."
+msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution mail component."
+msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Mail Summary component."
+msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "ConfiguraciС del correu"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "Propietats..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Propietats de la llista de coses per fer"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr "No es pot registrar l'emmagatzemament amb l'intХrpret d'ordres"
 
-#: mail/folder-browser-factory.c:209
+#: mail/folder-browser-ui.c:254
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Propietats..."
 
-#: mail/folder-browser-factory.c:211 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
+#: mail/folder-browser-ui.c:256
 #, fuzzy
 msgid "Properties"
 msgstr "Propietats..."
 
-#: mail/folder-browser.c:225
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "No s'ha pogut crear el directori temporal: %s"
+
+#: mail/folder-browser.c:893
 #, fuzzy
 msgid "Store search as vFolder"
 msgstr "Seleccioneu una carpeta"
 
-#: mail/folder-browser.c:533
-msgid "VFolder on Subject"
+#: mail/folder-browser.c:1238
+#, fuzzy
+msgid "VFolder on _Subject"
 msgstr "VFolder sobre l'assumpte"
 
-#: mail/folder-browser.c:536
-msgid "VFolder on Sender"
-msgstr "VFolder sobre el remitent"
+#: mail/folder-browser.c:1241
+msgid "VFolder on Se_nder"
+msgstr "VFolder sobre el remite_nt"
 
-#: mail/folder-browser.c:539
-msgid "VFolder on Recipients"
-msgstr "VFolder sobre els destinataris"
+#: mail/folder-browser.c:1244
+msgid "VFolder on _Recipients"
+msgstr "VFolder sobre els destinata_ris"
 
-#: mail/folder-browser.c:542 mail/folder-browser.c:733
+#: mail/folder-browser.c:1247
 #, fuzzy
-msgid "VFolder on Mailing List"
+msgid "VFolder on Mailing _List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:548
-msgid "Filter on Subject"
+#: mail/folder-browser.c:1253
+#, fuzzy
+msgid "Filter on Sub_ject"
 msgstr "Filtre sobre l'assumpte"
 
-#: mail/folder-browser.c:551
-msgid "Filter on Sender"
+#: mail/folder-browser.c:1256
+#, fuzzy
+msgid "Filter on Sen_der"
 msgstr "Filtre sobre el remitent"
 
-#: mail/folder-browser.c:554
-msgid "Filter on Recipients"
+#: mail/folder-browser.c:1259
+#, fuzzy
+msgid "Filter on Re_cipients"
 msgstr "Filtre sobre els destinataris"
 
-#: mail/folder-browser.c:557 mail/folder-browser.c:732
-msgid "Filter on Mailing List"
+#: mail/folder-browser.c:1262
+#, fuzzy
+msgid "Filter on _Mailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:1273
 #, fuzzy
 msgid "Resend"
 msgstr "segon"
 
-#: mail/folder-browser.c:570
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 #, fuzzy
-msgid "Save As..."
+msgid "_Save As..."
 msgstr "Anomena i desa..."
 
-#: mail/folder-browser.c:577
-msgid "Reply to Sender"
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+msgid "_Print"
+msgstr "_Imprimeix"
+
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#, fuzzy
+msgid "_Reply to Sender"
 msgstr "Respon al remitent"
 
-#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:60
-msgid "Reply to All"
-msgstr "Respon a tots"
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "Respon a _tots"
 
-#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:24
-msgid "Forward"
-msgstr "Reenvia"
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+msgid "Reply to _All"
+msgstr "Respon a _tots"
 
-#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:26
-#, fuzzy
-msgid "Forward inline"
-msgstr "VИs endavant en el temps"
+#: mail/folder-browser.c:1288
+msgid "_Forward"
+msgstr "_Reenvia"
 
-#: mail/folder-browser.c:586
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 #, fuzzy
-msgid "Mark as Read"
+msgid "Mar_k as Read"
 msgstr "Mar_ca'l com a llegit"
 
-#: mail/folder-browser.c:588
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 #, fuzzy
-msgid "Mark as Unread"
+msgid "Mark as U_nread"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:593
+#: mail/folder-browser.c:1295
 #, fuzzy
-msgid "Move to Folder..."
-msgstr "Mou a la carpeta"
+msgid "Mark as _Important"
+msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:595
+#: mail/folder-browser.c:1297
 #, fuzzy
-msgid "Copy to Folder..."
-msgstr "Copia a la carpeta"
+msgid "Mark as Unim_portant"
+msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:81
+#: mail/folder-browser.c:1302
 #, fuzzy
-msgid "Undelete"
-msgstr "Suprimeix"
+msgid "_Move to Folder..."
+msgstr "_Mou a la carpeta"
+
+#: mail/folder-browser.c:1304
+#, fuzzy
+msgid "_Copy to Folder..."
+msgstr "_Copia a la carpeta"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+#, fuzzy
+msgid "_Undelete"
+msgstr "_Suprimeix"
+
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Desa a la llibreta d'adreces"
+
+#: mail/folder-browser.c:1318
 #, fuzzy
 msgid "Apply Filters"
 msgstr "_Aplica els filtres"
 
-#: mail/folder-browser.c:613
-msgid "Create Rule From Message"
-msgstr ""
+#: mail/folder-browser.c:1322
+#, fuzzy
+msgid "Create Ru_le From Message"
+msgstr "Carpetes virtuals"
+
+#: mail/folder-browser.c:1479
+msgid "Filter on Mailing List"
+msgstr "Filtre sobre la llista de correu"
+
+#: mail/folder-browser.c:1480
+#, fuzzy
+msgid "VFolder on Mailing List"
+msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/folder-browser.c:736
+#: mail/folder-browser.c:1483
 #, fuzzy, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
-msgid "Evolution mail composer."
-msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+msgid "Factory to import mbox into Evolution"
+msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Evolution mail executive summary component."
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+msgid "Imports mbox files into Evolution"
 msgstr ""
-"No es pot inicialitzar el component de resum del correu de l'Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#, fuzzy
-msgid "Evolution mail folder display component."
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+msgid "Factory to import Outlook Express 4 mails into Evolution"
 msgstr ""
-"No es pot inicialitzar el component de resum del correu de l'Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#, fuzzy
-msgid "Evolution mail folder factory component."
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+msgid "Imports Outlook Express 4 files into Evolution"
 msgstr ""
-"No es pot inicialitzar el component de resum del correu de l'Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution composer."
-msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the Evolution mail component."
-msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-#, fuzzy
-msgid "Factory for the Mail Summary component."
-msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
 
 #: mail/local-config.glade.h:1
 #, fuzzy
@@ -5936,49 +6928,80 @@ msgstr ""
 msgid "mh"
 msgstr "h"
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+msgid "You have not filled in all of the required information."
+msgstr ""
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Conducte de les coses per fer de l'Evolution"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
+#, fuzzy
+msgid "Evolution Account Editor"
+msgstr "Conducte de les coses per fer de l'Evolution"
+
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "Fitxer de signatura:"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Aquest missatge no s'ha enviat.\n"
+"\n"
+"Voleu desar-ne els canvis?"
+
+#: mail/mail-accounts.c:135
 #, fuzzy
 msgid " (default)"
 msgstr "Valors predeterminats"
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 #, fuzzy
 msgid "Disable"
 msgstr "Inhabilitat"
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Suprimeix"
+
+#: mail/mail-accounts.c:271
+msgid "Really delete account?"
+msgstr ""
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 #, fuzzy
 msgid "Are you sure you want to delete this news account?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:536
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/mail-account-editor.c:105
-msgid "You have not filled in all of the required information."
-msgstr ""
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
-#, fuzzy
-msgid "Evolution Account Editor"
-msgstr "Conducte de les coses per fer de l'Evolution"
-
 #: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
@@ -5999,11 +7022,11 @@ msgstr "Correu de %s"
 msgid "%s mailing list"
 msgstr "Llista de correu %s"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
 msgid "Add Filter Rule"
 msgstr "Afegeix una regla de filtre"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -6015,7 +7038,7 @@ msgstr ""
 "rebre o redactar correu.\n"
 "El voleu configurar ara?"
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -6023,7 +7046,7 @@ msgstr ""
 "Cal que configureu una identitat\n"
 "abans de poder redactar correu."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -6031,11 +7054,11 @@ msgstr ""
 "Cal que configureu un transport de correu\n"
 "abans de poder redactar correu."
 
-#: mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr "No heu definit cap mХtode de transport de correu"
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6043,36 +7066,51 @@ msgstr ""
 "Aquest missatge no tИ cap assumpte.\n"
 "Voleu que l'enviО igualment?"
 
-#: mail/mail-callbacks.c:308
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr "Cal que indiqueu els destinataris per poder enviar aquest missatge."
 
-#: mail/mail-callbacks.c:351
+#: mail/mail-callbacks.c:410
 #, fuzzy
 msgid "You must configure an account before you can send this email."
 msgstr ""
 "Cal que configureu una identitat\n"
 "abans de poder redactar correu."
 
-#: mail/mail-callbacks.c:591
+#: mail/mail-callbacks.c:653
 #, c-format
-msgid "On %s, %s wrote:\n"
+msgid "On %s, %s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:773
+#: mail/mail-callbacks.c:914
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-callbacks.c:876
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-callbacks.c:878
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Copia el(s) missatge(s) a"
 
-#: mail/mail-callbacks.c:1019
+#: mail/mail-callbacks.c:1374
+#, fuzzy, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
+
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6080,7 +7118,7 @@ msgstr ""
 "NomИs podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: mail/mail-callbacks.c:1056
+#: mail/mail-callbacks.c:1430
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
@@ -6089,29 +7127,29 @@ msgstr ""
 "NomИs podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: mail/mail-callbacks.c:1089 mail/mail-display.c:90
-msgid "Overwrite file?"
-msgstr "Voleu sobreescriure el fitxer?"
-
-#: mail/mail-callbacks.c:1093 mail/mail-display.c:94
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
+#: mail/mail-callbacks.c:1442
+#, fuzzy, c-format
+msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
-"Ja existeix una fitxer amb aquest nom.\n"
-"El voleu sobreescriure?"
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
+
+#: mail/mail-callbacks.c:1463
+#, fuzzy
+msgid "No Message Selected"
+msgstr "S'ha rebut el missatge"
 
-#: mail/mail-callbacks.c:1137
+#: mail/mail-callbacks.c:1545
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:1139
+#: mail/mail-callbacks.c:1547
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:1253
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6120,15 +7158,62 @@ msgstr ""
 "Error en carregar la informaciС del filtre:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:51
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "_Filtres de correu ..."
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Imprimeix el missatge"
 
-#: mail/mail-callbacks.c:1349
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "Ha fallat la impressiС del missatge"
 
-#: mail/mail-config.c:1043 mail/mail-config.c:1046
+#: mail/mail-callbacks.c:1966
+#, fuzzy, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
+
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+
+#. set window title
+#: mail/mail-config-druid.c:466
+msgid "Evolution Account Wizard"
+msgstr ""
+
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "ConnexiС de prova a \"%s\""
@@ -6145,39 +7230,70 @@ msgstr "Colors"
 
 #: mail/mail-config.glade.h:3
 #, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
+
+#: mail/mail-config.glade.h:4
+#, fuzzy
 msgid "Account"
 msgstr "contИ"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "Account Information"
 msgstr "Cap informaciС"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Accounts"
 msgstr "contИ"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#, fuzzy
+msgid "Attachment"
+msgstr "adjunciС"
+
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Authentication"
 msgstr "AutenticaciС:"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Authentication Type: "
 msgstr "AutenticaciС:"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Automatically check for new mail every"
 msgstr "Comprova si hi ha nou correu"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "Redacta"
+
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -6190,391 +7306,551 @@ msgstr ""
 "Ja teniu enllestida la configuraciС del correu.\n"
 "Feu clic a \"Finalitza\" per desar els nous parЮmetres"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "De_fault"
 msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Done"
 msgstr "Cap"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid "Drafts"
 msgstr "Data de venciment"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Drafts folder:"
 msgstr "CreaciС d'una nova carpeta"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "Edita..."
+
+#: mail/mail-config.glade.h:36
 #, fuzzy
 msgid "Email Address:"
 msgstr "AdreГa electrРnica:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "Inhabilitat"
+
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Full Name:"
 msgstr "Nom complet:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
+msgstr ""
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "Fitxer de signatura:"
+
+#: mail/mail-config.glade.h:43
 #, fuzzy
-msgid "Highlight citations with "
+msgid "Highlight citations with"
 msgstr "Ressalta els elemts que vencen avui"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Identitat"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Inline"
+msgstr "Visualitza en lМnia"
+
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Kerberos "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "ConfiguraciС del correu"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Format"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:54
 #, fuzzy
-msgid "Mark messages as \"Read\" after:"
+msgid "Mark messages as Read after"
 msgstr "Marca el missatge com a vist [ms]: "
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "Servidor:"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "News"
 msgstr "Nou"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Optional Information"
 msgstr "Cap informaciС"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "OrganitzaciС:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "Agafa un color"
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Prompt when sending messages with an empty subject"
+msgstr "S'estЮ afegint un missatge sense cap assumpte"
+
+#: mail/mail-config.glade.h:73
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr ""
+
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "AdreГa electrРnica 2"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "Cap"
+
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Receiving Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Data de recepciС"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Required Information"
 msgstr "Cap informaciС"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "Secure MIME"
+msgstr "IMAPv4"
+
+#: mail/mail-config.glade.h:84
+msgid "Security"
+msgstr ""
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 #, fuzzy
 msgid "Send mail in HTML format by default."
 msgstr "Envia els missatges en format HTML"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Sending Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 #, fuzzy
 msgid "Sent"
 msgstr "Vist"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Agenda"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Server Configuration"
 msgstr "ConfiguraciС del correu"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Server Type: "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+msgid "Source"
+msgstr "Font"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Cap informaciС"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Fonts"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Special Folders"
 msgstr "Carpetes virtuals"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
-#, fuzzy
-msgid "Type"
-msgstr "Tipus:"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Nom d'usuari:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
-msgid "_Edit"
-msgstr "_Edita"
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "newswindow1"
+msgstr "finestra1"
 
-#: mail/mail-config-druid.c:99
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config-druid.c:101
-msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what kind of server you use, contact your system administrator or "
-"Internet Service Provider."
-msgstr ""
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr "segons."
 
-#: mail/mail-config-druid.c:105
-msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know which protocol you use, contact your system administrator or "
-"Internet Service Provider."
-msgstr ""
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "No s'ha pogut crear el quadre de diЮleg."
 
-#: mail/mail-config-druid.c:107
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
-msgstr ""
+#: mail/mail-crypto.c:86
+#, fuzzy
+msgid "Could not create a PGP verification context."
+msgstr "No s'ha pogut crear el quadre de diЮleg."
 
-#. set window title
-#: mail/mail-config-druid.c:445
-msgid "Evolution Account Wizard"
-msgstr ""
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr "No s'ha pogut crear el quadre de diЮleg."
+
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
+msgstr "No s'ha pogut crear el quadre de diЮleg."
 
-#: mail/mail-display.c:194
+#: mail/mail-crypto.c:177
+#, fuzzy
+msgid "Could not create a S/MIME signature context."
+msgstr "No s'ha pogut crear el quadre de diЮleg."
+
+#: mail/mail-crypto.c:209
+#, fuzzy
+msgid "Could not create a S/MIME certsonly context."
+msgstr "No s'ha pogut crear el quadre de diЮleg."
+
+#: mail/mail-crypto.c:240
+#, fuzzy
+msgid "Could not create a S/MIME encryption context."
+msgstr "No s'ha pogut crear el quadre de diЮleg."
+
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "No s'ha pogut crear el quadre de diЮleg."
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr "No s'ha pogut crear el quadre de diЮleg."
+
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Desa l'adjunciС"
 
-#: mail/mail-display.c:234
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "No s'ha pogut crear el directori temporal: %s"
-
-#: mail/mail-display.c:295
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Desa al disc..."
 
-#: mail/mail-display.c:297
-#, c-format
-msgid "Open in %s..."
-msgstr "Obre a %s..."
-
-#: mail/mail-display.c:299
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "Visualitza en lМnia"
 
-#: mail/mail-display.c:334
-msgid "External Viewer"
-msgstr "Visualitzador extern"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "Obre a %s..."
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Visualitza en lМnia (mitjanГant %s)"
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Amaga"
 
-#: mail/mail-display.c:1102
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "Visualitzador extern"
+
+#: mail/mail-display.c:1048
+#, fuzzy
+msgid "Loading message content"
+msgstr "S'estan reenviant els missatges \"%s\""
+
+#: mail/mail-display.c:1404
 #, fuzzy
-msgid "Open link in browser"
+msgid "Open Link in Browser"
 msgstr "Obre'l en una nova finestra"
 
-#: mail/mail-display.c:1104
+#: mail/mail-display.c:1406
 #, fuzzy
-msgid "Save as (FIXME)"
+msgid "Copy Link Location"
+msgstr "_Contacte (FIXME)"
+
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
 msgstr "_Tasca (FIXME)"
 
-#: mail/mail-display.c:1106
+#: mail/mail-display.c:1410
 #, fuzzy
-msgid "Copy location (FIXME)"
-msgstr "_Contacte (FIXME)"
+msgid "Save Image as..."
+msgstr "Anomena i desa..."
 
-#: mail/mail-format.c:518
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr " segons"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "adjunciС"
 
-#: mail/mail-format.c:560
+#: mail/mail-format.c:662
 #, fuzzy
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
 
-#: mail/mail-format.c:742
+#: mail/mail-format.c:746
 #, fuzzy
-msgid "Loading message content"
-msgstr "S'estan reenviant els missatges \"%s\""
+msgid "Date"
+msgstr "Data de venciment"
+
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "AdreГa electrРnica:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#, fuzzy
+msgid "From"
+msgstr "De:"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "Respon"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "Per a"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Cc:"
 
-#: mail/mail-format.c:1046
+#: mail/mail-format.c:1291
+#, fuzzy
+msgid "No GPG/PGP program configured."
+msgstr "No hi ha cap programa GPG/PGP disponible."
+
+#: mail/mail-format.c:1307
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "Esborra la visualitzaciС del missatge"
 
-#: mail/mail-format.c:1052
+#: mail/mail-format.c:1318
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Edita el missatge"
 
-#: mail/mail-format.c:1053
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1137 mail/mail-format.c:1526
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1145 mail/mail-format.c:1534
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1747
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1759
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1763
+#: mail/mail-format.c:2065
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/mail-format.c:1797
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Filtre sobre la llista de correu (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1802
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:337
-#, fuzzy, c-format
-msgid "No such folder %s"
-msgstr "La carpeta `%s' no existeix."
-
-#: mail/mail-local.c:509
+#: mail/mail-local.c:458
 #, fuzzy, c-format
 msgid "Opening '%s'"
 msgstr "Obre a %s..."
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "S'estЮ convertint la carpeta \"%s\" al format \"%s\""
 
-#: mail/mail-local.c:791
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Canvia la carpeta \"%s\" al format \"%s\""
-
-#: mail/mail-local.c:815
-#, fuzzy
-msgid "Reconfiguring folder"
-msgstr "_Configura la carpeta"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:844
-msgid "Closing current folder"
-msgstr "S'estЮ tancant la carpeta actual"
-
-#: mail/mail-local.c:876
-msgid "Renaming old folder and opening"
-msgstr "S'estЮ canviant el nom de la carpeta antiga i obrint-la"
-
-#: mail/mail-local.c:894
-msgid "Creating new folder"
-msgstr "CreaciС d'una nova carpeta"
-
-#: mail/mail-local.c:908
-msgid "Copying messages"
-msgstr "CРpia de missatges"
-
-#: mail/mail-local.c:925
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6583,7 +7859,7 @@ msgstr ""
 "No es pot desar la informaciС meta de la carpeta; probablement\n"
 "no la podreu tornar a obrir: %s"
 
-#: mail/mail-local.c:964
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6591,7 +7867,16 @@ msgstr ""
 "Si ja no podeu obrir aquesta bЗstia de correu\n"
 "potser us caldrЮ reparar-la manualment."
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+msgid "You cannot change the format of a non-local folder."
+msgstr ""
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "_Configura la carpeta"
+
+#: mail/mail-mt.c:187
 #, fuzzy, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6600,7 +7885,7 @@ msgstr ""
 "Error en `%s':\n"
 "%s"
 
-#: mail/mail-mt.c:192
+#: mail/mail-mt.c:190
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6609,46 +7894,32 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
+#: mail/mail-mt.c:794
 #, fuzzy
 msgid "Working"
 msgstr "S'estЮ movent"
 
-#: mail/mail-mt.c:679 mail/session.c:98
-msgid "Do you accept?"
-msgstr ""
-
-#: mail/mail-mt.c:873
-#, fuzzy
-msgid "Evolution progress"
-msgstr "Evolution"
-
-#: mail/mail-ops.c:587
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "S'estЮ enviant \"%s\""
 
-#: mail/mail-ops.c:589
-#, fuzzy
-msgid "Sending message"
-msgstr "Envia aquest missatge"
-
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:698
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "S'estЮ escrivint el missatge %d de %d"
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:717
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "S'estЮ marcant el missatge %d de %d"
 
-#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 #, fuzzy
 msgid "Complete."
 msgstr "% comp_let:"
 
-#: mail/mail-ops.c:811
+#: mail/mail-ops.c:805
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
@@ -6663,299 +7934,302 @@ msgstr "Mou el(s) missatge(s) cap a"
 msgid "Copying messages to %s"
 msgstr "CРpia de missatges"
 
-#: mail/mail-ops.c:900
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "S'estЮ movent"
 
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "S'estЮ copiant"
 
-#: mail/mail-ops.c:978
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1139
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#, fuzzy
+msgid "Trash"
+msgstr "Tasca"
+
+#: mail/mail-ops.c:1189
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1247
+#: mail/mail-ops.c:1297
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "_Configura la carpeta"
+
+#: mail/mail-ops.c:1604
 #, fuzzy
 msgid "Expunging folder"
 msgstr "S'estЮ esborrant \"%s\""
 
-#: mail/mail-ops.c:1483
+#: mail/mail-ops.c:1653
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1550
-#, fuzzy
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1560
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "S'estЮ recuperant el missatge nЗmero %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1634
-#, fuzzy
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "CРpia de missatges"
 
-#: mail/mail-ops.c:1713
+#: mail/mail-ops.c:1887
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: mail/mail-ops.c:1726
-#, fuzzy, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "S'estЮ recuperant el missatge %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1740
+#: mail/mail-ops.c:1913
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1987
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Desa l'adjunciС"
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:2003
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: mail/mail-ops.c:1857
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No s'han pogut escriure les dades: %s"
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-ops.c:2101
+#, fuzzy, c-format
+msgid "Disconnecting from %s"
+msgstr "S'estЮ recollint el correu des de %s"
+
+#: mail/mail-search.c:138
 #, fuzzy
-msgid "_Search"
+msgid "(Untitled Message)"
+msgstr "(Sense tМtol)"
+
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Mou el missatge"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "_Edita el missatge"
+
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "_Edita el missatge"
+
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-search.c:315
+#, fuzzy
+msgid "Search Forward"
+msgstr "Reenvia"
+
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
 msgstr "Cerca"
 
-#: mail/mail-send-recv.c:138
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "CamМ:"
+
+#: mail/mail-send-recv.c:141
 #, fuzzy
-msgid "Cancelling ..."
+msgid "Cancelling..."
 msgstr "Cancel╥lat"
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 #, fuzzy
 msgid "Send & Receive mail"
 msgstr "Sendmail"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 #, fuzzy
 msgid "Receiving"
 msgstr "Data de recepciС"
 
-#: mail/mail-send-recv.c:285
-msgid "Updating ..."
-msgstr ""
+#: mail/mail-send-recv.c:302
+#, fuzzy
+msgid "Updating..."
+msgstr "_ParЮmetres"
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
-msgid "Waiting ..."
-msgstr ""
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#, fuzzy
+msgid "Waiting..."
+msgstr "_ParЮmetres"
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 #, fuzzy
 msgid "Sending"
 msgstr "S'estЮ enviant \"%s\""
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 #, fuzzy
 msgid "Cancelled."
 msgstr "Cancel╥lat"
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
-msgstr "S'ha escrit un missatge incomplet al conducte!"
+#: mail/mail-session.c:171
+#, fuzzy
+msgid "User canceled operation."
+msgstr "Consulta cancel╥lada per l'usuari."
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "No s'ha pogut crear la mbox temporal `%s': %s"
 
-#: mail/mail-tools.c:188
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (missatge reenviat)"
-
-#: mail/mail-tools.c:198
-msgid "Fwd: (no subject)"
-msgstr "Re: (sense assumpte)"
-
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-tools.c:217
-msgid "Forwarded message (no subject)"
-msgstr "Missatge reenviat (sense assumpte)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Missatge reenviat - %s"
 
-#: mail/mail-tools.c:414
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Reenvia el missatge"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/mail-vfolder.c:427
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Nova VFolder"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:59
-msgid "Reply"
-msgstr "Respon"
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:65
-msgid "Reply to the sender of this message"
-msgstr "Respon al remitent d'aquest missatge"
-
-#: mail/mail-view.c:147 ui/evolution-mail.xml.h:63
-msgid "Reply to all recipients of this message"
-msgstr "Respon a tots els destinataris d'aquest missatge"
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:28
-msgid "Forward this message"
-msgstr "Reenvia aquest missatge"
-
-#: mail/mail-view.c:154 ui/evolution-mail.xml.h:56
-msgid "Print the selected message"
-msgstr "Imprimeix el missatge seleccionat"
-
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
-msgid "Delete this message"
-msgstr "Suprimeix aquest missatge"
-
-#: mail/message-list.c:648
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "No vist"
 
-#: mail/message-list.c:649
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "Vist"
 
-#: mail/message-list.c:650
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Respost"
 
-#: mail/message-list.c:651
+#: mail/message-list.c:616
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "No s'ha pogut enviar el missatge: %s"
 
-#: mail/message-list.c:652
+#: mail/message-list.c:617
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Mou el missatge"
 
-#: mail/message-list.c:656
+#: mail/message-list.c:621
 #, fuzzy
 msgid "Lowest"
 msgstr "Baixa"
 
-#: mail/message-list.c:657
+#: mail/message-list.c:622
 #, fuzzy
 msgid "Lower"
 msgstr "Baixa"
 
-#: mail/message-list.c:661
+#: mail/message-list.c:626
 #, fuzzy
 msgid "Higher"
 msgstr "Alta"
 
-#: mail/message-list.c:662
+#: mail/message-list.c:627
 #, fuzzy
 msgid "Highest"
 msgstr "Alta"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:884
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:940
+#: mail/message-list.c:905
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:913
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:915
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:1052
-msgid "Flagged"
-msgstr ""
-
-#: mail/message-list.c:1053
+#: mail/message-list.c:2290
 #, fuzzy
-msgid "From"
-msgstr "De:"
+msgid "Updating message list"
+msgstr "CРpia de missatges"
 
-#: mail/message-list.c:1053
-#, fuzzy
-msgid "Date"
-msgstr "Data de venciment"
+#: mail/message-list.etspec.h:2
+msgid "Flagged"
+msgstr ""
 
-#: mail/message-list.c:1053
+#: mail/message-list.etspec.h:4
 #, fuzzy
 msgid "Received"
 msgstr "Data de recepciС"
 
-#: mail/message-list.c:1054
-msgid "To"
-msgstr "Per a"
-
-#: mail/message-list.c:1054
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "Mida"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Folder"
 msgstr "Carpetes"
@@ -6986,138 +8260,1455 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 #, fuzzy
 msgid "Manage Subscriptions"
 msgstr "Gestiona les subscripcions..."
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
 #, fuzzy
-msgid "Folder name:"
-msgstr "Nom del fitxer:"
+msgid "Evolution component for the executive summary."
+msgstr ""
+"No es pot inicialitzar el component de resum del correu de l'Evolution."
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
 #, fuzzy
-msgid "Folder type:"
-msgstr "Carpetes"
+msgid "Factory for the Evolution executive summary component."
+msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#: my-evolution/component-factory.c:140
 #, fuzzy
-msgid "Specify where to create the folder:"
-msgstr "No hi ha espai suficient per crear la carpeta"
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+#, fuzzy
+msgid "Appointments"
+msgstr "Cites:"
 
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "Mostra les hores d'acabament de les cites"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%I:%M %p"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%I:%M %p"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Sense resum"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
 msgstr ""
 
-#: shell/importer/importer.c:341
-#, fuzzy, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr "No hi ha nou correu a %s."
+#: my-evolution/e-summary-preferences.c:869
+#, fuzzy
+msgid "Add a news feed"
+msgstr "Afegeix un servidor de notМcies"
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
 
-#: shell/importer/importer.c:351
+#: my-evolution/e-summary-preferences.c:1408
 #, fuzzy
-msgid "Importing"
-msgstr "S'estЮ movent"
+msgid "My Evolution Settings"
+msgstr "Instal╥laciС de l'Evolution"
 
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
 msgstr ""
 
-#: shell/importer/importer.c:372
-#, fuzzy, c-format
-msgid "Error starting %s"
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
 msgstr "Error en carregar el fitxer: %s"
 
-#: shell/importer/importer.c:387
-#, fuzzy, c-format
-msgid "Error loading %s"
-msgstr "Error en carregar el fitxer: %s"
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "Mostra les _adjuncions"
 
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: shell/importer/importer.c:473
+#: my-evolution/e-summary-weather.c:643
 #, fuzzy
-msgid "Automatic"
-msgstr "Tria automЮtica"
+msgid "Regions"
+msgstr "Seccions:"
 
-#: shell/importer/importer.c:523
+#: my-evolution/e-summary.c:145
 #, fuzzy
-msgid "Filename:"
-msgstr "Nom del fitxer:"
+msgid "%A, %d %B %Y"
+msgstr "%A, %d de %B de %Y"
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 #, fuzzy
-msgid "Select a file"
-msgstr "Fitxer de signatura:"
+msgid "Print My Evolution"
+msgstr "Evolution"
 
-#: shell/importer/importer.c:538
+#: my-evolution/e-summary.c:518
 #, fuzzy
-msgid "File type:"
-msgstr "Nom del fitxer:"
+msgid "Printing of My Evolution failed"
+msgstr "Ha fallat la impressiС del missatge"
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "Agenda"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
 msgstr ""
 
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
 msgstr ""
 
-#: shell/importer/import.glade.h:2
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
+
+#: my-evolution/metar.c:63
 #, fuzzy
-msgid "Evolution Import Utility"
-msgstr "Conducte de les coses per fer de l'Evolution"
+msgid "Variable"
+msgstr "Inhabilitat"
 
-#: shell/importer/import.glade.h:3
+#: my-evolution/metar.c:64
 #, fuzzy
-msgid "Evolution Importer Utility"
-msgstr "Conducte de les coses per fer de l'Evolution"
+msgid "North"
+msgstr "quart"
 
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "No_tes:"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "Зltim"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "Fonts"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "quart"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "Baixa"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Comprova"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "Baixa"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "Mostra"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "RЮdio"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Heavy rain"
+msgstr "Abast de dies"
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Drifting rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Freezing rain"
+msgstr ""
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "ara"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Moderate snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+#, fuzzy
+msgid "Snow grain showers"
+msgstr "Mostra en aquest ordre"
+
+#: my-evolution/metar.c:103
+msgid "Drifting snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "_Correu"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+#, fuzzy
+msgid "Light hail"
+msgstr "vuitХ"
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "Mostra 1 dia"
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "AdreГa electrРnica principal"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "Sendmail"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Shallow small hail"
+msgstr "Mostra"
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Showers of small hail"
+msgstr "Mostra"
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+msgid "Unknown precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "Error desconegut"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "Hora d'_inici de la reuniС:"
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "Иs"
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "Vertical"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Drifting mist"
+msgstr "Llista de correu %s"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
 msgstr ""
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "Suprimeix aquesta cita"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "PuntuaciС"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "Mostra les _adjuncions"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "Suprimeix aquesta cita"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "_Envia"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "CapГalera"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Light haze"
+msgstr "vuitХ"
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "dies"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "agost"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Raging tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Thunderous tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "Afegeix un servidor de notМcies"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Carpetes"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "Tots els assistents"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Visualitza les carpetes que continguin:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "Opcions de visualitzaciС"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "_VisualitzaciС"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "Divendres"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+#, fuzzy
+msgid "News Feeds"
+msgstr "Servidors de notМcies"
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "Dimecres"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "mes"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr "Mostra 1 setmana"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr "Seleccioneu una carpeta"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Mostra les _adjuncions"
+
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "Mostra en aquest ordre"
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "Mostra les _adjuncions"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "Tasques"
+
+#: my-evolution/my-evolution.glade.h:24
+msgid "Units: "
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Altres"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "ParЮmetres de prova"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "abril"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#, fuzzy
+msgid "The Evolution shell."
+msgstr "No es pot inicialitzat l'intХrpret d'ordres de l'Evolution."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "Detalls"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "Cancel╥lat"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Carpetes virtuals"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Instal╥laciС de l'Evolution"
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -7125,32 +9716,28 @@ msgstr ""
 "Aquesta nova versiС de l'Evolution necessita instal╥lar fitxers addicionals\n"
 "al directori personal on teniu l'Evolution"
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Si us plau, feu clic a \"D'acord\" per instal╥lar els fitxers, o a "
 "\"Cancel╥la\" per sortir."
 
-#: shell/e-setup.c:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "No s'han pogut actualitzar correctament els fitxers"
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr "Els fitxers de l'Evolution s'han instal╥lat amb Хxit."
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 #, fuzzy
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Sembla que aquesta Иs la primera vegada que executeu l'Evolution."
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Si us plau, feu clic a \"D'acord\" per instal╥lar els fitxers d'usuari\n"
 "de l''Evolution a"
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -7161,16 +9748,14 @@ msgstr ""
 "%s\n"
 "Error: %s"
 
-#: shell/e-setup.c:230
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"No es poden copiar els fitxers a\n"
+"An error occurred in copying files into\n"
 "`%s'."
+msgstr "S'ha produОt un error en llegir el fitxer."
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7181,7 +9766,16 @@ msgstr ""
 "Si us plau, moveu-lo per permetre la instal╥laciС\n"
 "dels fitxers d'usuari de l'Evolution."
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7192,7 +9786,60 @@ msgstr ""
 "de l'Evolution. Si us plau, moveu-lo per permetre\n"
 "la instal╥laciС dels fitxers d'usuari de l'Evolution."
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "No es pot bifurcar %s: %s"
+
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"No es poden copiar els fitxers a\n"
+"`%s'."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "Copia a la carpeta"
+
+#: shell/e-shell-folder-commands.c:313
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "Mou a la carpeta"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "Suprimeix la tasca"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -7201,15 +9848,15 @@ msgstr ""
 "No es pot crear la carpeta indicada:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "El nom de carpeta indicat no Иs vЮlid."
 
-#: shell/e-shell-folder-creation-dialog.c:248
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crea una nova carpeta"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -7217,28 +9864,123 @@ msgstr ""
 "El tipus de la carpeta seleccionada no Иs vЮlid per a\n"
 "l'operaciС sol╥licitada."
 
-#: shell/e-shell-folder-selection-dialog.c:319
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Nou..."
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Sense tМtol)"
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+
+#: shell/e-shell-importer.c:352
+#, fuzzy, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr "No hi ha nou correu a %s."
+
+#: shell/e-shell-importer.c:362
+#, fuzzy
+msgid "Importing"
+msgstr "S'estЮ movent"
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:383
+#, fuzzy, c-format
+msgid "Error starting %s"
+msgstr "Error en carregar el fitxer: %s"
+
+#: shell/e-shell-importer.c:402
+#, fuzzy, c-format
+msgid "Error loading %s"
+msgstr "Error en carregar el fitxer: %s"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/e-shell-importer.c:488
+#, fuzzy
+msgid "Automatic"
+msgstr "Tria automЮtica"
+
+#: shell/e-shell-importer.c:538
+#, fuzzy
+msgid "Filename:"
+msgstr "Nom del fitxer:"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a file"
+msgstr "Fitxer de signatura:"
+
+#: shell/e-shell-importer.c:553
+#, fuzzy
+msgid "File type:"
+msgstr "Nom del fitxer:"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "Seleccioneu una carpeta"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "No s'ha trobat el Bug Buddy en el vostre $PATH."
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "No es pot executar el Bug Buddy."
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 #, fuzzy
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -7248,30 +9990,72 @@ msgstr ""
 "per a correu, agenda i gestiС de contactes\n"
 "dins de l'entorn d'escriptori GNOME."
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "VИs a la carpeta..."
 
-#: shell/e-shell-view.c:148
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Crea un nou grup de dreceres"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
+msgstr "S'estЮ movent"
+
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+#, fuzzy
+msgid "Work Offline"
+msgstr "S'estЮ movent"
+
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr "(Cap carpeta mostrada)"
 
-#: shell/e-shell-view.c:1134
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1411
 #, fuzzy, c-format
 msgid "%s - Evolution %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1136
+#: shell/e-shell-view.c:1413
 #, fuzzy, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
 
-#: shell/e-shell.c:378
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "No es pot configurar l'emmagatzemament local -- %s"
 
-#: shell/e-shell.c:1248
+#: shell/e-shell.c:1311
 #, fuzzy, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -7280,15 +10064,15 @@ msgstr ""
 "Ep!  La visualitzaciС de `%s' s'ha mort inesperadament.  :-(\n"
 "AixР segurament vol dir que el component %s ha petat."
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Nom del grup:"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -7297,147 +10081,272 @@ msgstr ""
 "Esteu segur que voleu eliminar el grup\n"
 "`%s' de la barra de dreceres?"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "No l'eliminis"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "Elimina aquest grup de dreceres"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "Elimina aquest grup de dreceres"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "Icones _petites"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Mostra les dreceres com a icones petites"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "Icones _grans"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Mostra les dreceres com a icones grans"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_Nou grup..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "_Elimina aquest grup..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "_Elimina aquest grup..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "Elimina aquest grup de dreceres"
+
+#: shell/e-shortcuts-view.c:341
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "Mostra la barra de _dreceres"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "Mostra la barra de _dreceres"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "Activa"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "Elimina aquest grup de dreceres"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "Elimina aquest grup de dreceres"
+
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+#, fuzzy
+msgid "Open"
+msgstr "_Obre"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr "Obre'l en una nova finestra"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
-msgstr "Activa aquesta drecera"
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Envia aquest missatge"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "Nom de la regla: "
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Elimina aquesta drecera de la barra de dreceres"
 
-#: shell/e-shortcuts.c:379
+#: shell/e-shortcuts.c:585
 msgid "Error saving shortcuts."
 msgstr "Error en desar les dreceres."
 
-#: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
-msgid "_View"
-msgstr "_Visualitza"
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Mostra la barra de _dreceres"
 
-#: shell/e-storage-set-view.c:649
-msgid "View the selected folder"
-msgstr "Visualitza la carpeta seleccionada"
+#: shell/e-shortcuts.c:984
+msgid "Inbox"
+msgstr ""
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "_Contactes..."
 
-#: shell/e-storage.c:178
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Sense nom)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Cap error"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Error genХric"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "Ja existeix una carpeta amb el mateix nom"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "El tipus de carpeta especificat no Иs vЮlid"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "Error d'E/S"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "No hi ha espai suficient per crear la carpeta"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "No s'ha trobat la carpeta indicada"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "FunciС no implementada en aquest emmagatzemament"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "PermМs denegat"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "OperaciС no suportada"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
+
+#: shell/e-task-widget.c:173
 #, fuzzy
-msgid "The Evolution shell."
-msgstr "No es pot inicialitzat l'intХrpret d'ordres de l'Evolution."
+msgid "%s (%d%% complete)"
+msgstr "% comp_let:"
 
-#: shell/main.c:83
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "El cos contИ"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "Hores"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+msgid "Folder name:"
+msgstr "Nom del fitxer:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#, fuzzy
+msgid "Folder type:"
+msgstr "Carpetes"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Specify where to create the folder:"
+msgstr "No hi ha espai suficient per crear la carpeta"
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+
+#: shell/importer/import.glade.h:2
+#, fuzzy
+msgid "Evolution Import Utility"
+msgstr "Conducte de les coses per fer de l'Evolution"
+
+#: shell/importer/import.glade.h:3
+#, fuzzy
+msgid "Evolution Importer Utility"
+msgstr "Conducte de les coses per fer de l'Evolution"
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+
+#: shell/importer/intelligent.c:191
+#, fuzzy
+msgid "Importers"
+msgstr "S'estЮ movent"
+
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "No l'eliminis"
+
+#: shell/importer/intelligent.c:199
+#, fuzzy
+msgid "Don't ask me again"
+msgstr "Envia aquest missatge"
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
 #, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
@@ -7464,7 +10373,7 @@ msgstr ""
 "Esperem que gaudiu del resultat de la nostra feixuga feina, i esperem\n"
 "ansiosament les vostres contribucions!\n"
 
-#: shell/main.c:108
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7472,268 +10381,348 @@ msgstr ""
 "GrЮcies\n"
 "L'equip de l'Evolution\n"
 
-#: shell/main.c:139
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "No es pot inicialitzat l'intХrpret d'ordres de l'Evolution."
 
-#: shell/main.c:185
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:186
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:219
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "No es pot inicialitzar el sistema de components del Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Copia"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+#, fuzzy
+msgid "Copy the selection"
+msgstr "_Inverteix la selecciС"
+
+#: ui/evolution-addressbook.xml.h:4
 #, fuzzy
 msgid "Create new contact"
 msgstr "Crea un nou contacte"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Suprimeix un contacte"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "Crea un nou contacte"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Cerca"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+#, fuzzy
+msgid "Cut"
+msgstr "Personalitzat"
+
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#, fuzzy
+msgid "Cut the selection"
+msgstr "_Inverteix la selecciС"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Cerca un contacte"
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "Suprimeix un contacte"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "New contact"
 msgstr "Visualitza tots els contactes"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:49
-msgid "Previews the message to be printed"
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New list"
+msgstr "Nou"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Enganxa"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#, fuzzy
+msgid "Paste the clipboard"
+msgstr "Enganxa l'element del porta-retalls"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "Imprimeix els contactes"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:78
+#: ui/evolution-addressbook.xml.h:18
+#, fuzzy
+msgid "Select All"
+msgstr "Selecciona'ls _tots"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "Suprimeix un contacte"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Atura"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Atura la cЮrrega"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "Visualitza'ls tots"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "Visualitza tots els contactes"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "_Addressbook Sources..."
 msgstr "Afegeix una font"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 #, fuzzy
 msgid "_Contact"
 msgstr "_Contactes..."
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "_Contactes..."
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 #, fuzzy
 msgid "_Print..."
 msgstr "Imprimeix..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "_Cerca contactes"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:110
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:42
+#: ui/evolution-addressbook.xml.h:29
+#, fuzzy
+msgid "_Select All"
+msgstr "Selecciona'ls _tots"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_Eines"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 dies"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Modifica les preferХncies"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Create a new all day Event"
+msgid "Create a New All-Day _Event"
 msgstr "Crea una nova agenda"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Crea una nova cita"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Crea una nova agenda"
+msgid "Create a new appointment"
+msgstr "Crea una nova cita"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "Dia"
+#, fuzzy
+msgid "Create an event for the whole day"
+msgstr "Crea una nova cita per a avui"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Go To"
 msgstr "VИs a"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "VИs enrera en el temps"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "VИs endavant en el temps"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 #, fuzzy
 msgid "Go to _Date"
 msgstr "VИs a una data"
 
-#: ui/evolution-calendar.xml.h:12
-#, fuzzy
-msgid "Go to _Today"
-msgstr "VИs a avui"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "VИs a una data concreta"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "VИs al present"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "Mes"
-
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:16
 #, fuzzy
-msgid "New _Event"
-msgstr "Nova a_genda"
-
-#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "SegЭent"
-
-#: ui/evolution-calendar.xml.h:20
-#, fuzzy
-msgid "Open Calendar"
-msgstr "_Obre una agenda"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "Anterior"
+msgid "New Appointment"
+msgstr "Nova cita..."
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 #, fuzzy
 msgid "Previews the calendar to be printed"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 #, fuzzy
 msgid "Print calendar"
 msgstr "Imprimeix l'agenda"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "Print this Calendar"
 msgstr "Imprimeix aquest agenda"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
+#: ui/evolution-calendar.xml.h:22
 #, fuzzy
-msgid "Save As"
-msgstr "_Anomena i desa"
+msgid "Publish Free/Busy Information"
+msgstr "Cap informaciС"
 
-#: ui/evolution-calendar.xml.h:28
-#, fuzzy
-msgid "Save calendar as something else"
-msgstr "Deixa l'agenda com a alguna altra cosa"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Mostra 1 dia"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Mostra 1 mes"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Mostra 1 setmana"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Mostra la setmana de treball"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
-#: widgets/misc/e-dateedit.c:422
-msgid "Today"
-msgstr "Avui"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 #, fuzzy
 msgid "W_ork Week"
 msgstr "Setmana de treball"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "Setmana"
-
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 #, fuzzy
-msgid "_Appointment"
+msgid "_Appointment..."
 msgstr "Cites:"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "_ParЮmetres"
+
+#: ui/evolution-calendar.xml.h:32
 #, fuzzy
 msgid "_Day"
 msgstr "Dia"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 #, fuzzy
 msgid "_Month"
 msgstr "Mes"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
-msgid "_New"
-msgstr "_Nou"
+#: ui/evolution-calendar.xml.h:37
+#, fuzzy
+msgid "_Week"
+msgstr "Setmana"
 
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "_Obre una agenda"
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+#, fuzzy
+msgid "Close"
+msgstr "Tanca"
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:106
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-comp-editor.xml.h:3
 #, fuzzy
-msgid "_Save As..."
-msgstr "Anomena i desa..."
+msgid "Close this appointment"
+msgstr "Suprimeix aquesta cita"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "Suprimeix aquesta cita"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-comp-editor.xml.h:7
 #, fuzzy
-msgid "_Week"
-msgstr "Setmana"
+msgid "Preview the printed item"
+msgstr "Previsualitza el missatge que s'ha d'imprimir"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Print Pre_view"
+msgstr "PrevisualitzaciС d'impressiС"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "ConfiguraciС de la pЮgina:"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Imprimeix aquest element"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "Imprimeix..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "Desa i tanca"
+
+#: ui/evolution-comp-editor.xml.h:16
+#, fuzzy
+msgid "Save the appointment and close the dialog box"
+msgstr "Desa el contacte i tanca el quadre de diЮleg"
+
+#: ui/evolution-comp-editor.xml.h:17
+msgid "Save this item to disk"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "_Accions"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "_Fitxer"
 
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Suprimeix aquest element"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 #, fuzzy
 msgid "Delete..."
 msgstr "Suprimeix"
@@ -7748,28 +10737,13 @@ msgstr "_Ajuda"
 msgid "Print En_velope..."
 msgstr "Imprimeix el missatge..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Imprimeix aquest element"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:57 ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Imprimeix..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 #, fuzzy
 msgid "Save _As..."
 msgstr "Anomena i desa..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Desa i tanca"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Desa el contacte i tanca el quadre de diЮleg"
@@ -7787,1049 +10761,1056 @@ msgstr "Consulta l'ajuda en lМnia"
 msgid "Send _message to contact..."
 msgstr "FIXME: Nou _missatge per contactar"
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
-msgid "_File"
-msgstr "_Fitxer"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Desa"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:2
 #, fuzzy
-msgid "About this application"
-msgstr "AutenticaciС:"
+msgid "Delete this list"
+msgstr "Suprimeix aquest element"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:6
 #, fuzzy
-msgid "About..."
-msgstr "Lletra..."
+msgid "Save the list and close the dialog box"
+msgstr "Desa el contacte i tanca el quadre de diЮleg"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:7
 #, fuzzy
-msgid "Actio_ns"
-msgstr "_Accions"
+msgid "Se_nd list to other..."
+msgstr "_Invita a altres..."
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
-msgid "Address _Book... (FIXME)"
-msgstr "FIXME: _Llibreta d'adreces..."
+msgid "Send _message to list..."
+msgstr "FIXME: Nou _missatge per contactar"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
+#: ui/evolution-event-editor.xml.h:1
 #, fuzzy
-msgid "C_lear"
-msgstr "Agenda"
+msgid "Cancel Mee_ting"
+msgstr "Cancel╥lat"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-#, fuzzy
-msgid "C_ut"
-msgstr "Personalitzat"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+msgid "Cancel the meeting for this item"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Chec_k Names (FIXME)"
-msgstr "_Tasca (FIXME)"
+msgid "Forward as i_Calendar"
+msgstr "FIXME: Reenvia com a v_Calendar"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
 #, fuzzy
-msgid "Clear"
-msgstr "Agenda"
+msgid "Forward this item via email"
+msgstr "Reenvia aquest missatge"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:6
 #, fuzzy
-msgid "Clear the selection"
-msgstr "_Inverteix la selecciС"
+msgid "Re_fresh Meeting"
+msgstr "Refresca la llista"
 
-#: ui/evolution-event-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:7
 #, fuzzy
-msgid "Close this appointment"
-msgstr "Suprimeix aquesta cita"
+msgid "Schedule _Meeting"
+msgstr "Seleccioneu una carpeta"
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
 #, fuzzy
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "Copia a la carpeta"
+msgid "Schedule a meeting for this item"
+msgstr "Seleccioneu una carpeta"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Copia"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "_Accions"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
+#: ui/evolution-executive-summary.xml.h:1
 #, fuzzy
-msgid "Copy the selection"
-msgstr "_Inverteix la selecciС"
+msgid "Customise My Evolution"
+msgstr "Evolution - %s"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
+#: ui/evolution-mail-global.xml.h:1
 #, fuzzy
-msgid "Cut"
-msgstr "Personalitzat"
+msgid "Cancel"
+msgstr "Cancel╥lat"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
+#: ui/evolution-mail-global.xml.h:2
 #, fuzzy
-msgid "Cut the selection"
-msgstr "_Inverteix la selecciС"
+msgid "Cancel the current mail operation"
+msgstr "l'hora actual"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Suprimeix aquesta cita"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "Redacta"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr ""
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Redacta un nou missatge"
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-#, fuzzy
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "FIXME: Pr_imer element de la carpeta"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-#, fuzzy
-msgid "For_ward (FIXME)"
-msgstr "_Tasca (FIXME)"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:23
+#: ui/evolution-mail-global.xml.h:8
 #, fuzzy
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "FIXME: Reenvia com a v_Calendar"
+msgid "Empty _Trash"
+msgstr "Dies buits:"
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "VИs a l'element segЭent"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "Oblida les _contrasenyes"
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "VИs a l'element anterior"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
+#: ui/evolution-mail-global.xml.h:11
 #, fuzzy
-msgid "In_complete Task (FIXME)"
-msgstr "_Tasca (FIXME)"
+msgid "Manage _Subscriptions..."
+msgstr "Gestiona les subscripcions..."
+
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
+#: ui/evolution-mail-global.xml.h:13
 #, fuzzy
-msgid "Modify the file's properties"
-msgstr "Propietats de la llista de coses per fer"
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
+#: ui/evolution-mail-global.xml.h:14
 #, fuzzy
-msgid "N_ext"
-msgstr "SegЭent"
+msgid "Send / Receive"
+msgstr "Sendmail"
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Enganxa"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "Envia el correu de la cua i recupera'n el nou"
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-#, fuzzy
-msgid "Paste the clipboard"
-msgstr "Enganxa l'element del porta-retalls"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "Ant_erior"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
+#: ui/evolution-mail-global.xml.h:18
 #, fuzzy
-msgid "Previous"
-msgstr "Ant_erior"
+msgid "Virtual Folder _Editor..."
+msgstr "Editor de carpetes _virtuals..."
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
+#: ui/evolution-mail-global.xml.h:19
 #, fuzzy
-msgid "Print Pre_view"
-msgstr "PrevisualitzaciС d'impressiС"
+msgid "_Filters..."
+msgstr "_Filtres de correu ..."
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
+#: ui/evolution-mail-global.xml.h:20
 #, fuzzy
-msgid "Print S_etup..."
-msgstr "Imprimeix..."
+msgid "_Mail Message"
+msgstr "FIXME: Missatge de _correu"
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
+#: ui/evolution-mail-global.xml.h:21
 #, fuzzy
-msgid "Print Setup"
-msgstr "ConfiguraciС de la pЮgina:"
+msgid "_Mail Settings..."
+msgstr "_ParЮmetres"
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
-msgid "Save"
-msgstr "Desa"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "PrevisualitzaciС:"
 
-#: ui/evolution-event-editor.xml.h:43
+#: ui/evolution-mail-global.xml.h:23
 #, fuzzy
-msgid "Save the appointment and close the dialog box"
-msgstr "Desa el contacte i tanca el quadre de diЮleg"
+msgid "_Send / Receive"
+msgstr "Sendmail"
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:3
 #, fuzzy
-msgid "Save the current file"
-msgstr "l'hora actual"
+msgid "Copy selected messages"
+msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-event-editor.xml.h:46
+#: ui/evolution-mail-list.xml.h:5
 #, fuzzy
-msgid "Schedule _Meeting"
-msgstr "Seleccioneu una carpeta"
+msgid "Cut selected messages"
+msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr ""
+#: ui/evolution-mail-list.xml.h:6
+#, fuzzy
+msgid "Hide S_elected Messages"
+msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:68
-#: ui/evolution-task-editor-dialog.xml.h:57
+#: ui/evolution-mail-list.xml.h:7
 #, fuzzy
-msgid "Select All"
-msgstr "Selecciona'ls _tots"
+msgid "Hide _Deleted Messages"
+msgstr "Suprimeix el missatge"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
+#: ui/evolution-mail-list.xml.h:8
 #, fuzzy
-msgid "Select everything"
-msgstr "Seleccioneu una carpeta"
+msgid "Hide _Read Messages"
+msgstr "Missatge reenviat - %s"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
+#: ui/evolution-mail-list.xml.h:10
 #, fuzzy
-msgid "Task _Request (FIXME)"
-msgstr "_Tasca (FIXME)"
+msgid "Mark All as R_ead"
+msgstr "Mar_ca'l com a llegit"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
-msgid "_About..."
-msgstr "_Quant a l'Evolution..."
+msgid "Mark all visible messages as read"
+msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
+#: ui/evolution-mail-list.xml.h:13
 #, fuzzy
-msgid "_Close"
-msgstr "Tanca"
+msgid "Paste message in the clipboard"
+msgstr "Enganxa l'element del porta-retalls"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:28
-msgid "_Contact (FIXME)"
-msgstr "_Contacte (FIXME)"
+#: ui/evolution-mail-list.xml.h:14
+#, fuzzy
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Mou un missatge a una nova carpeta"
+
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "Selecciona'ls _tots"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
+#: ui/evolution-mail-list.xml.h:16
 #, fuzzy
-msgid "_Copy"
-msgstr "Copia"
+msgid "Select _Thread"
+msgstr "Selecciona'ls _tots"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
-msgid "_Help"
-msgstr "_Ajuda"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
+#: ui/evolution-mail-list.xml.h:19
 #, fuzzy
-msgid "_Item (FIXME)"
-msgstr "_Tasca (FIXME)"
+msgid "Select all visible messages"
+msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
+#: ui/evolution-mail-list.xml.h:20
 #, fuzzy
-msgid "_Journal Entry (FIXME)"
-msgstr "_Contacte (FIXME)"
+msgid "Show _All"
+msgstr "Mostra"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-#, fuzzy
-msgid "_Last Item in Folder (FIXME)"
-msgstr "FIXME: _зltim element de la carpeta"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
+#: ui/evolution-mail-list.xml.h:22
 #, fuzzy
-msgid "_Mail Message (FIXME)"
-msgstr "Missatge de _correu (FIXME)"
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
+#: ui/evolution-mail-list.xml.h:23
 #, fuzzy
-msgid "_Move to Folder... (FIXME)"
-msgstr "_Mou a la carpeta"
+msgid "Temporarily hide the selected messages"
+msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-#, fuzzy
-msgid "_Note (FIXME)"
-msgstr "_Contacte (FIXME)"
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "Llista de missatges en cadena"
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-#, fuzzy
-msgid "_Paste"
-msgstr "Enganxa"
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "_Esborra"
 
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "_Imprimeix"
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Carpeta"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:102
-#: ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_Inverteix la selecciС"
+
+#: ui/evolution-mail-list.xml.h:28
 #, fuzzy
 msgid "_Properties..."
 msgstr "Propietats..."
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
+#: ui/evolution-mail-list.xml.h:29
 #, fuzzy
-msgid "_Select All"
-msgstr "Selecciona'ls _tots"
-
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:41
-msgid "_Task (FIXME)"
-msgstr "_Tasca (FIXME)"
+msgid "_Threaded Message List"
+msgstr "Llista de missatges en cadena"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
+#: ui/evolution-mail-message.xml.h:1
 #, fuzzy
-msgid "_Unread Item (FIXME)"
-msgstr "_Contacte (FIXME)"
+msgid "Apply filter rules to the selected messages"
+msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-executive-summary.xml.h:1
+#: ui/evolution-mail-message.xml.h:2
 #, fuzzy
-msgid "Add Service"
-msgstr "Afegeix una font"
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "Respon a tots els destinataris d'aquest missatge"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:3
+#: ui/evolution-mail-message.xml.h:4
 #, fuzzy
-msgid "Create a new email"
-msgstr "Crea un nou contacte"
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Respon al remitent d'aquest missatge"
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr ""
+#: ui/evolution-mail-message.xml.h:6
+#, fuzzy
+msgid "Copy selected messages to another folder"
+msgstr "Copia el missatge a una nova carpeta"
 
-#: ui/evolution-executive-summary.xml.h:5
+#: ui/evolution-mail-message.xml.h:7
 #, fuzzy
-msgid "New Mail"
-msgstr "Recupera el correu"
+msgid "Create _Virtual Folder From Message"
+msgstr "Carpetes virtuals"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:3
-msgid "Change the properties of this folder"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:4
-msgid "Compose"
-msgstr "Redacta"
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
-msgstr "Redacta un nou missatge"
+#: ui/evolution-mail-message.xml.h:11
+#, fuzzy
+msgid "Create a rule to filter messages with this subject"
+msgstr "Envia un missatge sense assumpte"
 
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail-message.xml.h:12
 #, fuzzy
-msgid "Configure Folder..."
-msgstr "Mou a la carpeta"
+msgid "Create a virtual folder for these recipients"
+msgstr "Carpetes virtuals"
 
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
-msgstr "Copia el missatge a una nova carpeta"
+#: ui/evolution-mail-message.xml.h:13
+#, fuzzy
+msgid "Create a virtual folder for this mailing list"
+msgstr "Carpetes virtuals"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail-message.xml.h:14
 #, fuzzy
-msgid "Copy selected messages to another folder"
-msgstr "Copia el missatge a una nova carpeta"
+msgid "Create a virtual folder for this sender"
+msgstr "Carpetes virtuals"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail-message.xml.h:15
 #, fuzzy
-msgid "Create _Virtual Folder From Message"
+msgid "Create a virtual folder for this subject"
 msgstr "Carpetes virtuals"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail-message.xml.h:17
 #, fuzzy
-msgid "Delete the selected messages"
+msgid "Display the next important message"
+msgstr "Respon al remitent d'aquest missatge"
+
+#: ui/evolution-mail-message.xml.h:18
+#, fuzzy
+msgid "Display the next message"
+msgstr "l'hora actual"
+
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail-message.xml.h:21
 #, fuzzy
-msgid "Edit Message"
-msgstr "_Edita el missatge"
+msgid "Display the previous important message"
+msgstr "Carrega un missatge desat anteriorment"
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail-message.xml.h:22
 #, fuzzy
-msgid "Edit the current message"
-msgstr "l'hora actual"
+msgid "Display the previous message"
+msgstr "Voleu descartar aquest missatge?"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail-message.xml.h:23
 #, fuzzy
-msgid "Empty _Trash"
-msgstr "Dies buits:"
+msgid "Display the previous unread message"
+msgstr "Carrega un missatge desat anteriorment"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail-message.xml.h:24
 #, fuzzy
-msgid "Expunge"
-msgstr "_Esborra"
+msgid "Filter on Mailing _List..."
+msgstr "Filtre sobre la llista de correu"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail-message.xml.h:25
 #, fuzzy
-msgid "Filter on Se_nder"
+msgid "Filter on Se_nder..."
 msgstr "Filtre sobre el remitent"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail-message.xml.h:26
 #, fuzzy
-msgid "Filter on _Recipients"
+msgid "Filter on _Recipients..."
 msgstr "Filtre sobre els destinataris"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail-message.xml.h:27
 #, fuzzy
-msgid "Filter on _Subject"
+msgid "Filter on _Subject..."
 msgstr "Filtre sobre l'assumpte"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Finaly remove all mails tagged for deletion"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:23
-msgid "Forget _Passwords"
-msgstr "Oblida les _contrasenyes"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "Reenvia"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail-message.xml.h:30
 #, fuzzy
 msgid "Forward As"
 msgstr "Reenvia"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Forward the selected mail to someone"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail-message.xml.h:31
 #, fuzzy
-msgid "Forward this message in-line with your mail, so you can edit it"
-msgstr "Reenvia un missatge sense cap assumpte"
+msgid "Forward _Attached"
+msgstr "Reenvia"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail-message.xml.h:32
 #, fuzzy
-msgid "Full _Headers"
-msgstr "Cerca completa"
+msgid "Forward _Inline"
+msgstr "VИs endavant en el temps"
 
-#: ui/evolution-mail.xml.h:31
+#: ui/evolution-mail-message.xml.h:33
 #, fuzzy
-msgid "Hide Deleted Messages"
-msgstr "Suprimeix el missatge"
+msgid "Forward _Quoted"
+msgstr "Reenvia"
 
-#: ui/evolution-mail.xml.h:32
+#: ui/evolution-mail-message.xml.h:34
 #, fuzzy
-msgid "Hide S_elected Messages"
+msgid "Forward the selected message in the body of a new message"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail.xml.h:33
-#, fuzzy
-msgid "Hide _Deleted Messages"
-msgstr "Suprimeix el missatge"
-
-#: ui/evolution-mail.xml.h:34
-#, fuzzy
-msgid "Hide _Read messages"
-msgstr "Missatge reenviat - %s"
-
-#: ui/evolution-mail.xml.h:35
+#: ui/evolution-mail-message.xml.h:35
 #, fuzzy
-msgid "Invert Selection"
-msgstr "_Inverteix la selecciС"
+msgid "Forward the selected message quoted like a reply"
+msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail-message.xml.h:36
 #, fuzzy
-msgid "Manage _Subscriptions..."
-msgstr "Gestiona les subscripcions..."
+msgid "Forward the selected message to someone"
+msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail-message.xml.h:37
 #, fuzzy
-msgid "Mar_k as Read"
-msgstr "Mar_ca'l com a llegit"
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 #, fuzzy
-msgid "Mark All as R_ead"
-msgstr "Mar_ca'l com a llegit"
+msgid "Load _Images"
+msgstr "Missatge reenviat - %s"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail-message.xml.h:41
 #, fuzzy
-msgid "Mark As Read"
-msgstr "Mar_ca'l com a llegit"
-
-#: ui/evolution-mail.xml.h:40
-msgid "Mark As U_nread"
+msgid "Mark as I_mportant"
 msgstr "Marca'l com a per _llegir"
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 #, fuzzy
-msgid "Mark as U_nread"
+msgid "Mark as Unimp_ortant"
 msgstr "Marca'l com a per _llegir"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 #, fuzzy
 msgid "Mark the selected messages as having been read"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "Imprimeix el missatge seleccionat"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Imprimeix el missatge seleccionat"
+
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "Imprimeix el missatge seleccionat"
+
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Mou"
 
-#: ui/evolution-mail.xml.h:45
-msgid "Move message to a new folder"
-msgstr "Mou un missatge a una nova carpeta"
-
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Move selected messages to another folder"
 msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution-mail.xml.h:47
-msgid "Open in New Window"
-msgstr "Obre'l en una nova finestra"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "SegЭent"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Respon al remitent d'aquest missatge"
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail-message.xml.h:53
 #, fuzzy
-msgid "Open the current message in a new window"
+msgid "Next Message"
+msgstr "_Missatge"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Selecciona'ls _tots"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Mou el missatge"
+
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Open the selected message in a new window"
 msgstr "Envia aquest missatge"
 
-#: ui/evolution-mail.xml.h:53
-msgid "Print Preview of message..."
-msgstr "PrevisualitzaciС d'impressiС del missatge..."
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Open the selected message in the composer to re-send it"
+msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail.xml.h:54
-msgid "Print message to the printer"
-msgstr "Imprimeix el missatge a la impressora"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-mail.xml.h:55
-msgid "Print message..."
-msgstr "Imprimeix el missatge..."
+#: ui/evolution-mail-message.xml.h:59
+#, fuzzy
+msgid "Previous"
+msgstr "Ant_erior"
 
-#: ui/evolution-mail.xml.h:58
-msgid "Redirect (FIXME: implement me)"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Carrega un missatge desat anteriorment"
 
-#: ui/evolution-mail.xml.h:61
-msgid "Reply to _All"
-msgstr "Respon a _tots"
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Imprimeix el missatge"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
-msgid "Reply to all"
-msgstr "Respon a tots"
+msgid "Previous Unread Message"
+msgstr "Carrega un missatge desat anteriorment"
 
-#: ui/evolution-mail.xml.h:64
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
-msgid "Reply to sender"
-msgstr "Respon al remitent"
+msgid "Print Message..."
+msgstr "Imprimeix el missatge..."
 
-#: ui/evolution-mail.xml.h:66
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
-msgid "S_ource"
-msgstr "Font"
+msgid "Print Preview..."
+msgstr "PrevisualitzaciС d'impressiС"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
-msgid "Save the message into a new file"
-msgstr "Desa el missatge a una carpeta determinada"
+msgid "Print this message"
+msgstr "Imprimeix el missatge"
 
-#: ui/evolution-mail.xml.h:69 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Selecciona'ls _tots"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "Respon"
+
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "Respon a tots"
 
-#: ui/evolution-mail.xml.h:70
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
-msgid "Select _Thread"
-msgstr "Selecciona'ls _tots"
+msgid "S_earch Message"
+msgstr "Anomena i desa..."
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail-message.xml.h:72
 #, fuzzy
-msgid "Send / Receive"
-msgstr "Sendmail"
+msgid "Save the message as a text file"
+msgstr "Desa el missatge a una carpeta determinada"
 
-#: ui/evolution-mail.xml.h:72
-msgid "Send a reply to the person who sent you this mail"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:73
-msgid "Send a single mail in reply to all the selected mail"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:74
+#, fuzzy
+msgid "Show Email _Source"
+msgstr "Font del correu"
 
-#: ui/evolution-mail.xml.h:74
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
-msgstr "Envia el correu de la cua i recupera'n el nou"
+msgid "Show Full _Headers"
+msgstr "Cerca completa"
 
-#: ui/evolution-mail.xml.h:76
-msgid "Send queued mail and retrieve new mail"
-msgstr "Envia el correu de la cua i recupera'n el nou"
+#: ui/evolution-mail-message.xml.h:76
+#, fuzzy
+msgid "Show message in the normal style"
+msgstr "Envia els missatges en format HTML"
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
-msgid "Show _All"
-msgstr "Mostra"
+msgid "Show message with all email headers"
+msgstr "Comprova si hi ha nou correu"
 
-#: ui/evolution-mail.xml.h:79
-msgid "Threaded Message list"
-msgstr "Llista de missatges en cadena"
+#: ui/evolution-mail-message.xml.h:78
+#, fuzzy
+msgid "Show the raw email source of the message"
+msgstr "Adjunta un fitxer al missatge"
 
-#: ui/evolution-mail.xml.h:80
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail.xml.h:82
-msgid "VFolder on Se_nder"
+#: ui/evolution-mail-message.xml.h:80
+#, fuzzy
+msgid "VFolder on Mailing _List..."
+msgstr "Filtre sobre la llista de correu"
+
+#: ui/evolution-mail-message.xml.h:81
+#, fuzzy
+msgid "VFolder on Se_nder..."
 msgstr "VFolder sobre el remite_nt"
 
-#: ui/evolution-mail.xml.h:83
-msgid "VFolder on _Recipients"
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "VFolder on _Recipients..."
 msgstr "VFolder sobre els destinata_ris"
 
-#: ui/evolution-mail.xml.h:84
+#: ui/evolution-mail-message.xml.h:83
 #, fuzzy
-msgid "VFolder on _Subject"
+msgid "VFolder on _Subject..."
 msgstr "VFolder sobre l'assumpte"
 
-#: ui/evolution-mail.xml.h:85
-msgid "View Raw Message Source"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:86
-#, fuzzy
-msgid "Virtual Folder _Editor..."
-msgstr "Editor de carpetes _virtuals..."
-
-#: ui/evolution-mail.xml.h:87
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_Aplica els filtres"
 
-#: ui/evolution-mail.xml.h:88
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
-msgid "_Attachment"
-msgstr "adjunciС"
-
-#: ui/evolution-mail.xml.h:89
-#, fuzzy
-msgid "_Copy to Folder..."
-msgstr "_Copia a la carpeta"
+msgid "_Copy to Folder"
+msgstr "Copia a la carpeta"
 
-#: ui/evolution-mail.xml.h:90
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:92
-msgid "_Expunge"
-msgstr "_Esborra"
-
-#: ui/evolution-mail.xml.h:93
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
-msgid "_Filters..."
-msgstr "_Filtres de correu ..."
-
-#: ui/evolution-mail.xml.h:94 ui/evolution.xml.h:31
-msgid "_Folder"
-msgstr "_Carpeta"
+msgid "_Forward Message"
+msgstr "Reenvia el missatge"
 
-#: ui/evolution-mail.xml.h:95
-msgid "_Forward"
-msgstr "_Reenvia"
-
-#: ui/evolution-mail.xml.h:96
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
-msgid "_Inline"
-msgstr "Visualitza en lМnia"
-
-#: ui/evolution-mail.xml.h:97 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Inverteix la selecciС"
+msgid "_Message Display"
+msgstr "Esborra la visualitzaciС del missatge"
 
-#: ui/evolution-mail.xml.h:98
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
-msgid "_Mail Message"
-msgstr "FIXME: Missatge de _correu"
+msgid "_Move to Folder"
+msgstr "Mou a la carpeta"
 
-#: ui/evolution-mail.xml.h:99
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
-msgid "_Mail Settings..."
-msgstr "_ParЮmetres"
+msgid "_Normal Display"
+msgstr "_VisualitzaciС"
 
-#: ui/evolution-mail.xml.h:100
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
-msgid "_Move to Folder..."
-msgstr "_Mou a la carpeta"
+msgid "_Open Message"
+msgstr "_Edita el missatge"
 
-#: ui/evolution-mail.xml.h:101
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
-msgid "_Open Selected Items"
-msgstr "Obre la tasca"
+msgid "_Re-send Message"
+msgstr "_Edita el missatge"
 
-#: ui/evolution-mail.xml.h:103
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 #, fuzzy
-msgid "_Quoted"
-msgstr "Cap"
+msgid "Close this window"
+msgstr "Suprimeix aquesta cita"
 
-#: ui/evolution-mail.xml.h:104
-#, fuzzy
-msgid "_Reply"
-msgstr "Respon"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr ""
 
-#: ui/evolution-mail.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
 #, fuzzy
-msgid "_Resend Messages"
-msgstr "_Edita el missatge"
+msgid "Customize"
+msgstr "Cerca personalitzada"
 
-#: ui/evolution-mail.xml.h:107
-#, fuzzy
-msgid "_Save Message As..."
-msgstr "_Anomena i desa..."
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:108
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
 #, fuzzy
-msgid "_Send / Receive"
-msgstr "Sendmail"
-
-#: ui/evolution-mail.xml.h:109
-msgid "_Threaded"
-msgstr "_En cadena"
+msgid "_Close"
+msgstr "Tanca"
 
-#: ui/evolution-mail.xml.h:111
-#, fuzzy
-msgid "_Undelete"
-msgstr "_Suprimeix"
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "_Visualitza"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Adjunta"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 #, fuzzy
 msgid "Close the current file"
 msgstr "l'hora actual"
 
 #: ui/evolution-message-composer.xml.h:5
 #, fuzzy
+msgid "Delete all but signature"
+msgstr "Fitxer de signatura:"
+
+#: ui/evolution-message-composer.xml.h:6
+#, fuzzy
 msgid "Encrypt this message with PGP"
 msgstr "Edita el missatge"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "F_ormat"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "_Insereix el fitxer de text... (FIXME)"
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Insereix un fitxer com a text dins del missatge"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 #, fuzzy
 msgid "Insert text file..."
 msgstr "_Insereix el fitxer de text... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 #, fuzzy
 msgid "Open a file"
 msgstr "Obre un fitxer"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
+msgid "S/MIME Encrypt"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:18
-#, fuzzy
-msgid "Save in _folder... (FIXME)"
-msgstr "Desa a la _carpeta..."
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "Desa"
+
+#: ui/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "Save As"
+msgstr "_Anomena i desa"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
 msgid "Save in folder..."
 msgstr "Desa a la _carpeta..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+#, fuzzy
+msgid "Save the current file"
+msgstr "l'hora actual"
+
+#: ui/evolution-message-composer.xml.h:25
 #, fuzzy
 msgid "Save the current file with a different name"
 msgstr "l'hora actual"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Desa el missatge a una carpeta determinada"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 #, fuzzy
 msgid "Send"
 msgstr "_Envia"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
 msgid "Send _Later"
 msgstr "Remitent"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
 msgid "Send _later"
 msgstr "Remitent"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 #, fuzzy
 msgid "Send the mail in HTML format"
 msgstr "Envia els missatges en format HTML"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
 msgid "Send the message later"
 msgstr "Envia aquest missatge"
 
-#: ui/evolution-message-composer.xml.h:28
-#, fuzzy
-msgid "Send the message now"
-msgstr "Envia aquest missatge"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
 msgid "Send this message now"
 msgstr "Envia aquest missatge"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
 msgid "Show / hide attachments"
 msgstr "Mostra/amaga les adjuncions"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Mostra les _adjuncions"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 #, fuzzy
 msgid "Show attachments"
 msgstr "Mostra les _adjuncions"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
 msgid "Sign this message with your PGP key"
 msgstr "S'estЮ enviant el missatge sense cap asuumpte"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "S'estЮ enviant el missatge sense cap asuumpte"
+
+#: ui/evolution-message-composer.xml.h:38
 #, fuzzy
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Commuta la visualitzaciС o no de la barra de carpetes"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 #, fuzzy
 msgid "Toggles whether the CC field is displayed"
 msgstr "Commuta la visualitzaciС o no de la barra de carpetes"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 #, fuzzy
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Commuta la visualitzaciС o no de la barra de carpetes"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "adjunciС"
+
+#: ui/evolution-message-composer.xml.h:43
 #, fuzzy
 msgid "_Bcc Field"
 msgstr "Camps"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 #, fuzzy
 msgid "_Cc Field"
 msgstr "Camps"
 
-#: ui/evolution-message-composer.xml.h:45
-msgid "_From Field"
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:47
 #, fuzzy
+msgid "_Delete all"
+msgstr "_Suprimeix"
+
+#: ui/evolution-message-composer.xml.h:50
+msgid "_From Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
+#, fuzzy
 msgid "_Insert"
 msgstr "_мndex"
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
-msgstr "_Insereix el fitxer de text... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 #, fuzzy
 msgid "_Open..."
 msgstr "_Obre..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 #, fuzzy
 msgid "_Reply-To Field"
 msgstr "Respon"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr ""
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "_Ajuda"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Afegeix una carpeta a la llista de carpetes a quХ estic subscrit"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "C_arpeta"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Refresca la llista"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Refresca la llista de carpetes"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Elimina la carpeta de la llista de carpetes a quХ estic subscrit"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Subscriu-me"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Cancel╥la la subscripciС"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-#, fuzzy
-msgid "Assig_n Task (FIXME)"
-msgstr "_Tasca (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-#, fuzzy
-msgid "Meeting Re_quest (FIXME)"
-msgstr "FIXME: Pe_ticiС de cita"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-#, fuzzy
-msgid "Redo"
-msgstr "RЮdio"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-#, fuzzy
-msgid "Redo the undone action"
-msgstr "Elimina una acciС"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-#, fuzzy
-msgid "Replace"
-msgstr "Respon"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
+#: ui/evolution-task-editor.xml.h:1
 #, fuzzy
-msgid "Replace a string"
-msgstr "_Cerca contactes"
+msgid "Cancel Task"
+msgstr "Tasca"
 
-#: ui/evolution-task-editor-dialog.xml.h:47
+#: ui/evolution-task-editor.xml.h:3
 #, fuzzy
-msgid "Reply to A_ll (FIXME)"
-msgstr "Respon a tots"
+msgid "Delegate Task"
+msgstr "Suprimeix la tasca"
 
-#: ui/evolution-task-editor-dialog.xml.h:48
+#: ui/evolution-task-editor.xml.h:7
 #, fuzzy
-msgid "S_end Status Report (FIXME)"
-msgstr "_Contacte (FIXME)"
+msgid "Re_fresh Task"
+msgstr "Refresca la llista"
 
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:54
-#, fuzzy
-msgid "Save the task and close the dialog box"
-msgstr "Desa el contacte i tanca el quadre de diЮleg"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-#, fuzzy
-msgid "Search again for the same string"
-msgstr "_Cerca contactes"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-#, fuzzy
-msgid "Search for a string"
-msgstr "_Cerca contactes"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-#, fuzzy
-msgid "Undo"
-msgstr "_Envia"
-
-#: ui/evolution-task-editor-dialog.xml.h:62
+#: ui/evolution-tasks.xml.h:3
 #, fuzzy
-msgid "Undo the last action"
-msgstr "Elimina una acciС"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
-msgid "_Appointment (FIXME)"
-msgstr "_Cita (FIXME)"
+msgid "Copy selected task"
+msgstr "Obre la tasca"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
+#: ui/evolution-tasks.xml.h:4
 #, fuzzy
-msgid "_Mark Complete (FIXME)"
-msgstr "Marca com a completa"
+msgid "Create a new task"
+msgstr "Crea un nou contacte"
 
-#: ui/evolution-task-editor-dialog.xml.h:84
+#: ui/evolution-tasks.xml.h:5
 #, fuzzy
-msgid "_Reply (FIXME)"
-msgstr "_Tasca (FIXME)"
+msgid "Cut selected task"
+msgstr "Suprimeix la tasca"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
-msgid "Create a new task"
-msgstr "Crea un nou contacte"
+msgid "Delete selected tasks"
+msgstr "Suprimeix la tasca"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:8
 #, fuzzy
 msgid "New Task"
 msgstr "Tasca"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "Enganxa l'element del porta-retalls"
+
+#: ui/evolution-tasks.xml.h:12
 #, fuzzy
 msgid "Save task as something else"
 msgstr "Deixa l'agenda com a alguna altra cosa"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:13
 #, fuzzy
-msgid "Tasks Preferences..."
-msgstr "PreferХncies de l'agenda..."
+msgid "Tasks Settings"
+msgstr "_ParЮmetres"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 #, fuzzy
 msgid "_Task"
 msgstr "Tasca"
@@ -8839,249 +11820,372 @@ msgstr "Tasca"
 msgid "About Evolution..."
 msgstr "_Quant a l'Evolution..."
 
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:2
 #, fuzzy
-msgid "Close this window"
-msgstr "Suprimeix aquesta cita"
+msgid "Add to _Shortcut Bar"
+msgstr "Mostra la barra de _dreceres"
 
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
+#: ui/evolution.xml.h:3
+msgid "Change the name of this folder"
 msgstr ""
 
-#: ui/evolution.xml.h:5
-#, fuzzy
-msgid "Customize"
-msgstr "Cerca personalitzada"
-
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr ""
+#, fuzzy
+msgid "Copy this folder"
+msgstr "Copia a la carpeta"
 
 #: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "_Crea una carpeta nova..."
+
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "Elimina aquesta drecera de la barra de dreceres"
+
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "CreaciС d'una nova carpeta"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "Suprimeix aquest element"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Mostra una altra carpeta"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "S_urt"
 
-#: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
-msgstr "Barra de _dreceres de l'Evolution"
+#: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:17
+#, fuzzy
+msgid "Evolution _Window"
+msgstr "Evolution"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Surt del programa"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "Per _comenГar"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:13
-msgid "Main toolbar"
-msgstr ""
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Open in New _Window"
+msgstr "Obre'l en una nova finestra"
+
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Open this folder in an other window"
+msgstr "Envia aquest missatge"
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Mostra informaciС referent a l'Evolution"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:27
 #, fuzzy
 msgid "Submit Bug Report"
 msgstr "_Envia un informe d'error"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Submit _Bug Report"
 msgstr "_Envia un informe d'error"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:29
 #, fuzzy
 msgid "Submit bug report using Bug Buddy."
 msgstr "Envia un informe d'error mitjanГant el Bug Buddy"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:30
+#, fuzzy
+msgid "Toggle"
+msgstr "MРbil"
+
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Commuta la visualitzaciС o no de la barra de carpetes"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Commuta la visualitzaciС o no de la barra de dreceres"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "Toggle whether we are working offline."
+msgstr "Commuta la visualitzaciС o no de la barra de carpetes"
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "UtilitzaciС del gestor de c_ontactes"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "UtilitzaciС de l'_agenda"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "UtilitzaciС del _gestor de correu"
 
-#: ui/evolution.xml.h:23
-#, fuzzy
-msgid "Work Offline"
-msgstr "S'estЮ movent"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr "Visualitza la carpeta seleccionada"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "_Quant a l'Evolution..."
 
-#: ui/evolution.xml.h:25
-msgid "_Actions"
-msgstr "_Accions"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "_Cita (FIXME)"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "_Contacte (FIXME)"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "Copia"
+
+#: ui/evolution.xml.h:49
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_Carpeta"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_VИs a la carpeta..."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Import file..."
 msgstr "_Insereix el fitxer de text... (FIXME)"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "_мndex"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:54
 #, fuzzy
 msgid "_Mail message"
 msgstr "Missatge de _correu (FIXME)"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "Mou"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Nou"
+
+#: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_New Folder"
 msgstr "Nova VFolder"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Tanca..."
+
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "Mostra la barra de _dreceres"
+
+#: ui/evolution.xml.h:60
 #, fuzzy
 msgid "_Shortcut Bar"
 msgstr "Mostra la barra de _dreceres"
 
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "_Tasca (FIXME)"
+
+#: ui/evolution.xml.h:64
+#, fuzzy
+msgid "_Work Offline"
+msgstr "S'estЮ movent"
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "_ParЮmetres"
+
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "Address Cards"
+msgstr "AdreГa"
+
+#: views/addressbook/galview.xml.h:2
+#, fuzzy
+msgid "By Company"
+msgstr "Empresa"
+
+#: views/addressbook/galview.xml.h:3
+#, fuzzy
+msgid "Phone List"
+msgstr "Tipus de telХfon"
+
+#: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "By Sender"
+msgstr "Remitent"
+
+#: views/mail/galview.xml.h:2
+#, fuzzy
+msgid "By Status"
+msgstr "_Estat:"
+
+#: views/mail/galview.xml.h:3
+#, fuzzy
+msgid "By Subject"
+msgstr "Assumpte"
+
+#: views/mail/galview.xml.h:4
+#, fuzzy
+msgid "Messages"
+msgstr "_Missatge"
+
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With Category"
+msgstr "categories"
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
-msgid "Tentative"
-msgstr "Tentatiu"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Ocupat"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "Fora de l'oficina"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr "Cap informaciС"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr "_Invita a altres..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 msgid "_Options"
 msgstr "_Opcions"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
 msgstr "Mostra _nomИs les hores de treball"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr "Mostra-ho reduint el zoom"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
 msgstr "_Actualitza lliure/ocupat"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
 msgstr "Tria automЮtica"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
 msgstr "_Totes les persones i recursos"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr "Totes les persones i un recurs"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
 msgstr "Persones _requerides"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
 msgstr "Persones requerides i _un recurs"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 msgid "Meeting _start time:"
 msgstr "Hora d'_inici de la reuniС:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 msgid "Meeting _end time:"
 msgstr "Hora de _finalitzaciС de la reuniС:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
 msgstr "Tots els assistents"
 
-#: widgets/menus/gal-view-menus.c:177
+#: widgets/menus/gal-view-menus.c:218
 #, fuzzy
 msgid "_Current View"
 msgstr "l'hora actual"
 
-#: widgets/menus/gal-view-menus.c:196
+#: widgets/menus/gal-view-menus.c:259
 msgid "Define Views"
 msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "DDDDDDD"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Ara"
 
-#: widgets/misc/e-cell-date-edit.c:242
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Avui"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:723
+#: widgets/misc/e-cell-date-edit.c:731
 #, fuzzy, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -9089,23 +12193,110 @@ msgstr ""
 "\n"
 "%s"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "setmana"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "Tasca"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "Opcions"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+msgid "New"
+msgstr "Nou"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Error desconegut: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "Altres"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
+#: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Contacta l'editor"
+
+#: widgets/misc/e-filter-bar.c:173
 #, fuzzy
 msgid "Save Search"
 msgstr "Cerca"
 
-#: widgets/misc/e-filter-bar.c:237
+#: widgets/misc/e-filter-bar.c:241
 #, fuzzy
 msgid "Advanced Search"
 msgstr "Afegeix..."
 
-#: widgets/misc/e-filter-bar.c:317
+#: widgets/misc/e-filter-bar.h:102
+#, fuzzy
+msgid "Show All"
+msgstr "Mostra"
+
+#: widgets/misc/e-filter-bar.h:104
 #, fuzzy
-msgid "Advanced ..."
+msgid "Advanced..."
 msgstr "Afegeix..."
 
 #: widgets/misc/e-messagebox.c:152
@@ -9118,6 +12309,11 @@ msgstr "Cap informaciС"
 msgid "Warning"
 msgstr "S'estЮ movent"
 
+#: widgets/misc/e-messagebox.c:166
+#, fuzzy
+msgid "Error"
+msgstr "Cap error"
+
 #: widgets/misc/e-messagebox.c:173
 #, fuzzy
 msgid "Question"
@@ -9134,74 +12330,667 @@ msgstr "_Missatge"
 msgid "Don't show this message again."
 msgstr "Envia aquest missatge"
 
-#: widgets/misc/e-search-bar.c:148
+#: widgets/misc/e-search-bar.c:155
 #, fuzzy
 msgid "Sear_ch"
 msgstr "Cerca"
 
-#: views/addressbook/galview.xml.h:1
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 #, fuzzy
-msgid "Adress Cards"
-msgstr "AdreГa"
+msgid "The Personal Addressbook Server"
+msgstr "Afegeix una font"
 
-#: views/addressbook/galview.xml.h:2
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
+msgid "The Personal Calendar Server; calendar factory"
+msgstr ""
+
+#: wombat/wombat.c:173
 #, fuzzy
-msgid "By Company"
-msgstr "Empresa"
+msgid "setup_vfs(): could not initialize GNOME-VFS"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: views/addressbook/galview.xml.h:3
+#: wombat/wombat.c:185
 #, fuzzy
-msgid "Phone List"
-msgstr "Tipus de telХfon"
+msgid "init_corba(): could not initialize GNOME"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: views/mail/galview.xml.h:1
+#: wombat/wombat.c:198
 #, fuzzy
-msgid "By Sender"
-msgstr "Remitent"
+msgid "init_bonobo(): could not initialize Bonobo"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: views/mail/galview.xml.h:2
 #, fuzzy
-msgid "By Status"
-msgstr "_Estat:"
+#~ msgid "Set task view preferences"
+#~ msgstr "Modifica les preferХncies"
 
-#: views/mail/galview.xml.h:3
 #, fuzzy
-msgid "By Subject"
-msgstr "Assumpte"
+#~ msgid "TasksPreferences"
+#~ msgstr "PreferХncies de l'agenda..."
+
+#~ msgid "C_ontacts..."
+#~ msgstr "C_ontactes..."
+
+#~ msgid "_Company:"
+#~ msgstr "_Empresa:"
+
+#~ msgid "As _Minicards"
+#~ msgstr "Com a _Minicards"
+
+#~ msgid "As _Table"
+#~ msgstr "Com a _taula"
 
-#: views/mail/galview.xml.h:4
 #, fuzzy
-msgid "Messages"
-msgstr "_Missatge"
+#~ msgid ""
+#~ "We were unable to open this addressbook.  This either\n"
+#~ "means you have entered an incorrect URI, or have tried\n"
+#~ "to access an LDAP server and don't have LDAP support\n"
+#~ "compiled in.  If you've entered a URI, check the URI for\n"
+#~ "correctness and reenter.  If not, you probably have\n"
+#~ "attempted to access an LDAP server.  If you wish to be\n"
+#~ "able to use LDAP, you'll need to download and install\n"
+#~ "OpenLDAP and recompile and install Evolution.\n"
+#~ msgstr ""
+#~ "Ha estat impossible obrir aquesta llibreta d'adreces.\n"
+#~ "AixР pot ser perquХ, o bИ heu introduОt un URI incorrecte,\n"
+#~ "o bИ heu intentat accedir a un servidor LDAP sense tenir\n"
+#~ "compilat el suport per a LDAP. Si heu introduОt un URI,\n"
+#~ "comproveu que sigui correcte i torneu-lo a introduir. Altrament,\n"
+#~ "segurament heu intentat accedir a un servidor LDAP. Si\n"
+#~ "voleu poder utilitzar LDAP, necessitareu descarregar i instal╥lar\n"
+#~ "l'OpenLDAP i recompilar i instal╥lar l'Evolution.\n"
+
+#~ msgid "Find..."
+#~ msgstr "Cerca..."
+
+#~ msgid "Open calendar"
+#~ msgstr "Obre l'agenda"
+
+#~ msgid "Save calendar"
+#~ msgstr "Desa l'agenda"
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "Les alarmes es desactiven desprИs de"
+
+#~ msgid "Colors"
+#~ msgstr "Colors"
+
+#~ msgid "Enable snoozing for"
+#~ msgstr "Habilita l'snoozing per a"
+
+#~ msgid "Highlight"
+#~ msgstr "Ressalta"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "Elements que vencen avui:"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Elements que encara no han venГut"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Elements que encara no han venГut:"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "Elements que ja han venГut:"
+
+#~ msgid "TaskPad"
+#~ msgstr "TaskPad"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Temps fins al venciment"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Alarmes visuals"
+
+#~ msgid "Work week"
+#~ msgstr "Setmana de treball"
+
+#~ msgid "Edit Task"
+#~ msgstr "Edita la tasca"
 
-#: views/tasks/galview.xml.h:2
 #, fuzzy
-msgid "With Category"
-msgstr "categories"
+#~ msgid "Percent complete"
+#~ msgstr "Marca la tasca com a completa"
+
+#~ msgid "Mark the task complete"
+#~ msgstr "Marca la tasca com a completa"
 
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 #, fuzzy
-msgid "The Personal Addressbook Server"
-msgstr "Afegeix una font"
+#~ msgid "Edit this task..."
+#~ msgstr "Edita aquest element..."
 
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr ""
+#, fuzzy
+#~ msgid "Edit the task"
+#~ msgstr "Edita la tasca"
 
-#: wombat/wombat.c:173
 #, fuzzy
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "No s'ha pogut inicialitzar el Bonobo"
+#~ msgid "Go to Today"
+#~ msgstr "VИs a avui"
 
-#: wombat/wombat.c:185
 #, fuzzy
-msgid "init_corba(): could not initialize GNOME"
-msgstr "No s'ha pogut inicialitzar el Bonobo"
+#~ msgid "Delete all Occurrences"
+#~ msgstr "Suprimeix-ne totes les aparicions"
 
-#: wombat/wombat.c:198
 #, fuzzy
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "No s'ha pogut inicialitzar el Bonobo"
+#~ msgid "Component successfully updated."
+#~ msgstr "Els fitxers de l'Evolution s'han instal╥lat amb Хxit."
+
+#, fuzzy
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "No s'ha pogut crear una agenda a `%s'"
+
+#, fuzzy
+#~ msgid "Component successfully deleted."
+#~ msgstr "Els fitxers de l'Evolution s'han instal╥lat amb Хxit."
+
+#, fuzzy
+#~ msgid "I don't recognize this type of calendar component."
+#~ msgstr ""
+#~ "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
+
+#, fuzzy
+#~ msgid "Add to Calendar"
+#~ msgstr "Sobre l'agenda"
+
+#, fuzzy
+#~ msgid " Tentative "
+#~ msgstr "Tentatiu"
+
+#, fuzzy
+#~ msgid "Update Calendar"
+#~ msgstr "_Obre una agenda"
+
+#, fuzzy
+#~ msgid "Attendee address"
+#~ msgstr "Tots els assistents"
+
+#, fuzzy
+#~ msgid "Attendees: "
+#~ msgstr "Tots els assistents"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr "Cancel╥lat"
+
+#, fuzzy
+#~ msgid "Organizer: "
+#~ msgstr "OrganitzaciС:"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "Temes fonamentals sobre les cites"
+
+#~ msgid "_Starting date:"
+#~ msgstr "Data d'_inici:"
+
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "No s'ha pogut comprovar el fitxer de blocatge per a %s: %s"
+
+#, fuzzy
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#, fuzzy
+#~ msgid "%s is not a selectable folder"
+#~ msgstr "Visualitza la carpeta seleccionada"
+
+#, fuzzy
+#~ msgid "Inline attachment"
+#~ msgstr "adjunciС"
+
+#, fuzzy
+#~ msgid "Send as:"
+#~ msgstr "Envia \"%s\""
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No s'ha pogut obrir el fitxer de signatura %s:\n"
+#~ "%s"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "Aquest fitxer no Иs habitual."
+
+#~ msgid "That file exists but is not readable."
+#~ msgstr "Aquest fitxer existeix perР no es pot llegir."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "Aquest fitxer sembla accessible perР n'ha fallat l'obertura(2)."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "El fitxer Иs molt gran (mИs de 100 kB).\n"
+#~ "Segur que voleu inserir-lo?"
+
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr "%I:%M:%S %p%n"
+
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#, fuzzy
+#~ msgid "Send an email to %s"
+#~ msgstr "S'estЮ recollint el correu des de %s"
+
+#, fuzzy
+#~ msgid "Close %s"
+#~ msgstr "Tanca"
+
+#, fuzzy
+#~ msgid "Move %s to the left"
+#~ msgstr "Mou a la carpeta"
+
+#, fuzzy
+#~ msgid "Move %s into the previous row"
+#~ msgstr "VИs a l'element anterior"
+
+#, fuzzy
+#~ msgid "Move %s into the next row"
+#~ msgstr "VИs a l'element segЭent"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No s'ha pogut obrir el fitxer %s:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "R_esum"
+
+#, fuzzy
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr ""
+#~ "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
+
+#, fuzzy
+#~ msgid "Factory for the test component."
+#~ msgstr ""
+#~ "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Reenvia-ho a l'adreГa"
+
+#, fuzzy
+#~ msgid "Is Not"
+#~ msgstr "no Иs"
+
+#, fuzzy
+#~ msgid "Is"
+#~ msgstr "Si"
+
+#~ msgid "VFolder on Subject"
+#~ msgstr "VFolder sobre l'assumpte"
+
+#~ msgid "VFolder on Sender"
+#~ msgstr "VFolder sobre el remitent"
+
+#~ msgid "VFolder on Recipients"
+#~ msgstr "VFolder sobre els destinataris"
+
+#, fuzzy
+#~ msgid "Mark as Read"
+#~ msgstr "Mar_ca'l com a llegit"
+
+#, fuzzy
+#~ msgid "Move to Folder..."
+#~ msgstr "Mou a la carpeta"
+
+#, fuzzy
+#~ msgid "Copy to Folder..."
+#~ msgstr "Copia a la carpeta"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "Canvia la carpeta \"%s\" al format \"%s\""
+
+#~ msgid "Closing current folder"
+#~ msgstr "S'estЮ tancant la carpeta actual"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "S'estЮ canviant el nom de la carpeta antiga i obrint-la"
+
+#~ msgid "Copying messages"
+#~ msgstr "CРpia de missatges"
+
+#, fuzzy
+#~ msgid "Evolution progress"
+#~ msgstr "Evolution"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "S'estЮ recuperant el missatge nЗmero %d de %d (uid \"%s\")"
+
+#, fuzzy
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "S'estЮ recuperant el missatge %d de %d (uid \"%s\")"
+
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "S'ha escrit un missatge incomplet al conducte!"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (missatge reenviat)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Re: (sense assumpte)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Missatge reenviat (sense assumpte)"
+
+#~ msgid "Print the selected message"
+#~ msgstr "Imprimeix el missatge seleccionat"
+
+#~ msgid "Delete this message"
+#~ msgstr "Suprimeix aquest missatge"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Els fitxers de l'Evolution s'han instal╥lat amb Хxit."
+
+#~ msgid "Activate"
+#~ msgstr "Activa"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "Activa aquesta drecera"
+
+#~ msgid "Find a contact"
+#~ msgstr "Cerca un contacte"
+
+#~ msgid "View All"
+#~ msgstr "Visualitza'ls tots"
+
+#~ msgid "View all contacts"
+#~ msgstr "Visualitza tots els contactes"
+
+#~ msgid "5 Days"
+#~ msgstr "5 dies"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Crea una nova agenda"
+
+#~ msgid "Day"
+#~ msgstr "Dia"
+
+#, fuzzy
+#~ msgid "New _Event"
+#~ msgstr "Nova a_genda"
+
+#, fuzzy
+#~ msgid "Open Calendar"
+#~ msgstr "_Obre una agenda"
+
+#~ msgid "Prev"
+#~ msgstr "Anterior"
+
+#, fuzzy
+#~ msgid "Save calendar as something else"
+#~ msgstr "Deixa l'agenda com a alguna altra cosa"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Obre una agenda"
+
+#, fuzzy
+#~ msgid "About this application"
+#~ msgstr "AutenticaciС:"
+
+#, fuzzy
+#~ msgid "About..."
+#~ msgstr "Lletra..."
+
+#, fuzzy
+#~ msgid "Actio_ns"
+#~ msgstr "_Accions"
+
+#, fuzzy
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "FIXME: _Llibreta d'adreces..."
+
+#, fuzzy
+#~ msgid "C_lear"
+#~ msgstr "Agenda"
+
+#, fuzzy
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "_Tasca (FIXME)"
+
+#, fuzzy
+#~ msgid "Clear the selection"
+#~ msgstr "_Inverteix la selecciС"
+
+#, fuzzy
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "Copia a la carpeta"
+
+#, fuzzy
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "FIXME: Pr_imer element de la carpeta"
+
+#, fuzzy
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "_Tasca (FIXME)"
+
+#~ msgid "Go to the next item"
+#~ msgstr "VИs a l'element segЭent"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "VИs a l'element anterior"
+
+#, fuzzy
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "_Tasca (FIXME)"
+
+#, fuzzy
+#~ msgid "N_ext"
+#~ msgstr "SegЭent"
+
+#~ msgid "Pre_vious"
+#~ msgstr "Ant_erior"
+
+#, fuzzy
+#~ msgid "Print S_etup..."
+#~ msgstr "Imprimeix..."
+
+#, fuzzy
+#~ msgid "Select everything"
+#~ msgstr "Seleccioneu una carpeta"
+
+#, fuzzy
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "_Tasca (FIXME)"
+
+#, fuzzy
+#~ msgid "_About..."
+#~ msgstr "_Quant a l'Evolution..."
+
+#, fuzzy
+#~ msgid "_Item (FIXME)"
+#~ msgstr "_Tasca (FIXME)"
+
+#, fuzzy
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "_Contacte (FIXME)"
+
+#, fuzzy
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "FIXME: _зltim element de la carpeta"
+
+#, fuzzy
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "Missatge de _correu (FIXME)"
+
+#, fuzzy
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "_Mou a la carpeta"
+
+#, fuzzy
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_Contacte (FIXME)"
+
+#, fuzzy
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "_Contacte (FIXME)"
+
+#, fuzzy
+#~ msgid "Add Service"
+#~ msgstr "Afegeix una font"
+
+#, fuzzy
+#~ msgid "Create a new email"
+#~ msgstr "Crea un nou contacte"
+
+#, fuzzy
+#~ msgid "New Mail"
+#~ msgstr "Recupera el correu"
+
+#, fuzzy
+#~ msgid "Configure Folder..."
+#~ msgstr "Mou a la carpeta"
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Copia el missatge a una nova carpeta"
+
+#, fuzzy
+#~ msgid "Expunge"
+#~ msgstr "_Esborra"
+
+#, fuzzy
+#~ msgid "Forward this message in-line with your mail, so you can edit it"
+#~ msgstr "Reenvia un missatge sense cap assumpte"
+
+#, fuzzy
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "Suprimeix el missatge"
+
+#, fuzzy
+#~ msgid "Invert Selection"
+#~ msgstr "_Inverteix la selecciС"
+
+#, fuzzy
+#~ msgid "Mark As Read"
+#~ msgstr "Mar_ca'l com a llegit"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Marca'l com a per _llegir"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Mou un missatge a una nova carpeta"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "PrevisualitzaciС d'impressiС del missatge..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Imprimeix el missatge a la impressora"
+
+#, fuzzy
+#~ msgid "Reply to all"
+#~ msgstr "Respon a tots"
+
+#, fuzzy
+#~ msgid "Reply to sender"
+#~ msgstr "Respon al remitent"
+
+#, fuzzy
+#~ msgid "S_ource"
+#~ msgstr "Font"
+
+#, fuzzy
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr "Envia el correu de la cua i recupera'n el nou"
+
+#, fuzzy
+#~ msgid "_Reply"
+#~ msgstr "Respon"
+
+#, fuzzy
+#~ msgid "_Save Message As..."
+#~ msgstr "_Anomena i desa..."
+
+#~ msgid "_Threaded"
+#~ msgstr "_En cadena"
+
+#, fuzzy
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Desa a la _carpeta..."
+
+#, fuzzy
+#~ msgid "Send the message now"
+#~ msgstr "Envia aquest missatge"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_Insereix el fitxer de text... (FIXME)"
+
+#, fuzzy
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "_Tasca (FIXME)"
+
+#, fuzzy
+#~ msgid "Meeting Re_quest (FIXME)"
+#~ msgstr "FIXME: Pe_ticiС de cita"
+
+#, fuzzy
+#~ msgid "Redo"
+#~ msgstr "RЮdio"
+
+#, fuzzy
+#~ msgid "Redo the undone action"
+#~ msgstr "Elimina una acciС"
+
+#, fuzzy
+#~ msgid "Replace"
+#~ msgstr "Respon"
+
+#, fuzzy
+#~ msgid "Replace a string"
+#~ msgstr "_Cerca contactes"
+
+#, fuzzy
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "Respon a tots"
+
+#, fuzzy
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "_Contacte (FIXME)"
+
+#, fuzzy
+#~ msgid "Search again for the same string"
+#~ msgstr "_Cerca contactes"
+
+#, fuzzy
+#~ msgid "Search for a string"
+#~ msgstr "_Cerca contactes"
+
+#, fuzzy
+#~ msgid "Undo"
+#~ msgstr "_Envia"
+
+#, fuzzy
+#~ msgid "Undo the last action"
+#~ msgstr "Elimina una acciС"
+
+#, fuzzy
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "Marca com a completa"
+
+#, fuzzy
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "_Tasca (FIXME)"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Barra de _dreceres de l'Evolution"
+
+#, fuzzy
+#~ msgid "Advanced ..."
+#~ msgstr "Afegeix..."
 
 #, fuzzy
 #~ msgid "Click here to add a contact"
@@ -9231,10 +13020,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "El nЗmero de port de l'URL `%s' no Иs numХric"
 
 #, fuzzy
-#~ msgid "Secure IMAPv4"
-#~ msgstr "IMAPv4"
-
-#, fuzzy
 #~ msgid "For reading and storing mail on IMAP servers over an SSL connection."
 #~ msgstr "Per llegir i emmagatzemar correu en servidors IMAP."
 
@@ -9268,15 +13053,9 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "Aquesta opciС us connectarЮ al sevidor POP mitjanГant una contrasenya en "
 #~ "text net. иs l'Зnica suportada per molts servidors POP."
 
-#~ msgid "Remove action"
-#~ msgstr "Elimina una acciС"
-
 #~ msgid "Remove criterion"
 #~ msgstr "Elimina un criteri"
 
-#~ msgid "Source"
-#~ msgstr "Font"
-
 #, fuzzy
 #~ msgid "Unspecified"
 #~ msgstr "Especifiqueu la capГalera"
@@ -9285,10 +13064,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Advanced"
 #~ msgstr "Afegeix..."
 
-#, fuzzy
-#~ msgid "Check settings"
-#~ msgstr "ParЮmetres de prova"
-
 #~ msgid "Email address:"
 #~ msgstr "AdreГa electrРnica:"
 
@@ -9297,10 +13072,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "ConfiguraciС del correu"
 
 #, fuzzy
-#~ msgid "Hostname:"
-#~ msgstr "Nom d'usuari:"
-
-#, fuzzy
 #~ msgid "IMAP"
 #~ msgstr "IMAPv4"
 
@@ -9309,10 +13080,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "No suprimeixis els missatges del servidor"
 
 #, fuzzy
-#~ msgid "Mail"
-#~ msgstr "_Correu"
-
-#, fuzzy
 #~ msgid "Mail Account"
 #~ msgstr "contИ"
 
@@ -9321,10 +13088,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "ConfiguraciС del correu"
 
 #, fuzzy
-#~ msgid "Optional"
-#~ msgstr "Opcions"
-
-#, fuzzy
 #~ msgid "Password:"
 #~ msgstr "Contrasenya"
 
@@ -9345,18 +13108,10 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Desa com a VCard"
 
 #, fuzzy
-#~ msgid "Select signature file"
-#~ msgstr "Fitxer de signatura:"
-
-#, fuzzy
 #~ msgid "Server type:"
 #~ msgstr "Servidor:"
 
 #, fuzzy
-#~ msgid "Signature:"
-#~ msgstr "Fitxer de signatura:"
-
-#, fuzzy
 #~ msgid "Transport"
 #~ msgstr "Transparent"
 
@@ -9375,13 +13130,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "<unknown>"
 #~ msgstr "Desconegut"
 
-#~ msgid "No GPG/PGP program available."
-#~ msgstr "No hi ha cap programa GPG/PGP disponible."
-
-#, fuzzy
-#~ msgid "Message _Display"
-#~ msgstr "Esborra la visualitzaciС del missatge"
-
 #, fuzzy
 #~ msgid "_Compose"
 #~ msgstr "Redacta"
@@ -9394,10 +13142,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Copyright (C) 2000, Helix Code, Inc."
 #~ msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#, fuzzy
-#~ msgid "UNIX mbox-format mail files"
-#~ msgstr "Fitxers de correu en format mbox d'UNIX"
-
 #~ msgid ""
 #~ "For reading mail delivered by the local system, and for storing mail on "
 #~ "local disk."
@@ -9409,20 +13153,10 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Connect to server"
 #~ msgstr "No s'ha pogut connectar al servidor POP en %s."
 
-#~ msgid "New"
-#~ msgstr "Nou"
-
 #, fuzzy
 #~ msgid "Cannot initialize Evolution's notes component."
 #~ msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#, fuzzy
-#~ msgid "Notes Component: Could not initialize bonobo"
-#~ msgstr "No s'ha pogut inicialitzar el Bonobo"
-
-#~ msgid "Disabled"
-#~ msgstr "Inhabilitat"
-
 #~ msgid "Synchronize"
 #~ msgstr "Sincronitza"
 
@@ -9441,9 +13175,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "JP Rosevear <jpr@helixcode.com>"
 #~ msgstr "JP Rosevear <jpr@helixcode.com>"
 
-#~ msgid "Original Author:"
-#~ msgstr "Autor original:"
-
 #~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
 #~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
 
@@ -9531,19 +13262,12 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Edit this appointment..."
 #~ msgstr "Edita aquesta cita..."
 
-#, fuzzy
-#~ msgid "Local folders may not be nested."
-#~ msgstr "Les carpetes Mbox no es poden imbricar."
-
 #~ msgid "Enter the identity you wish to send this message from"
 #~ msgstr "IntroduОu la identitat amb la qual voleu enviar aquest missatge"
 
 #~ msgid "Enter the subject of the mail"
 #~ msgstr "IntroduОu l'assumpte del correu"
 
-#~ msgid "Saving changes to message..."
-#~ msgstr "S'estan desant els canvis al missatge..."
-
 #~ msgid "Save changes to message..."
 #~ msgstr "Desa els canvis al missatge..."
 
@@ -9553,13 +13277,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Edit Filter Rule"
 #~ msgstr "Edita una regla de filtre"
 
-#, fuzzy
-#~ msgid "outgoing"
-#~ msgstr "Agrupament"
-
-#~ msgid "Add Rule"
-#~ msgstr "Afegeix una regla"
-
 #~ msgid "Add VFolder Rule"
 #~ msgstr "Afegeix una regla de la VFolder"
 
@@ -9584,20 +13301,10 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "You have no Outbox configured"
 #~ msgstr "No teniu configurada cap bЗstia de sortida"
 
-#~ msgid ""
-#~ "Could not open file %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "No s'ha pogut obrir el fitxer %s:\n"
-#~ "%s"
-
 #, fuzzy
 #~ msgid "Registering local folder"
 #~ msgstr "CreaciС d'una nova carpeta"
 
-#~ msgid "Fetching email from %s"
-#~ msgstr "S'estЮ recollint el correu des de %s"
-
 #~ msgid "Fetch email from %s"
 #~ msgstr "Recull el correu des de %s"
 
@@ -9616,9 +13323,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Appending \"%s\""
 #~ msgstr "S'estЮ afegint \"%s\""
 
-#~ msgid "Appending a message without a subject"
-#~ msgstr "S'estЮ afegint un missatge sense cap assumpte"
-
 #~ msgid "Moving messages from \"%s\" into \"%s\""
 #~ msgstr "S'estan movent els missatges des de \"%s\" cap a \"%s\""
 
@@ -9643,13 +13347,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Carrega la carpeta %s"
 
 #~ msgid ""
-#~ "Error while preparing to %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Error en preparar-se per a %s:\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error while `%s':\n"
 #~ "%s"
 #~ msgstr ""
@@ -9662,12 +13359,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Corrupted message from dispatching thread?"
 #~ msgstr "Missatge malmИs de la cadena cursada?"
 
-#~ msgid "Could not create dialog box."
-#~ msgstr "No s'ha pogut crear el quadre de diЮleg."
-
-#~ msgid "User cancelled query."
-#~ msgstr "Consulta cancel╥lada per l'usuari."
-
 #~ msgid "Examining %s"
 #~ msgstr "S'estЮ examinant %s"
 
@@ -9858,9 +13549,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "FIXME: Next"
 #~ msgstr "FIXME: SegЭent"
 
-#~ msgid "Group %i"
-#~ msgstr "Grup %i"
-
 #~ msgid "label26"
 #~ msgstr "etiqueta26"
 
@@ -9882,9 +13570,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Minutes"
 #~ msgstr "Minuts"
 
-#~ msgid "Time"
-#~ msgstr "Temps"
-
 #~ msgid "_Audio"
 #~ msgstr "_юudio"
 
@@ -9901,10 +13586,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "etiqueta21"
 
 #, fuzzy
-#~ msgid "Show all hidden"
-#~ msgstr "Mostra"
-
-#, fuzzy
 #~ msgid "Hide deleted"
 #~ msgstr "Suprimeix"
 
@@ -9916,10 +13597,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Hide from Sender"
 #~ msgstr "Filtre sobre el remitent"
 
-#, fuzzy
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "Assumpte"
-
 #~ msgid "You have no mail sources configured"
 #~ msgstr "No teniu configurada cap font de correu"
 
@@ -9928,10 +13605,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Propietats de l'adjunciС"
 
 #, fuzzy
-#~ msgid "E-Mail Address:"
-#~ msgstr "AdreГa electrРnica:"
-
-#, fuzzy
 #~ msgid "Reply-to:"
 #~ msgstr "Respon"
 
@@ -9950,9 +13623,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Signature File"
 #~ msgstr "Fitxer de signatura"
 
-#~ msgid "Server:"
-#~ msgstr "Servidor:"
-
 #~ msgid "Mail source type:"
 #~ msgstr "Tipus de font del correu:"
 
@@ -10009,9 +13679,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Edit Source"
 #~ msgstr "Edita la font"
 
-#~ msgid "Add News Server"
-#~ msgstr "Afegeix un servidor de notМcies"
-
 #~ msgid "Edit News Server"
 #~ msgstr "Edita el servidor de notМcies"
 
@@ -10033,15 +13700,9 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Mail Transport"
 #~ msgstr "Transport de correu"
 
-#~ msgid "News Servers"
-#~ msgstr "Servidors de notМcies"
-
 #~ msgid "News Sources"
 #~ msgstr "Fonts de notМcies"
 
-#~ msgid "Send messages in HTML format"
-#~ msgstr "Envia els missatges en format HTML"
-
 #, fuzzy
 #~ msgid "_Addressbook Configuration..."
 #~ msgstr "ConfiguraciС del _correu..."
@@ -10069,10 +13730,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "FIXME: In_complete Task"
 #~ msgstr "FIXME: _Tasca"
 
-#, fuzzy
-#~ msgid "FIXME: Insert File"
-#~ msgstr "FIXME: Insereix el fitxer..."
-
 #~ msgid "FIXME: Rec_urrence..."
 #~ msgstr "FIXME: Rec_urrХncia..."
 
@@ -10087,10 +13744,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "_Redo"
 #~ msgstr "RЮdio"
 
-#, fuzzy
-#~ msgid "_Replace..."
-#~ msgstr "_Tanca..."
-
 #~ msgid "Fi_lter on Sender"
 #~ msgstr "Fi_ltre sobre el remitent"
 
@@ -10150,9 +13803,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "To-Do item that is not yet due:"
 #~ msgstr "Element per fer que encara no ha venГut:"
 
-#~ msgid "To-Do item that is due today:"
-#~ msgstr "Element per fer que venГ avui:"
-
 #~ msgid "To-Do item that is overdue:"
 #~ msgstr "Element endarrerit encara per fer:"
 
@@ -10210,9 +13860,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "today"
 #~ msgstr "avui"
 
-#~ msgid "last"
-#~ msgstr "Зltim"
-
 #~ msgid "this"
 #~ msgstr "aquest"
 
@@ -10225,9 +13872,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "third"
 #~ msgstr "tercer"
 
-#~ msgid "fourth"
-#~ msgstr "quart"
-
 #~ msgid "fifth"
 #~ msgstr "cinquХ"
 
@@ -10237,9 +13881,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "seventh"
 #~ msgstr "setХ"
 
-#~ msgid "eighth"
-#~ msgstr "vuitХ"
-
 #~ msgid "ninth"
 #~ msgstr "novХ"
 
@@ -10252,9 +13893,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "twelfth"
 #~ msgstr "dotzХ"
 
-#~ msgid "ago"
-#~ msgstr "fa"
-
 #~ msgid "Year:"
 #~ msgstr "Any:"
 
@@ -10267,12 +13905,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "Quan feu clic sobre un dia, anireu a parar\n"
 #~ "a aquella data."
 
-#~ msgid "Mail Source"
-#~ msgstr "Font del correu"
-
-#~ msgid "Send a message without a subject"
-#~ msgstr "Envia un missatge sense assumpte"
-
 #~ msgid "Expunge \"%s\""
 #~ msgstr "Esborra \"%s\""
 
@@ -10329,9 +13961,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Clearing message display"
 #~ msgstr "S'estЮ esborrant la visualitzaciС del missatge"
 
-#~ msgid "Display message UID \"%s\""
-#~ msgstr "Visualitza l'UID del missatge \"%s\""
-
 #~ msgid "Opening messages from folder \"%s\""
 #~ msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
 
@@ -10416,9 +14045,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Weeks start on"
 #~ msgstr "La setmana comenГa el"
 
-#~ msgid "Day range"
-#~ msgstr "Abast de dies"
-
 #~ msgid ""
 #~ "Please select the start and end hours you want\n"
 #~ "to be displayed in the day view and week view.\n"
@@ -10430,12 +14056,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "vistes de dia i de setmana. Per defecte, les\n"
 #~ "hores fora d'aquest abast no es mostraran."
 
-#~ msgid "Day end:"
-#~ msgstr "Final del dia:"
-
-#~ msgid "Colors for display"
-#~ msgstr "Colors per a la visualitzaciС"
-
 #~ msgid "Show on TODO List:"
 #~ msgstr "Mostra-ho a la llista de coses per fer:"
 
@@ -10454,9 +14074,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Preferences"
 #~ msgstr "PreferХncies"
 
-#~ msgid "Alarm Properties"
-#~ msgstr "Propietats de l'alarma"
-
 #~ msgid "Beep on display alarms"
 #~ msgstr "Fes un so en visualitzar les alarmes"
 
@@ -10531,18 +14148,12 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Don't know protocol to open URI `%s'"
 #~ msgstr "No es coneix cap protocol per obrir l'URI '%s'"
 
-#~ msgid "Forward Message"
-#~ msgstr "Reenvia el missatge"
-
 #~ msgid "Copy Message"
 #~ msgstr "Copia el missatge"
 
 #~ msgid "_New appointment..."
 #~ msgstr "_Nova cita..."
 
-#~ msgid "_Create New Folder..."
-#~ msgstr "_Crea una carpeta nova..."
-
 #~ msgid "Insert a file as an attachment"
 #~ msgstr "Insereix un fitxer com a adjunciС"
 
@@ -10561,9 +14172,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "New appointment for _today..."
 #~ msgstr "Nova cita per a _avui..."
 
-#~ msgid "Create a new appointment for today"
-#~ msgstr "Crea una nova cita per a avui"
-
 #~ msgid "%s%s"
 #~ msgstr "%2$s%1$s"
 
@@ -10600,9 +14208,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "To-do list"
 #~ msgstr "Llista de coses per fer"
 
-#~ msgid "Edit..."
-#~ msgstr "Edita..."
-
 #~ msgid "Weeks"
 #~ msgstr "Setmanes"
 
@@ -10657,12 +14262,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "label8"
 #~ msgstr "etiqueta8"
 
-#~ msgid "Discard this message?"
-#~ msgstr "Voleu descartar aquest missatge?"
-
-#~ msgid "Load a previously saved message"
-#~ msgstr "Carrega un missatge desat anteriorment"
-
 #~ msgid "_Format"
 #~ msgstr "_Formata"
 
@@ -10688,15 +14287,9 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "Per afegir una columna a la vostra taula, arrosegue-la\n"
 #~ "a la ubicaciС on voleu que aparegui."
 
-#~ msgid "window1"
-#~ msgstr "finestra1"
-
 #~ msgid "Available fields"
 #~ msgstr "Camps disponibles"
 
-#~ msgid "Show in this order"
-#~ msgstr "Mostra en aquest ordre"
-
 #~ msgid "label2"
 #~ msgstr "etiqueta2"
 
diff --git a/po/da.po b/po/da.po
index d20750bddd..1173af9982 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution beta\n"
-"POT-Creation-Date: 2001-05-18 15:23+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-04-21 10:38+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -14,11 +14,19 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3314
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr "Fabrik til at importere VKort-filer ind i Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr "Importerer VKort-filer ind i Evolution."
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Kort: "
 
-#: addressbook/backend/ebook/e-card.c:3316
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -26,7 +34,7 @@ msgstr ""
 "\n"
 "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3317
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -34,7 +42,7 @@ msgstr ""
 "\n"
 "Prefiks:    "
 
-#: addressbook/backend/ebook/e-card.c:3318
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -42,7 +50,7 @@ msgstr ""
 "\n"
 "Opgivet:     "
 
-#: addressbook/backend/ebook/e-card.c:3319
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -50,7 +58,7 @@ msgstr ""
 "\n"
 "TillФg: "
 
-#: addressbook/backend/ebook/e-card.c:3320
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -58,7 +66,7 @@ msgstr ""
 "\n"
 "Familie:    "
 
-#: addressbook/backend/ebook/e-card.c:3321
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -66,7 +74,7 @@ msgstr ""
 "\n"
 "Suffiks:    "
 
-#: addressbook/backend/ebook/e-card.c:3335
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -74,7 +82,7 @@ msgstr ""
 "\n"
 "FЬdselsdato: "
 
-#: addressbook/backend/ebook/e-card.c:3346
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -82,7 +90,7 @@ msgstr ""
 "\n"
 "Adresse:"
 
-#: addressbook/backend/ebook/e-card.c:3348
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -90,7 +98,7 @@ msgstr ""
 "\n"
 "Postboks:  "
 
-#: addressbook/backend/ebook/e-card.c:3349
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -98,7 +106,7 @@ msgstr ""
 "\n"
 "Linje:         "
 
-#: addressbook/backend/ebook/e-card.c:3350
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -106,7 +114,7 @@ msgstr ""
 "\n"
 "Vej:     "
 
-#: addressbook/backend/ebook/e-card.c:3351
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -114,7 +122,7 @@ msgstr ""
 "\n"
 "By:          "
 
-#: addressbook/backend/ebook/e-card.c:3352
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -122,7 +130,7 @@ msgstr ""
 "\n"
 "Region:     "
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -130,7 +138,7 @@ msgstr ""
 "\n"
 "Postnummer: "
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -138,7 +146,7 @@ msgstr ""
 "\n"
 "Land:    "
 
-#: addressbook/backend/ebook/e-card.c:3367
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
@@ -146,7 +154,7 @@ msgstr ""
 "\n"
 "LeveringsmФrke: "
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -154,7 +162,7 @@ msgstr ""
 "\n"
 "Telefoner:\n"
 
-#: addressbook/backend/ebook/e-card.c:3382
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -162,7 +170,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3406
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -170,7 +178,7 @@ msgstr ""
 "\n"
 "E-post:\n"
 
-#: addressbook/backend/ebook/e-card.c:3409
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -178,7 +186,7 @@ msgstr ""
 "\n"
 "E-post:"
 
-#: addressbook/backend/ebook/e-card.c:3428
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -186,7 +194,7 @@ msgstr ""
 "\n"
 "E-post program: "
 
-#: addressbook/backend/ebook/e-card.c:3434
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -194,7 +202,7 @@ msgstr ""
 "\n"
 "Tidszone: "
 
-#: addressbook/backend/ebook/e-card.c:3442
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -202,7 +210,7 @@ msgstr ""
 "\n"
 "Geografisk lokation: "
 
-#: addressbook/backend/ebook/e-card.c:3446
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -210,7 +218,7 @@ msgstr ""
 "\n"
 "Stilling: "
 
-#: addressbook/backend/ebook/e-card.c:3458
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -218,7 +226,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3459
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -226,7 +234,7 @@ msgstr ""
 "\n"
 "Navn:  "
 
-#: addressbook/backend/ebook/e-card.c:3460
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -234,7 +242,7 @@ msgstr ""
 "\n"
 "Enhed:  "
 
-#: addressbook/backend/ebook/e-card.c:3461
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -242,7 +250,7 @@ msgstr ""
 "\n"
 "Enhed2: "
 
-#: addressbook/backend/ebook/e-card.c:3462
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -250,7 +258,7 @@ msgstr ""
 "\n"
 "Enhed3: "
 
-#: addressbook/backend/ebook/e-card.c:3463
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -258,7 +266,7 @@ msgstr ""
 "\n"
 "Enhed4: "
 
-#: addressbook/backend/ebook/e-card.c:3467
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -266,7 +274,7 @@ msgstr ""
 "\n"
 "Kategorier: "
 
-#: addressbook/backend/ebook/e-card.c:3468
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -284,7 +292,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3481
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -292,7 +300,7 @@ msgstr ""
 "\n"
 "Unik streng: "
 
-#: addressbook/backend/ebook/e-card.c:3484
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -300,36 +308,24 @@ msgstr ""
 "\n"
 "Offentlig nЬgle: "
 
-#: addressbook/backend/ebook/e-card.c:3745
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr "Flere VKort"
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:4045
 #, c-format
 msgid "VCard for %s"
 msgstr "VKort for %s"
 
-#: addressbook/backend/ebook/e-destination.c:232
-msgid "???"
-msgstr "???"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "Fabrik til at importere VKort-filer ind i Evolution."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Importerer VKort-filer ind i Evolution."
-
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initiere Bonobo"
 
@@ -342,14 +338,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook ikke indlФst\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Kunne ikke starte wombat-tjener"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Kunne ikke starte wombat"
 
@@ -358,718 +354,846 @@ msgstr "Kunne ikke starte wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke lФse pilotens adresseapplikationsblok"
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr "En Bonobo-kontrol for popop af en adresse."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "En Bonobo-kontrol for visning af en adresse."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "En simpel Bonobo kontrol som viser en adressebog."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Kontrol der viser et minikort for Evolutions adressebog."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Evolution adressebogs minikort-viser"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "Evolution komponent for behandling af kontakter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Fabrik for kontrol af adressebog minikort"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Fabrik for adressebogens adressevisning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr "Fabrik for adressebogens adressepopop"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr "Fabrik for Evolutions adressebog-komponent."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr "Fabrik for eksempelkontrol for adressebog"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "LDAP server"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Fil"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Ukendt adressebogstype"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "Ingen (anonym modus)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Adgangskode"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Ukendt auth type"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "Base"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "иn"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "UndertrФ"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr "Ukendt omrЕde-type"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr "Bind DN:"
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr "RETMIG: Bind DN-hjФlpetekst ind her"
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Husk denne adgangskode"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "VФrt:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "Rod-DN:"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Port:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "SЬgeomrЕde:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Godkendelse:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr "Avancerede LDAP-indstillinger"
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Sti:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr "RETMIG: HjФlp for stier her?"
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "Opret sti hvis den ikke eksisterer."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "RedigИr adressebog"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "TilfЬj adressebog"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"VФlg den type adressebog som du har, og indtast den relvante information om "
+"den."
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Navn:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Beskrivelse:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr ""
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "TilfЬj"
+msgid "Addressbook Sources"
+msgstr "Kilder til adressebog"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Slet"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Navn"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "_TilfЬj"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "_RedigИr"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "Andre kontakter"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "Indtast adgangskode for %s"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Kunne ikke Еbne adressebogen"
+
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
+msgstr "Hvilkensomhelst felt indeholder"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "Navn indeholder"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "Epost indeholder"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "Navn indeholder"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "Uri'en som mappebladreren vil vise"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "PrimФr epost"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "SekundФr epost"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "TertiФr epost"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "VФlg fil"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Opret ny kontakt"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "RedigИr adressebog"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "RedigИr kontaktinfo"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "FЬj til kontakter"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "Epostadresse:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "Deaktiver forespЬrgsler"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "AktivИr forespЬrgsler (Farligt!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Evolutions adressebog-komponent"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr "Fabrik for adressebogens grФnseflade for navneudvФlgelse"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Fjern"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "Fjern alt"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "Sender post"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Andre kontakter"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "Modtagerliste:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "VФlg mappe"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "VФlg navn fra:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "Kategori:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_SЬg"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "Br_yllupsdag:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "A_rbejde"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "_Fax pЕ arbejde"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "K_ontakter..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ka_tegorier..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Detaljer"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Gem som:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Generel"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Ny telefontype"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "_Notater:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Organisation:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Telefontyper"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
-msgstr "PrimФr epost"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "Vil modtage epost af formatet _HTML"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Hjemmeside-adresse:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:84
-msgid "_Add"
-msgstr "_TilfЬj"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "_Adresse..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "SekretФrs navn:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "_FЬdselsdag:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Arbejde"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Firma:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "_Kontakter..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:656 mail/mail-config.glade.h:85
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:103
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Slet"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "_Afdeling:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "_Fulde navn..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_Hjemme"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "_Job titel:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "_Leders navn:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_Mobil"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "Kalde_navn:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "_Kontor:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_Profession:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "фgte_fФlle:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "_Dette er postadressen"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Slet kontakt?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakt tilhЬrer disse kategorier:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:688
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "SekretФr"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Arbejde"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Arbejde 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:668
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Firma fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Tilbagering"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Bil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Hjem"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Hjem 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:669
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Hjemme fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "Isdn"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "_Mobil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Andet"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Anden fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Kalder"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "PrimФr epost"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:680
-msgid "Email 2"
-msgstr "SekundФr epost"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:681
-msgid "Email 3"
-msgstr "TertiФr epost"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Slet kontakt?"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:233
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Hurtigkontakt"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:235
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "RedigИr alt"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:276
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Fuldt navn"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:282
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "E-post"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresse _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Canada"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Tjek adresse"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "_Land:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Finland"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "USA"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_By:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "_Postboks:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "_Stat/Provins:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "_ZIP/Postnummer:"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Tjek fulde navn"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Esq."
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "FrЬken"
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Hr."
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Fru"
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Frk."
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Fornavn:"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_Efternavn:"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Mellemnavn:"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_Suffiks:"
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Titel:"
 
-#: addressbook/gui/component/addressbook.c:242
-msgid "As _Minicards"
-msgstr "Som _minikort"
-
-#: addressbook/gui/component/addressbook.c:248
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Som _tabel"
-
-#: addressbook/gui/component/addressbook.c:408
-#, c-format
-msgid "Enter password for %s"
-msgstr "Indtast adgangskode for %s"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "VФrt:"
 
-#: addressbook/gui/component/addressbook.c:436
-msgid "Unable to open addressbook"
-msgstr "Kunne ikke Еbne adressebogen"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "december"
 
-#: addressbook/gui/component/addressbook.c:443
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or the LDAP server\n"
-"is down"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:448
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:456
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:616 calendar/gui/gnome-cal.c:233
-msgid "Any field contains"
-msgstr "Hvilkensomhelst felt indeholder"
-
-#: addressbook/gui/component/addressbook.c:617
-msgid "Name contains"
-msgstr "Navn indeholder"
-
-#: addressbook/gui/component/addressbook.c:618
-msgid "Email contains"
-msgstr "Epost indeholder"
-
-#: addressbook/gui/component/addressbook.c:761
-msgid "The URI that the Folder Browser will display"
-msgstr "Uri'en som mappebladreren vil vise"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "LDAP server"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Fil"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Ukendt adressebogstype"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "Ingen (anonym modus)"
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
-msgid "Password"
-msgstr "Adgangskode"
-
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "Ukendt auth type"
-
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "Base"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "иn"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "UndertrФ"
-
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr "Ukendt omrЕde-type"
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr "Bind DN:"
-
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr "RETMIG: Bind DN-hjФlpetekst ind her"
-
-#: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:60
-msgid "Remember this password"
-msgstr "Husk denne adgangskode"
-
-#: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:33
-msgid "Host:"
-msgstr "VФrt:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
+msgstr "Fjern"
 
-#: addressbook/gui/component/addressbook-config.c:402
-msgid "FIXME Host help text here."
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "Kontaktredigering"
 
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "Root DN:"
-msgstr "Rod-DN:"
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "Kontaktredigering"
 
-#: addressbook/gui/component/addressbook-config.c:405
-msgid "FIXME Root DN help text here."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Port:"
-msgstr "Port:"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:430
-msgid "Search Scope:"
-msgstr "SЬgeomrЕde:"
-
-#: addressbook/gui/component/addressbook-config.c:477
-msgid "Authentication:"
-msgstr "Godkendelse:"
-
-#: addressbook/gui/component/addressbook-config.c:499
-msgid "Advanced LDAP Options"
-msgstr "Avancerede LDAP-indstillinger"
-
-#: addressbook/gui/component/addressbook-config.c:520
-#: mail/mail-config.glade.h:53
-msgid "Path:"
-msgstr "Sti:"
-
-#: addressbook/gui/component/addressbook-config.c:521
-msgid "FIXME Path Help text here"
-msgstr "RETMIG: HjФlp for stier her?"
-
-#: addressbook/gui/component/addressbook-config.c:526
-msgid "Create path if it doesn't exist."
-msgstr "Opret sti hvis den ikke eksisterer."
-
-#: addressbook/gui/component/addressbook-config.c:660
-msgid "Edit Addressbook"
-msgstr "RedigИr adressebog"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#, fuzzy
+msgid "New Contact:"
+msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-config.c:662
-msgid "Add Addressbook"
-msgstr "TilfЬj adressebog"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#, fuzzy
+msgid "Original Contact:"
+msgstr "Opprinnelig forfatter:"
 
-#: addressbook/gui/component/addressbook-config.c:680
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
 msgstr ""
-"VФlg den type adressebog som du har, og indtast den relvante information om "
-"den."
 
-#: addressbook/gui/component/addressbook-config.c:686
-#: mail/mail-config.glade.h:43
-msgid "Name:"
-msgstr "Navn:"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+msgid "Changed Contact:"
+msgstr "Andre kontakter"
 
-#: addressbook/gui/component/addressbook-config.c:687
-msgid "FIXME Name help text here"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:689
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Beskrivelse:"
-
-#: addressbook/gui/component/addressbook-config.c:690
-msgid "FIXME Description help text here"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Kilder til adressebog"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:590
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:23
-#: mail/message-browser.c:202 ui/evolution-addressbook.xml.h:3
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:22
-#: ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Slet"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:28
-msgid "Edit"
-msgstr "RedigИr"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Navn"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
-msgstr "Andre kontakter"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "Deaktiver forespЬrgsler"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "AktivИr forespЬrgsler (Farligt!)"
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
-msgstr "RedigИr kontaktinfo"
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
-msgid "Add to Contacts"
-msgstr "FЬj til kontakter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "En Bonobo-kontrol for popop af en adresse."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "En Bonobo-kontrol for visning af en adresse."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "En simpel Bonobo kontrol som viser en adressebog."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Kontrol der viser et minikort for Evolutions adressebog."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution adressebogs minikort-viser"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "Evolution komponent for behandling af kontakter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Fabrik for kontrol af adressebog minikort"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Fabrik for adressebogens adressevisning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
-msgstr "Fabrik for adressebogens adressepopop"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "Fabrik for Evolutions adressebog-komponent."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
-msgstr "Fabrik for eksempelkontrol for adressebog"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
-msgstr "Fjern"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
-msgid "Remove All"
-msgstr "Fjern alt"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Evolutions adressebog-komponent"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Fabrik for adressebogens grФnseflade for navneudvФlgelse"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Find..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Modtagerliste:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "VФlg mappe"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "VФlg navn fra:"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+#, fuzzy
+msgid "_Change Anyway"
+msgstr "Foresatte"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:242
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "SЬg"
 
@@ -1183,168 +1307,264 @@ msgstr "z"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-#: addressbook/gui/widgets/e-addressbook-view.c:525
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "Gem som vCard"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 #, fuzzy
 msgid "Send contact to other"
 msgstr "Send _kontaktperson til andre..."
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 #, fuzzy
 msgid "Send message to contact"
 msgstr "Ny _meddelelse til kontaktperson"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-#: addressbook/gui/widgets/e-addressbook-view.c:588 mail/message-browser.c:199
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:65 ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Udskriv"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Skriv kuvert..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Slet"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "Fejl under indlФsning af %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "Kilder"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Ukendt fejl"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "Arbejd uden net"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "Adgang nФgtet"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "Fil ikke fundet"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Operationen er ikke understЬttet"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "Afbrudt"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "I/U-fejl"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "Fejl under indlФsning af %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Fejl under indlФsning af %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Fejl under indlФsning af %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "Fejl under indlФsning af %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr "Fejl under indlФsning af %s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* Klik her for at tilfЬje en kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "Epost"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 #, fuzzy
 msgid "Primary Phone"
 msgstr "PrimФr epost"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 #, fuzzy
 msgid "Assistant Phone"
 msgstr "SekretФr"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 #, fuzzy
 msgid "Business Phone"
 msgstr "Arbejde 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 #, fuzzy
 msgid "Callback Phone"
 msgstr "Tilbagering"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 #, fuzzy
 msgid "Company Phone"
 msgstr "Firma"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 #, fuzzy
 msgid "Home Phone"
 msgstr "Hjem 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 #, fuzzy
 msgid "Business Address"
 msgstr "Arbejde 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 #, fuzzy
 msgid "Mobile Phone"
 msgstr "_Mobil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 #, fuzzy
 msgid "Business Phone 2"
 msgstr "Arbejde 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "Hjem 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 #, fuzzy
 msgid "Other Phone"
 msgstr "Andre kontakter"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "Anden adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:682
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Websted"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:683
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "Afdeling"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:684
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:685
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "Titel"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:686
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Profession"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:687
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Foresatte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:689
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Kaldenavn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:690
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "Samlever"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:691
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "BemФrkning"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:692
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr "Ledig-optaget URL"
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "FФrdig"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "IndlФser kalender..."
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Kunne ikke Еbne adressebogen"
 
-#: addressbook/gui/widgets/e-minicard-view.c:216
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1387,7 +1607,8 @@ msgid "Dimensions:"
 msgstr "Dimensioner:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Skrifttype..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1447,7 +1668,6 @@ msgid "Margins"
 msgstr "Marginer"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "Antal kolonner:"
 
@@ -1527,37 +1747,62 @@ msgstr "Type:"
 msgid "Width:"
 msgstr "Bredde:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Skrifttype..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Fejl under kommunikation med kalendertjeneren"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikke lФse pilotens kalenderapplikationsblok"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke lФse pilotens applikationsblok for opgaveliste"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "PЕmindelse om din aftale "
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "En simpel Bonobo kontrol som viser en kalender."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "UdsФt"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr "Evolution kalender eksekutivoversigt-komponent."
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "O.k."
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolution kalender ITip/iMip fremviser"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr "Evolution-komponent for behandling af kalenderen."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr "Fabrik for kalenderoversigts-komponenten."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr "Fabrik for evolutions kalenderkomponent."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr "Fabrik for kalenderens iTip visningskontrol"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr "Fabrik for eksempelkontrol for kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Fabrik for evolutions kalenderkomponent."
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1567,142 +1812,256 @@ msgstr "Alarm-notificeringstjeneste"
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:56
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "Besked om din aftale pЕ %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "Besked om din aftale pЕ %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "Besked om din aftale pЕ %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "Besked om din aftale pЕ %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "Besked om din aftale pЕ %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "Besked om din aftale pЕ %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "Besked om din aftale pЕ %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "Vis information om Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "Alarm pЕ %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Luk"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "UdsФt"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "UdsФt-tid (minutter)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "RedigИr aftale"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "Intet sammendrag."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "PЕmindelse om din aftale "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "UdsФt"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "O.k."
+
+#: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
 "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
 "know."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:93 calendar/gui/main.c:52
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
 msgid "Could not initialize GNOME"
 msgstr "Kunne ikke initiere Gnome"
 
-#: calendar/gui/alarm-notify/notify-main.c:108
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Kunne ikke initiere Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
-msgstr "Fil ikke fundet"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A den %e. %B %Y"
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
-msgstr "еbn kalender"
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
-msgstr "Gem kalender"
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:468
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%a %d %Y"
+
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Kunne ikke oprette kalender-visning. Tjek venligst din opsФtning af ORBit og "
 "OAF."
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "Of_fentlig"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "_Fortrolig"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1601
-#: calendar/gui/event-editor.c:1628
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Ukendt fejl"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "ь"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:689
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "HЬj"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
-#: calendar/gui/calendar-model.c:1574
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:688
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:687
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Lav"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Gennemsigtig"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Uigennemsigtig"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Ikke startet"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "Under udarbejdelse"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "FuldfЬrt"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:544
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Afbrudt"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %Y-%m-%d %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y-%m-%d %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:802
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1713,7 +2072,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:882
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
@@ -1721,17 +2080,21 @@ msgstr ""
 "'Ingen'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
-#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:976
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:46 shell/e-shell-view.c:1199
-#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
-#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:970
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1741,118 +2104,295 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1010
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "ProcentvФrdien skal vФre mellem 0 og 100, inklusive"
 
-#: calendar/gui/calendar-model.c:1051
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "Prioriteten skal vФre en af 'HЬj', 'Normal', 'Lav' eller 'Udefineret'."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1064
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Udefineret"
 
-#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 "Gennemsigtigheden skal vФre en af 'Gennemsigtig', 'Uigennemsigtig' eller "
 "\"Ingen'."
 
-#: calendar/gui/calendar-model.c:1576
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "Gentages"
 
-#: calendar/gui/calendar-model.c:1578
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Nej"
 
-#: calendar/gui/calendar-summary.c:198
-msgid "%A, %e %B %Y"
-msgstr "%A den %e. %B %Y"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "Kortvisning"
 
-#: calendar/gui/calendar-summary.c:207
-msgid "Appointments"
-msgstr "Aftaler"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "Arbejds_uge"
 
-#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
-msgid "%I:%M%p"
-msgstr "%H:%M"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "Uge"
 
-#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:948
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Opgaver"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "MЕned"
 
-#: calendar/gui/calendar-summary.c:443
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Fejl ved indlФsning af kalender</b>"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "URIen som kalenderen skal vise"
 
-#: calendar/gui/calendar-summary.c:455
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Fejl ved indlФsning af kalender:<br>Metode ikke understЬttet"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "Lyd-alarmer"
 
-#: calendar/gui/calendar-summary.c:622 mail/mail-config.glade.h:24
-msgid "Display"
-msgstr "Vis"
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "Modtagerliste:"
 
-#: calendar/gui/calendar-summary.c:627
-msgid "Show appointments"
-msgstr "Vis aftaler"
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "Vis valgmuligheder"
 
-#: calendar/gui/calendar-summary.c:635
-msgid "Show tasks"
-msgstr "Vis opgaver"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:690
-msgid "Things to do"
-msgstr "Opgaver der skal fuldfЬres"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "IndlФser kalender"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+#, fuzzy
+msgid "Alarm Repeat"
+msgstr "Egenskaber"
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "URIen som kalenderen skal vise"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarm pЕ %A %d %b %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "Beskeder"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Besked om din aftale pЕ %A %d %b %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Afspil lyd/sang"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
-msgstr "Intet sammendrag."
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Luk"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "KЬ_r program"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "RedigИr aftale"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "UdsФt-tid (minutter)"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "dage"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "_OpdatИr hver"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "timer"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "minutter"
+
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr " %d dage"
+
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr " 1 dag"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr " %d uger"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr " 1 uge"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr " %d timer"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr " 1 time"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr " %d minutter"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr " 1 minut"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr " %d sekunder"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr " 1 sekund"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr "Afspil lyd/sang"
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "den aktuelle tid"
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an email"
+msgstr "Send besked"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr "KЬ_r program"
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr " fЬr begyndelse pЕ aftale"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr " efter begyndelse pЕ aftale"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr " fЬr slutning pЕ aftale"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr " efter slutning pЕ aftale"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "Base"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "Dato & tidspunkt"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "PЕmindelser"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Sammendrag:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_Alternativer"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "efter"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "fЬr"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "dag(e)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr "slut pЕ aftale"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr "time(r)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+msgid "minute(s)"
+msgstr "minut(ter)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
+msgstr "start pЕ aftale"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
@@ -1883,36 +2423,40 @@ msgid "60 minutes"
 msgstr "60 minutter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Alarmer afbrydes efter"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Lyd-alarmer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "Pip nЕr alarmvinduet kommer til syne."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "OpsФtning af kalender"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#, fuzzy
+msgid "Color for tasks due today"
+msgstr "OppgavelisteoppfЬring som gЕr ut idag:"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Farver"
+#, fuzzy
+msgid "Colors for Tasks"
+msgstr "(Ingen mappe vist)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+#, fuzzy
+msgid "Compress weekends in month view"
 msgstr "Sammenpres weekender"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+#, fuzzy
+msgid "Date Navigator"
 msgstr "Alternativer for datonavigator"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1920,583 +2464,1085 @@ msgid "Defaults"
 msgstr "Forvalg"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Vis valgmuligheder"
+#: mail/mail-config.glade.h:30
+msgid "Display"
+msgstr "Vis"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
-msgstr "FФrdig-dato"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "SlЕ udsФttelse til for"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Dagen slutter:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Ugens fЬrste dag:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "fre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "fredag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "FremhФv:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "Punkter som skal afsluttes idag"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Punkter som skal afsluttes idag:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Punkter som ikke skal afsluttes endnu"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Punkter som ikke skal afsluttes endnu:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "man"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "mandag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Overskredne opgaver"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "Overskredne opgaver:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:54
-msgid "Pick a color"
-msgstr "VФlg en farve"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "Prioritet"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#, fuzzy
+msgid "Overdue tasks"
+msgstr "Overskredne opgaver"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "PЕmind mig om alle aftaler"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "PЕmindelser"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "lЬr"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "lЬrdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Vis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "Vis sluttider for aftaler"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Vis ugenumre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "Dagens starter:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "sЬn"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "sЬndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "Opgaveblok"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "Opgaver"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "Punkter som skal afsluttes idag"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "tor"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "torsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Tid til afslutning"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Time"
+msgstr "Titel"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "Tidsopdeling:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Tidsformat:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"Tidszone: "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "tir"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "tirsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Visuelle alarmer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "ons"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "onsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "Arbejdsuge"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
+msgstr "Arbejds_uge"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "minutter fЬr de skal ske."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:88
-msgid "seconds."
-msgstr "sekunder."
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "Er du sikker pЕ at du vil slette denne konto?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "Er du sikker pЕ at du vil slette opgaven '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "Er du sikker pЕ at du vil slette journalindgangen '%s'?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+#, fuzzy
+msgid " to "
+msgstr "for"
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "FuldfЬrt"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "FuldfЬrt"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#, fuzzy
+msgid "Due "
+msgstr "FФrdig-dato"
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "RedigИr aftale"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "Aftale - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "Opgave - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Journalpunkt - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Ingen sammendrag"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "Overskriv fil?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"En fil med samme navn eksisterer allerede.\n"
+"Overskriv den?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Gem som..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Er du sikker pЕ at du vil slette aftalen '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:73
+#: calendar/gui/dialogs/delete-comp.c:87
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Er du sikker pЕ at du vil slette denne unavngivne aftale?"
 
-#: calendar/gui/dialogs/delete-comp.c:79
+#: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Er du sikker pЕ at du vil slette opgaven '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:82
+#: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Er du sikker pЕ at du vil slette denne unavngivne opgave?"
 
-#: calendar/gui/dialogs/delete-comp.c:88
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Er du sikker pЕ at du vil slette journalindgangen '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Er du sikker pЕ at du vil slette denne unavngivne journalindgang?"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "ьnsker du at gemme Фndringer?"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "Er du sikker pЕ at du vil slette aftalen '%s'?"
 
-#: calendar/gui/dialogs/task-editor.c:709
-msgid "Edit Task"
-msgstr "RedigИr opgave"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "Er du sikker pЕ at du vil slette opgaven '%s'?"
 
-#: calendar/gui/dialogs/task-editor.c:714 calendar/gui/event-editor.c:382
-#, c-format
-msgid "Appointment - %s"
-msgstr "Aftale - %s"
+#: calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "Er du sikker pЕ at du vil slette journalindgangen '%s'?"
 
-#: calendar/gui/dialogs/task-editor.c:717 calendar/gui/event-editor.c:385
-#, c-format
-msgid "Task - %s"
-msgstr "Opgave - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "VФlg fil"
 
-#: calendar/gui/dialogs/task-editor.c:720 calendar/gui/event-editor.c:388
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Journalpunkt - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Sektioner:"
 
-#: calendar/gui/dialogs/task-editor.c:734 calendar/gui/event-editor.c:402
-msgid "No summary"
-msgstr "Ingen sammendrag"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Tidszone: "
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% fФrdi_g:"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
+msgstr "Aftale"
+
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
+msgstr "PЕmindelse"
+
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
+msgstr "Gentagelse"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "AnnullИr mЬde"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "Varer he_le dagen"
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Klassificering"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Date & Time"
 msgstr "Dato & tidspunkt"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "FuldfЬrt dato:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Pri_vate"
 msgstr "Pri_vat"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "Fremskridt"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "Of_fentlig"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Sta_rt dato:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "Sa_mmendrag:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Opgave"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
 msgid "_Confidential"
 msgstr "_Fortrolig"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "_Kontakter..."
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "S_lut-tid:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "Slut-_dato:"
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "_Start-tid:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_Prioritet:"
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "_Status:"
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Gruppenavn:"
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
-msgstr "Kategorier"
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Kilder"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Completion Date"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr "Formand"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr "NЬdvendig deltager"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr "Mulig deltager"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr "Ikke-deltager"
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "UdfЬr handlinger"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr " AcceptИr "
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr " Afvis "
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Slettet"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "Under udarbejdelse"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Chair Persons"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "NЬdvendig deltager"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Mulig deltager"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Ikke-deltager"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "Sendt"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "Slet..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
+msgstr "Deltager"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
 msgstr "FФrdiggЬrelsesdato"
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "End Date"
-msgstr "Slutdato"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "Slettet"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Start Date"
-msgstr "Startdato"
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "Slettet"
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
-msgstr "Geografisk position"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "Foresatte"
 
-#: calendar/gui/e-calendar-table.c:164
-msgid "Percent complete"
-msgstr "Procent fФrdig"
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "december"
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Summary"
-msgstr "Sammendrag"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr "S.U."
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
-msgstr "Gennemsigtighed"
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr "Rolle"
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
-msgstr "URI"
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Status"
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
-msgstr "Alarmer"
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Type"
 
-#: calendar/gui/e-calendar-table.c:170
-msgid "Click here to add a task"
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "ArrangЬr:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "ArrangЬr:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "_IndvitИr andre..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "ArrangЬr:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a %d %b %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Denne aftale indeholder gentagelser som Evolution ikke kan redigere."
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr "pЕ"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "dag"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr "den"
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr "."
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr "hФndelser"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
+msgstr "Egendefineret genindtrФffelse"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Hver"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "Undtagelser"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
+msgstr "Ingen genindtrФffelse"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
+msgstr "Smugkig"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
+msgstr "Regel for genindtrФffelse"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
+msgstr "Simpel genindtrФffelse"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "фndr"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "for"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "for evigt"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "mЕned(er)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr "til"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "uge(r)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
+msgstr "Еr"
+
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr "ьnsker du at gemme Фndringer?"
+
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "FuldfЬrt dato:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "Slettet"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "Slettet"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "Ingen"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "Opgave"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% fФrdi_g:"
+
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
+msgstr "Fremskridt"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "Sta_rt dato:"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
+msgstr "Slut-_dato:"
+
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
+msgstr "_Prioritet:"
+
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
+msgstr "_Status:"
+
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "MarkИr som fuldfЬrt"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "_еbn"
+
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "Klip _ud"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
-msgstr "MarkИr opgaven som fuldfЬrt"
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_KopiИr"
 
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit this task..."
-msgstr "фndr denne opgave..."
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "_IndsФt"
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "фndr denne opgave"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "MarkИr som fuldfЬrt"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Slet denne opgave"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
+msgstr "MarkИr som fuldfЬrt"
+
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Slet opgaven"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
-msgstr " "
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr ""
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
-msgstr " "
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% fФrdi_g:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Alarmer"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategorier"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "FФrdig"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "FФrdiggЬrelsesdato"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "FФrdig-dato"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Slutdato"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "Geografisk position"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Prioritet"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Startdato"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "Sammendrag"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "Opgaver"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "Gennemsigtighed"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URI"
+
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minutters opdeling"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr " "
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr " "
+
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Ny aftale"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
-msgid "New All Day Event"
-msgstr ""
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
+msgstr "Ny aftal_e"
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
-msgid "Go to Today"
-msgstr "GЕ til i dag"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "GЕ _til idag"
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "GЕ til dato..."
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "еbn"
-
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Fjern denne aftale"
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "PlanlФg mЬde"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
+msgstr "Gem aktiv fil"
 
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
-msgid "Make this Occurrence Movable"
-msgstr ""
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
+msgstr "Slet alle opfЬringer"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
-msgid "Delete this Occurrence"
-msgstr ""
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
+msgstr "Slet alle opfЬringer"
 
-#: calendar/gui/e-day-view.c:3179
-msgid "Delete all Occurrences"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minutters opdeling"
+#: calendar/gui/e-itip-control.c:697
+#, fuzzy
+msgid "This is a meeting request."
+msgstr "_Dette er postadressen"
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
-msgid "Component successfully updated."
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+#, fuzzy
+msgid "The message is not understandable."
+msgstr "Den fil eksisterer men kan ikke lФses."
+
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
-msgstr "Kunne ikke lФse din kalenderfil!\n"
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
-msgstr "Dette er et svar fra nogen som ikke er inviteret!"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:499
-msgid "I couldn't update your calendar store."
-msgstr "Kunne ikke opdatere dit kalenderlager."
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
-msgstr "Kunne ikke slette kalenderkomponenten!\n"
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Component successfully deleted."
-msgstr "Sletning af komponent fuldfЬrt."
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-msgid "I don't recognize this type of calendar component."
-msgstr "Kan ikke genkende denne type kalenderkomponent."
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
-msgstr "TilfЬj til Kalender"
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
-msgid " Accept "
-msgstr " AcceptИr "
+#: calendar/gui/e-itip-control.c:834
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "Mappen set ud til at vФre uigenkaldeligt Ьdelagt."
 
-#: calendar/gui/e-itip-control.c:815
-msgid " Decline "
-msgstr " Afvis "
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Tentative "
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
-msgstr "OpdatИr kalender"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
-msgstr "AnnullИr mЬde"
+#: calendar/gui/e-itip-control.c:1015
+#, fuzzy
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "Kunne ikke lФse din kalenderfil!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -2511,26 +3557,22 @@ msgstr "--til--"
 msgid "Calendar Message"
 msgstr "Kalenderbesked"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:632
+#: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Dato:"
 
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "IndlФser kalender"
+
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "IndlФser kalender..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "ArrangЬr:"
-
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Server-melding:"
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Sammendrag:"
-
 #: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "dagen begynder"
@@ -2539,415 +3581,48 @@ msgstr "dagen begynder"
 msgid "date-start"
 msgstr "dagen slutter"
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "Deltager"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "Deltagers adresse"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "Deltagere:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"AnnullИr\n"
-"mЬde"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr "Formand"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "Invitationer til mЬde"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "Ikke-deltager"
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "Mulig deltager"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "ArrangЬr:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:14
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"OffentliggЬr\n"
-"arrangement"
-
-#: calendar/gui/e-meeting-dialog.glade.h:16
-msgid "RSVP"
-msgstr "S.U."
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"Anmod\n"
-"om mЬde"
-
-#: calendar/gui/e-meeting-dialog.glade.h:19
-msgid "Required Participant"
-msgstr "NЬdvendig deltager"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Role"
-msgstr "Rolle"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"AfsФt\n"
-"tid"
-
-#: calendar/gui/e-meeting-dialog.glade.h:23 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1081
-msgid "Status"
-msgstr "Status"
-
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "Alle"
 
-#: calendar/gui/e-tasks.c:155
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "Kategori:"
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikke indlФse opgaverne i '%s'"
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden der krФves for at indlФse '%s' er ikke understЬttet"
 
-#: calendar/gui/event-editor.c:377
-msgid "Edit Appointment"
-msgstr "RedigИr aftale"
-
-#: calendar/gui/event-editor.c:449
-msgid "on"
-msgstr "pЕ"
-
-#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:81
-msgid "day"
-msgstr "dag"
-
-#: calendar/gui/event-editor.c:601
-msgid "on the"
-msgstr "den"
-
-#: calendar/gui/event-editor.c:608
-msgid "th"
-msgstr "."
-
-#: calendar/gui/event-editor.c:754
-msgid "occurrences"
-msgstr "hФndelser"
-
-#: calendar/gui/event-editor.c:871
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Denne aftale indeholder gentagelser som Evolution ikke kan redigere."
-
-#: calendar/gui/event-editor.c:1543
-#, c-format
-msgid " %d days"
-msgstr " %d dage"
-
-#: calendar/gui/event-editor.c:1545
-msgid " 1 day"
-msgstr " 1 dag"
-
-#: calendar/gui/event-editor.c:1548
-#, c-format
-msgid " %d weeks"
-msgstr " %d uger"
-
-#: calendar/gui/event-editor.c:1550
-msgid " 1 week"
-msgstr " 1 uge"
-
-#: calendar/gui/event-editor.c:1553
-#, c-format
-msgid " %d hours"
-msgstr " %d timer"
-
-#: calendar/gui/event-editor.c:1555
-msgid " 1 hour"
-msgstr " 1 time"
-
-#: calendar/gui/event-editor.c:1558
-#, c-format
-msgid " %d minutes"
-msgstr " %d minutter"
-
-#: calendar/gui/event-editor.c:1560
-msgid " 1 minute"
-msgstr " 1 minut"
-
-#: calendar/gui/event-editor.c:1563
-#, c-format
-msgid " %d seconds"
-msgstr " %d sekunder"
-
-#: calendar/gui/event-editor.c:1565
-msgid " 1 second"
-msgstr " 1 sekund"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1588
-msgid "Play a sound"
-msgstr "Afspil lyd/sang"
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1591
-msgid "Show a dialog"
-msgstr "Vis dialog"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1594
-msgid "Send an email"
-msgstr "Send besked"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1597
-msgid "Run a program"
-msgstr "KЬ_r program"
-
-#: calendar/gui/event-editor.c:1612
-msgid " before start of appointment"
-msgstr " fЬr begyndelse pЕ aftale"
-
-#: calendar/gui/event-editor.c:1614
-msgid " after start of appointment"
-msgstr " efter begyndelse pЕ aftale"
-
-#: calendar/gui/event-editor.c:1622
-msgid " before end of appointment"
-msgstr " fЬr slutning pЕ aftale"
-
-#: calendar/gui/event-editor.c:1624
-msgid " after end of appointment"
-msgstr " efter slutning pЕ aftale"
-
-#: calendar/gui/event-editor.c:3132 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%a %d %b %Y"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Varer he_le dagen"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Aftale"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "GrundlФggende om aftaler"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Egendefineret genindtrФffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Hver"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Undtagelser"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "фndr"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Ingen genindtrФffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Smugkig"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Gentagelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Regel for genindtrФffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "PЕmindelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "Indstillinger..."
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Simpel genindtrФffelse"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "S_lut-tid:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "_Start-tid:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "_Start dato:"
-
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "efter"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
-msgid "before"
-msgstr "fЬr"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "dag(e)"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "slut pЕ aftale"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "for"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "for evigt"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "time(r)"
-
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:87
-msgid "minute(s)"
-msgstr "minut(ter)"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr "mЕned(er)"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "start of appointment"
-msgstr "start pЕ aftale"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "until"
-msgstr "til"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "week(s)"
-msgstr "uge(r)"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "year(s)"
-msgstr "Еr"
-
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-msgid "New Appointment..."
-msgstr "Ny aftale..."
-
-#: calendar/gui/e-week-view.c:3314
-msgid "Delete All Occurrences"
-msgstr "Slet alle opfЬringer"
-
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d %b"
 
-#: calendar/gui/gnome-cal.c:234
-msgid "Summary contains"
-msgstr "Sammendrag indeholder"
-
-#: calendar/gui/gnome-cal.c:235
-msgid "Description contains"
-msgstr "Beskrivelse indeholder"
-
-#: calendar/gui/gnome-cal.c:236
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
 #, fuzzy
-msgid "Comment contains"
-msgstr "Navn indeholder"
-
-#: calendar/gui/gnome-cal.c:237
-msgid "Has category"
-msgstr "Har kategori"
+msgid "New _Appointment..."
+msgstr "Ny aftale..."
 
-#: calendar/gui/gnome-cal.c:840
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunne ikke Еbne mappen i `%s'"
 
-#: calendar/gui/gnome-cal.c:851
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden som er nЬdvendig for at Еbne `%s' er ikke stЬttet"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "En simpel Bonobo kontrol som viser en kalender."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution kalender eksekutivoversigt-komponent."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution kalender ITip/iMip fremviser"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "Evolution-komponent for behandling af kalenderen."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr "Fabrik for kalenderoversigts-komponenten."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "Fabrik for evolutions kalenderkomponent."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr "Fabrik for kalenderens iTip visningskontrol"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr "Fabrik for eksempelkontrol for kalender"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "april"
@@ -2969,231 +3644,256 @@ msgid "Go To Date"
 msgstr "GЕ til dato"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "GЕ til i dag"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "januar"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "juli"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "juni"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "marts"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "maj"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "november"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "oktober"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "GЕ til i dag"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "sЬn"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "man"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "tir"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "ons"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "tor"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "fre"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "lЬr"
 
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Opgaver"
+
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "I dag (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1104
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Denne uge (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Denne mЕned (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Dette Еr (%Y)"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Udskriv kalender"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1560
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "ForhЕndsvisning af udskrift"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Udskriv denne ting"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "SkriveropsФtning"
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "URI for opgavemappen der skal vises"
 
@@ -3237,96 +3937,6 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "SMTOTFL"
 
-#: calendar/pcs/query.c:218
-msgid "time-now expects 0 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:242
-msgid "make-time expects 1 argument"
-msgstr ""
-
-#: calendar/pcs/query.c:247
-msgid "make-time expects argument 1 to be a string"
-msgstr ""
-
-#: calendar/pcs/query.c:255
-msgid "make-time argument 1 must be an ISO 8601 date/time string"
-msgstr ""
-
-#: calendar/pcs/query.c:281
-msgid "time-add-day expects 2 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:286
-msgid "time-add-day expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:293
-msgid "time-add-day expects argument 2 to be an integer"
-msgstr ""
-
-#: calendar/pcs/query.c:318
-msgid "time-day-begin expects 1 argument"
-msgstr ""
-
-#: calendar/pcs/query.c:323
-msgid "time-day-begin expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:348
-msgid "time-day-end expects 1 argument"
-msgstr ""
-
-#: calendar/pcs/query.c:353
-msgid "time-day-end expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:389
-msgid "get-vtype expects 0 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:472
-msgid "occur-in-time-range? expects 2 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:477
-msgid "occur-in-time-range? expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:484
-msgid "occur-in-time-range? expects argument 2 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:611
-msgid "contains? expects 2 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:616
-msgid "contains? expects argument 1 to be a string"
-msgstr ""
-
-#: calendar/pcs/query.c:623
-msgid "contains? expects argument 2 to be a string"
-msgstr ""
-
-#: calendar/pcs/query.c:640
-msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
-msgstr ""
-
-#: calendar/pcs/query.c:678
-msgid "has-categories? expects at least 1 argument"
-msgstr ""
-
-#: calendar/pcs/query.c:684
-msgid "has-categories? expects all arguments to be strings"
-msgstr ""
-
-#: calendar/pcs/query.c:932
-msgid "Evaluation of the search expression did not yield a boolean value"
-msgstr ""
-
 #: camel/camel-cipher-context.c:171
 #, fuzzy
 msgid "Signing is not supported by this cipher"
@@ -3352,64 +3962,81 @@ msgstr "Den angivne type er ikke understЬttet i denne gemning"
 msgid "Decryption is not supported by this cipher"
 msgstr "Den angivne type er ikke understЬttet i denne gemning"
 
-#: camel/camel-disco-store.c:271
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+#, fuzzy
+msgid "Resynchronizing with server"
+msgstr "Synkroniserer mappe"
+
+#: camel/camel-disco-store.c:305
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr ""
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "Henter besked %d (%d%%)"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
-#, c-format
-msgid "Failed message %d"
-msgstr ""
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, fuzzy, c-format
+msgid "Failed on message %d"
+msgstr "Fejlede ved besked %d af %d"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "Kan ikke Еbne besked"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "Synkroniserer mappe"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-msgid "Complete"
-msgstr "FФrdig"
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Henter besked %d af %d"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fejlede ved besked %d af %d"
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -3441,14 +4068,33 @@ msgstr ""
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Ugyldig type i krop-beholder, forventer streng"
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Kunne ikke oprette rЬr: %s"
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Kan ikke fЕ fat pЕ mappe: %s: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "Kunne ikke udfЬre fork: %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Kunne ikke oprette lЕsefil for %s: %s"
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "Tidsafbrud ved ventning pЕ lЕsefil for %s. PrЬv igen senere."
@@ -3463,163 +4109,112 @@ msgstr "Kunne ikke fЕ fat pЕ lЕs ved brug af fcntl(2): %s "
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Kunne ikke fЕ fat pЕ lЕs ved brug af flock(2): %s"
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Kunne ikke tjekke e-post fil %s: %s"
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Kunne ikke Еbne postfil %s: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Kunne ikke Еbne midlertidig postfil %s: %s"
 
-#: camel/camel-movemail.c:199
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Kunne ikke tjekke lЕsefil for %s: %s"
-
-#: camel/camel-movemail.c:245
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Fejl ved lФsning af postfil: %s"
-
-#: camel/camel-movemail.c:256
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Fejl ved skriving af midlertidig fil: %s"
-
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Kunne ikke gemme post i midlertidig fil %s: %s"
 
-#: camel/camel-movemail.c:306
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Kunne ikke oprette rЬr: %s"
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Kunne ikke udfЬre fork: %s"
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail-programmet mislykkedes: %s"
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Ukendt fejl)"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Fejl ved lФsning af postfil: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Fejl ved skriving af midlertidig fil: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:190
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Indtast venligst din %s adgangskode for %s"
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Indtast venligst din %s adgangskode"
 
-#: camel/camel-pgp-context.c:511
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:518 camel/camel-pgp-context.c:690
-#: camel/camel-pgp-context.c:1057 camel/camel-pgp-context.c:1269
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Ingen adgangskode oplyst."
 
-#: camel/camel-pgp-context.c:524 camel/camel-pgp-context.c:696
-#: camel/camel-pgp-context.c:879 camel/camel-pgp-context.c:1064
-#: camel/camel-pgp-context.c:1276
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Kunne ikke oprette rЬr til GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:683
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:873
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr ""
 
-#: camel/camel-pgp-context.c:890
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Kunne ikke oprette midlertidig fil: %s"
 
-#: camel/camel-pgp-context.c:1047
+#: camel/camel-pgp-context.c:1063
 #, fuzzy
 msgid "No plaintext to encrypt."
 msgstr "Klik pЕ ikonen for at dekryptere."
 
-#: camel/camel-pgp-context.c:1073
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "Ingen modtagere specificeret"
 
-#: camel/camel-pgp-context.c:1261
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr ""
 
-#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:195
-#, fuzzy, c-format
-msgid "Please enter your password for %s"
-msgstr "Indtast venligst din %s adgangskode for %s"
-
-#: camel/camel-pkcs7-context.c:213 camel/camel-smime-context.c:211
-#, fuzzy
-msgid "Error hashing password."
-msgstr "Fejl under gemning af genveje."
-
-#: camel/camel-pkcs7-context.c:222 camel/camel-smime-context.c:220
-msgid "Invalid password."
-msgstr "Ugyldig adgangskode."
-
-#: camel/camel-pkcs7-context.c:329 camel/camel-smime-context.c:328
-#, fuzzy, c-format
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr "Kunne ikke oprette lЕsefil for %s: %s"
-
-#: camel/camel-pkcs7-context.c:378
-#, fuzzy, c-format
-msgid "Could not clearsign: certificate not found for \"%s\"."
-msgstr "Kunne ikke oprette lЕsefil for %s: %s"
-
-#: camel/camel-pkcs7-context.c:567 camel/camel-smime-context.c:529
-msgid "Could not encrypt: failed to create enveloped data."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:590 camel/camel-smime-context.c:536
-msgid "Could not encrypt: failed to create encryption context."
-msgstr ""
-
-#: camel/camel-pkcs7-context.c:620 camel/camel-smime-context.c:571
-#, fuzzy, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr "Kunne ikke koble til tjener: %s."
-
-#: camel/camel-pkcs7-context.c:626 camel/camel-smime-context.c:577
-#, fuzzy
-msgid "Could not encrypt: encoding failed."
-msgstr "Kunne ikke oprette rЬr: %s"
-
-#: camel/camel-pkcs7-context.c:677 camel/camel-smime-context.c:627
-msgid "Failed to decrypt: Unknown"
-msgstr ""
-
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -3650,7 +4245,7 @@ msgid "Connection cancelled"
 msgstr "Forbindelse annulleret"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunne ikke koble til %s (port %d): %s"
@@ -3659,13 +4254,13 @@ msgstr "Kunne ikke koble til %s (port %d): %s"
 msgid "(unknown host)"
 msgstr "(ukendt vФrt)"
 
-#: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
-#: camel/camel-remote-store.c:470
-#: camel/providers/imap/camel-imap-command.c:287
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "Handling annulleret"
 
-#: camel/camel-remote-store.c:476
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "Server frakoblet uventet"
 
@@ -3764,7 +4359,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:433
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "Forkert autoriseringsbesked fra server."
 
@@ -3834,7 +4429,7 @@ msgstr "For lФsning af e-post som en anmodning pЕ et andet sФt af mapper"
 msgid "No provider available for protocol `%s'"
 msgstr "Ingen udbyder tilgФngelig for protokol `%s'"
 
-#: camel/camel-session.c:479
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3843,45 +4438,53 @@ msgstr ""
 "Kan ikke oprette katalog %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:344
-#, fuzzy
-msgid "Could not sign: failed to create content info."
-msgstr "Kan ikke oprette komponeringsvinduet."
+#: camel/camel-smime-context.c:173
+#, fuzzy, c-format
+msgid "Please enter your password for %s"
+msgstr "Indtast venligst din %s adgangskode for %s"
 
-#: camel/camel-smime-context.c:351
-msgid "Could not sign: failed to create signing context."
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
 msgstr ""
 
-#: camel/camel-smime-context.c:357
-#, fuzzy
-msgid "Could not sign: failed to create signature."
-msgstr "Kunne ikke indlФse sammendrag for %s"
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "Den fil eksisterer ikke."
 
-#: camel/camel-smime-context.c:384
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "Den fil eksisterer ikke."
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, fuzzy, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "Kunne ikke oprette lЕsefil for %s: %s"
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
 #, fuzzy
-msgid "'clearsign' is not supported by S/MIME."
-msgstr "Den angivne type er ikke understЬttet i denne gemning"
+msgid "Failed to decode message."
+msgstr "VedhФft bilag til meddelelsen"
 
-#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:1007 mail/mail-ops.c:1014
-#: mail/mail-ops.c:1032 mail/mail-ops.c:1033
-msgid "Trash"
-msgstr "Papirkurv"
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:348
-#, c-format
+#: camel/camel-tcp-stream-openssl.c:415
+#, fuzzy, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
-msgstr ""
+"Issuer: %s\n"
+"Subject: %s"
+msgstr "Emne er %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:428 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3891,24 +4494,29 @@ msgid ""
 "Do you wish to accept anyway?"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:423
-#, fuzzy, c-format
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
 msgid ""
-"Issuer: %s\n"
-"Subject: %s"
-msgstr "Emne er %s"
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
 
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "Ingen sЕdan besked: %s"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "Ingen sЕdan besked: %s"
@@ -3920,64 +4528,75 @@ msgstr ""
 "Du kan kun redigere beskeder lagret\n"
 "i Skitse-kataloget."
 
-#: camel/providers/imap/camel-imap-message-cache.c:150
-#, fuzzy, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Kan ikke oprette katalog %s: %s"
-
-#: camel/providers/imap/camel-imap-command.c:232
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Uventet svar fra IMAP-tjener: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommando mislykkedes: %s"
 
-#: camel/providers/imap/camel-imap-command.c:241 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Ukendt fejl"
-
-#: camel/providers/imap/camel-imap-command.c:295
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "Serversvar afsluttet for tidligt."
 
-#: camel/providers/imap/camel-imap-command.c:487
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Svar fra IMAP-tjener indeholdt ikke %s-information"
 
-#: camel/providers/imap/camel-imap-command.c:524
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventet svar 'OK' fra IMAP-tjener: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:172
+#: camel/providers/imap/camel-imap-folder.c:192
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kan ikke oprette katalog %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke indlФse sammendrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:364
-msgid "Scanning IMAP folder"
-msgstr "Skanner IMAP-mapper"
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
+msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1047
-#: camel/providers/imap/camel-imap-folder.c:1281
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "Gemmer beskeder"
+
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1075
-#: camel/providers/imap/camel-imap-folder.c:1314
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Gemmer beskeder"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finde beskedskrop i FETCH-svar."
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:13
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, fuzzy, c-format
+msgid "Could not open cache directory: %s"
+msgstr "Kan ikke oprette katalog %s: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "Tjekker for nyt post"
 
@@ -3985,7 +4604,7 @@ msgstr "Tjekker for nyt post"
 msgid "Check for new messages in all folders"
 msgstr "Tjek for nye beskeder i alle mapper"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:552
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Mapper"
 
@@ -4019,28 +4638,28 @@ msgstr ""
 "Dette valg vil lade dig koble til en IMAP-tjener ved at bruge en "
 "klartekst-adgangskode."
 
-#: camel/providers/imap/camel-imap-store.c:456
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:466
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen stЬtte for autenticeringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:490
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIndtast venligst IMAP-adgangskode for %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:505
-#: camel/providers/smtp/camel-smtp-transport.c:410
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "Du indtastede ikke en adgangskode."
 
-#: camel/providers/imap/camel-imap-store.c:531
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4051,36 +4670,51 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:803 mail/mail-local.c:334
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "MH-formaterede postkataloger"
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr "For gemning af lokal e-post i MH-lignende beskedskataloger "
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr "Standard Unix-postkassefil"
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr "For gemning af lokal e-post i standard mbox format"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr "Qmail maildir-formaterede postfiler"
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr "For gemning af lokal e-post i qmail beskedskataloger"
 
+#: camel/providers/local/camel-local-provider.c:70
+#, fuzzy
+msgid "Unix mbox spool-format mail files"
+msgstr "Qmail maildir-formaterede postfiler"
+
+#: camel/providers/local/camel-local-provider.c:71
+#, fuzzy
+msgid "For storing local mail in standard Unix spool directories"
+msgstr "For gemning af lokal e-post i qmail beskedskataloger"
+
 #: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Gemme-rod %s er ikke en absolut sti"
@@ -4120,24 +4754,24 @@ msgstr "Kunne ikke slette oversigtsfil `%s': %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunne ikke slette indeksfil `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Kan ikke tilfЬje besked i maildir-mappe: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4146,18 +4780,19 @@ msgstr ""
 "Kan ikke hente besked: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "Ingen sЕdan besked"
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr "Ugyldigt indhold af meddelelse"
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4167,14 +4802,14 @@ msgstr ""
 "Kan ikke Еbne mappe `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mappen `%s' eksisterer ikke."
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4184,22 +4819,29 @@ msgstr ""
 "Kunne ikke oprette mappe `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' er ikke et maildir katalog."
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kunne ikke slette mappe `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "ikke et maildir katalog"
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"Kunne ikke oprette mappe `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-maildir-summary.c:405
 #: camel/providers/local/camel-maildir-summary.c:526
 #, fuzzy, c-format
@@ -4207,11 +4849,13 @@ msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Kan ikke Еbne postboks: %s: %s\n"
 
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kan ikke Еbne postboks: %s: %s\n"
@@ -4221,9 +4865,12 @@ msgstr "Kan ikke Еbne postboks: %s: %s\n"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan ikke tilfЬje besked i mbox-filen: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4232,11 +4879,13 @@ msgstr ""
 "Kan ikke hente besked: %s fra mappe %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappen set ud til at vФre uigenkaldeligt Ьdelagt."
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Fremstilling af besked mislykkedes: Er postkassen Ьdelagt?"
 
@@ -4282,36 +4931,45 @@ msgstr "Mappen `%s' er ikke tom. Ikke slettet."
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
 #: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "Laver sammendrag for mappe"
 
 #: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "Kunne ikke Еbne mappe: %s: summerer fra position %ld: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Uoprettelig fejl ved fortolkning af post nФr position %ld i mappe %s"
 
 #: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Kan ikke lave oversigt over folder: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1397
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Synkroniserer mappe"
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Kunne ikke Еbne folder der skal laves oversigt for: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan ikke Еbne midlertidig postboks: %s"
@@ -4320,21 +4978,28 @@ msgstr "Kan ikke Еbne midlertidig postboks: %s"
 #: camel/providers/local/camel-mbox-summary.c:557
 #: camel/providers/local/camel-mbox-summary.c:746
 #: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Oversigt og mappe uoverensstemmelse, selv efter synkronisering"
 
 #: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fejl under skriving til midlertidig postboks: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Fejl under skriving til midlertidig postboks: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:635
 #: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikke lukke kildemappe %s: %s"
@@ -4349,13 +5014,14 @@ msgstr "Kunne ikke lukke midlertidig mappe: %s"
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikke Фndre navn pЕ mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ukendt fejl: %s"
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Kan ikke tilfЬje besked i mh-mappe: %s: %s"
@@ -4370,39 +5036,95 @@ msgstr "`%s' er ikke et katalog."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Kan ikke Еbne postboks: %s: %s\n"
 
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "Kan ikke tilfЬje besked i mbox-filen: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "`%s' er ikke en almindelig fil."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "Mappen `%s' eksisterer ikke."
+
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy
+msgid "Spool stores do not have an inbox"
+msgstr "Lokale gemmesteder har ikke en indbakke"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Lokal e-post-fil %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+#, fuzzy
+msgid "Spool folders cannot be renamed"
+msgstr "Lokale mapper kan ikke vФre rekursive."
+
+#: camel/providers/local/camel-spool-store.c:230
+#, fuzzy
+msgid "Spool folders cannot be deleted"
+msgstr "Lokale mapper kan ikke vФre rekursive."
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "Kunne ikke Еbne midlertidig postfil %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "Kunne ikke lukke kildemappe %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Venligst indtast NNTP-adgangskode for %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "Tjeneren godtog ikke brugernavn"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "Fejl ved sending af brugernavn til tjener"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "Tjeneren godtog ikke brugernavn/adgangskode"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "Besked %s ikke fundet"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "Kunne ikke hente gruppeliste fra tjeneren."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Kunne ikke indlФse gruppelistefil for %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Kunne ikke gemme gruppelistefil for %s: %s"
@@ -4417,17 +5139,17 @@ msgstr ""
 "Dette er en udbyder for lФsning af og postning af indlФg til USENET "
 "nyhedsgrupper."
 
-#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Kunne ikke Еbne katalog for news-tjener: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET-nyheder via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4435,8 +5157,8 @@ msgstr ""
 "Dette alternativ vil autenticere mod NNTP-tjeneren ved brug af klartekst "
 "adgangskode."
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Kunne ikke Еbne eller oprette .newsrc-fil for %s: %s"
@@ -4487,7 +5209,7 @@ msgstr "Efterlad beskeder pЕ tjeneren"
 msgid "Delete after %s day(s)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:51
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4582,7 +5304,7 @@ msgid "No such folder `%s'."
 msgstr "Ingen sЕdan mappe `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4636,7 +5358,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Levering af e-post via sendmail programmet"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:62
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4644,122 +5366,122 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "For levering af e-post via en ekstern e-posttjener med SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:168
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaksfejl, kommando ikke genkendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Kommando ikke implimenteret"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "HjФlpebesked"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Tjeneste parat"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "Transaktionen mislykkedes"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr "AdganggskodeoverfЬring krФves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "Autenticeringsmekanismen er for svag"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Kryptering krФves for forespurgt autenticeringsmekanisme"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "Midlertidig autenticeringsfejl"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "Autenticering krФves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:313
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Velkomst fejl ved svar: %s: formentlig ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:356
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:395
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sVenligst indtast SMTP-adgangskode for %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:418
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4770,319 +5492,235 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:534
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-tjener %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-levering af e-post via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr "Kan ikke sende besked: afsenderadresse ikke defineret."
 
-#: camel/providers/smtp/camel-smtp-transport.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende besked: afsenderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "Sender meddelelse"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan ikke sende besked: ingen modtagere defineret."
 
-#: camel/providers/smtp/camel-smtp-transport.c:676
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO anmodning overskred tid: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:695
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO fejl ved svar: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#: camel/providers/smtp/camel-smtp-transport.c:755
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Godkendelse"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Tidsafbrud for AUTH-forespЬrgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:782
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "Tidsafbrud for AUTH-forespЬrgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:809
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr "Ugyldigt svar pЕ autenticering fra tjener.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:835
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM anmodning overskred tid: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:854
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "MAIL FROM fejl ved svar: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO anmodning overskred tid: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:898
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Fejl ved \"RCPT TO\"-svar: %s: besked ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:929
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA anmodning overskred tid: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:948
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA fejl ved svar: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "DATA sending overskred tid: Besked afbrudt: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "DATA fejl ved svar: Besked afbrudt: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET-anmodning overskred tid: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1043
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET fejl ved svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT-anmodning overskred tid: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT fejl ved svar: %s: ikke-fatal"
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u byte"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fk"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:122
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "bilag"
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "VedhФft en fil"
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern valgte punkter fra bilagslisten"
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "VedhФft bilag..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "VedhФft bilag til meddelelsen"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:9
-#: mail/message-list.c:1081
-msgid "Attachment"
-msgstr "Bilag"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "Egenskaber for bilag"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Filnavn:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr ""
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "MIME-type:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr ""
-
-#: composer/e-msg-composer.c:536
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"Kunne ikke Еbne signaturfilen %s:\n"
-"%s"
-
-#: composer/e-msg-composer.c:709
-msgid "Save as..."
-msgstr "Gem som..."
-
-#: composer/e-msg-composer.c:720
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Fejl ved gemning af fil: %s"
-
-#: composer/e-msg-composer.c:740
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Fejl ved indlФsning af fil: %s"
-
-#: composer/e-msg-composer.c:812
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-
-#: composer/e-msg-composer.c:870 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:224
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:876
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Denne meddelelse er ikke sendt.\n"
-"\n"
-"Vil du gemme Фndringene?"
-
-#: composer/e-msg-composer.c:901
-msgid "Open file"
-msgstr "еbn fil"
-
-#: composer/e-msg-composer.c:1027
-msgid "That file does not exist."
-msgstr "Den fil eksisterer ikke."
-
-#: composer/e-msg-composer.c:1037
-msgid "That is not a regular file."
-msgstr "Dette er ikke en almindelig fil."
-
-#: composer/e-msg-composer.c:1047
-msgid "That file exists but is not readable."
-msgstr "Den fil eksisterer men kan ikke lФses."
-
-#: composer/e-msg-composer.c:1057
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Den fil sЕ ud til at vФre tilgФngelig, men open(2) fejlede."
-
-#: composer/e-msg-composer.c:1079
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
 msgstr ""
-"Filen er meget stor (mere end 100 k).\n"
-"Er du sikker pЕ at du Ьnsker at indsФtte den?"
-
-#: composer/e-msg-composer.c:1100
-msgid "An error occurred while reading the file."
-msgstr "En fejl skete ved lФsning af filen."
 
-#: composer/e-msg-composer.c:1401 composer/e-msg-composer.c:1744
-msgid "Compose a message"
-msgstr "Skriv en meddelelse"
-
-#: composer/e-msg-composer.c:1835
-msgid "Could not create composer window."
-msgstr "Kan ikke oprette komponeringsvinduet."
-
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "Klik her for adressebogen"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:354 mail/mail-format.c:753
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "Fra:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:360 mail/mail-format.c:755
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:371 mail/mail-format.c:652
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:385 mail/mail-format.c:757
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:386
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "Indtast modtagerne for meddelelsen"
 
-#: composer/e-msg-composer-hdrs.c:389 mail/mail-format.c:759
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Kopi:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Indtast adresserne som skal modtage en kopi af meddelelsen"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "B-kopi:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5090,321 +5728,272 @@ msgstr ""
 "Indtast adresserne som skal modtage en kopi af meddelelsen uden at komme til "
 "syne i meddelelsens modtagerliste."
 
-#: composer/evolution-composer.c:355
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "VedhФft en fil"
+
+#: composer/e-msg-composer.c:670
+#, fuzzy, c-format
 msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
+"Could not open file %s:\n"
+"%s"
 msgstr ""
+"Kunne ikke Еbne fil `%s':\n"
+"%s"
 
-#: composer/evolution-composer.c:370
-msgid "Cannot initialize Evolution's composer."
-msgstr "Kan ikke initiere Evolutions composer."
-
-#: data/evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr "Evolution gruppevarepakke"
-
-#: data/evolution.keys.in.h:1
-msgid "address card"
-msgstr "Adressekort"
-
-#: data/evolution.keys.in.h:2
-msgid "calendar information"
-msgstr "Kalenderinformation"
-
-#. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
-msgid "%m/%d/%Y"
-msgstr "%Y-%m-%d"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
-msgstr " "
-
-#. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
-msgstr " "
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr ""
+"Fejl ved udfЬring af operation:\n"
+"%s"
 
-#. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: composer/e-msg-composer.c:873
+msgid "Save as..."
+msgstr "Gem som..."
 
-#. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
-msgid "%a %m/%d/%Y"
-msgstr "%a %Y-%m-%d"
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "Advarsel"
 
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
-msgid "%a %m/%d/%Y %H:%M"
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
 msgstr ""
 
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr ""
+#: composer/e-msg-composer.c:906
+#, c-format
+msgid "Error saving file: %s"
+msgstr "Fejl ved gemning af fil: %s"
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
-msgid "%H:%M"
-msgstr "%H:%M"
+#: composer/e-msg-composer.c:926
+#, c-format
+msgid "Error loading file: %s"
+msgstr "Fejl ved indlФsning af fil: %s"
 
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-msgid "%H:%M:%S"
+#: composer/e-msg-composer.c:997
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
 msgstr ""
 
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
-msgid "%I:%M %p"
-msgstr " "
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-msgid "%I:%M:%S %p"
-msgstr ""
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Fejl ved gemning af fil: %s"
 
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
+#: composer/e-msg-composer.c:1055
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "Kunne ikke hente besked fra POP-tjener %s: %s"
 
-#: executive-summary/component/e-summary.c:926
-#, c-format
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
 msgid ""
-"Cannot open the HTML file:\n"
+"Unable to seek on file: %s\n"
 "%s"
 msgstr ""
-"Kan ikke Еbne HTML-fil:\n"
-"%s"
+"Kunne ikke oprette uddatafil:  %s\n"
+" %s"
 
-#: executive-summary/component/e-summary.c:940
-#, c-format
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
 msgid ""
-"Error reading data:\n"
+"Unable to truncate file: %s\n"
 "%s"
 msgstr ""
+"Kunne ikke oprette uddatafil:  %s\n"
+" %s"
 
-#: executive-summary/component/e-summary.c:958
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:126
-msgid "Select a service"
-msgstr "VФlg tjeneste"
-
-#: executive-summary/component/e-summary-callbacks.c:290
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
 msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
+"Error autosaving message: %s\n"
+" %s"
 msgstr ""
+"Fejl ved gemning af beskeder til: %s:\n"
+" %s"
 
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
+#: composer/e-msg-composer.c:1173
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
+#: composer/e-msg-composer.c:1321
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
 msgstr ""
+"Denne meddelelse er ikke sendt.\n"
+"\n"
+"Vil du gemme Фndringene?"
 
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Send et brev til %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "фndr visningen til %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "KЬr %s"
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
 
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Luk %s"
+#: composer/e-msg-composer.c:1351
+msgid "Open file"
+msgstr "еbn fil"
 
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Flyt %s til venstre"
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "IndsФt tekstfil..."
 
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Flyt %s til hЬjre"
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+msgid "Compose a message"
+msgstr "Skriv en meddelelse"
 
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
+#: composer/e-msg-composer.c:2351
+msgid "Could not create composer window."
+msgstr "Kan ikke oprette komponeringsvinduet."
 
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
+#: composer/evolution-composer.c:359
+msgid ""
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "KonfigurИr %s"
+#: composer/evolution-composer.c:374
+msgid "Cannot initialize Evolution's composer."
+msgstr "Kan ikke initiere Evolutions composer."
 
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr ""
+#: data/evolution.desktop.in.h:2
+msgid "The Evolution groupware suite"
+msgstr "Evolution gruppevarepakke"
 
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr ""
+#: data/evolution.keys.in.h:1
+msgid "address card"
+msgstr "Adressekort"
 
-#: executive-summary/component/main.c:62
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
+#: data/evolution.keys.in.h:2
+msgid "calendar information"
+msgstr "Kalenderinformation"
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr ""
+#. strptime format for a date.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1480
+msgid "%m/%d/%Y"
+msgstr "%Y-%m-%d"
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
+#. strptime format for a time of day, in 12-hour format.
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+msgid "%I:%M:%S %p"
 msgstr ""
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+msgid "%H:%M:%S"
 msgstr ""
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "RDF-sammendrag"
+#. strptime format for time of day, without seconds, 12-hour format.
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
+msgstr " "
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr ""
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr ""
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%Y-%m-%d"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %Y-%m-%d"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Testtjeneste"
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
 
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "Fejl"
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:298
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
+msgid "%a %m/%d/%Y"
+msgstr "%a %Y-%m-%d"
 
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:303
+msgid "%a %m/%d/%Y %H:%M"
 msgstr ""
 
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update now"
-msgstr "OpdatИr nu"
-
-#: executive-summary/test-service/rdf-summary.c:795
-msgid "Update every "
-msgstr "_OpdatИr hver"
-
-#: executive-summary/test-service/rdf-summary.c:806
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "minutter"
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:312
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr ""
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "Еr"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "Еr"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "mЕned"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "mЕneder"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "uge"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "uger"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "dage"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "time"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "timer"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "minut"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "sekund"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "sekunder"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Du har glemt at vФlge en dato."
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Du har valgt en ugyldig dato."
 
-#: filter/filter-datespec.c:276
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -5414,7 +6003,7 @@ msgstr ""
 "nЕr filteret kЬres eller tiden nЕr vMappen\n"
 "Еbnes."
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5422,7 +6011,7 @@ msgstr ""
 "Beskedens dato vil blive sammenlignet med\n"
 "tiden du angive her."
 
-#: filter/filter-datespec.c:339
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5433,28 +6022,37 @@ msgstr ""
 "for eksempel \"for en uge siden\"."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "den aktuelle tid"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "et tidspunkt du angiver"
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "et tidspunkt relativt til den aktuelle tid"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Sammenlign med"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "nu"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+#, fuzzy
+msgid " ago"
+msgstr "siden"
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr "siden"
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<klik her for at vФlge en mappe>"
 
@@ -5479,8 +6077,8 @@ msgstr ""
 "Du glemte at vФlge en mappe.\n"
 "Venligst gЕ tilbage og specificИr en gyldig mappe for levering af e-post."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "VФlg mappe"
 
@@ -5492,46 +6090,6 @@ msgstr "Indtast URI for mappen"
 msgid "<click here to select a folder>"
 msgstr "<klik her for at vФlge en mappe>"
 
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "RedigИr filtre"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "RedigИr vMapper"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Indkommende"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "UdgЕende"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr "Visuelle mapper"
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr ""
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr "vMappe-kilder"
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr "med alle aktive fjernmapper"
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr "med alle lokale og aktive fjernmapper"
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr "med alle lokale mapper"
-
 #: filter/filter-input.c:193
 #, c-format
 msgid ""
@@ -5553,36 +6111,88 @@ msgstr "Regelnavn: "
 msgid "Untitled"
 msgstr "Uden navn"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "Hvis"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "UdfЬr handlinger"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "hvis alle kriterier er mЬdt"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "hvis et kriterie er mЬdt"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "TilfЬj kriterie"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "indkommende"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "udgЕende"
 
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "TilfЬj"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "RedigИr"
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "RedigИr filtre"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "RedigИr vMapper"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "Indkommende"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "UdgЕende"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr "Visuelle mapper"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr ""
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "vMappe-kilder"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "med alle aktive fjernmapper"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "med alle lokale og aktive fjernmapper"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "med alle lokale mapper"
+
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
+#, fuzzy
+msgid "Assign Color"
 msgstr "Giv farve"
 
 #: filter/libfilter-i18n.h:4
@@ -5658,90 +6268,91 @@ msgid "Expression"
 msgstr "Udtryk"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "Videresend til adresse"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "Vigtig"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "er"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "er stЬrre end"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "er mindre end"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "er ikke"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Diskussionsliste"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Beskedskrop"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Beskedshoved"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Beskeden blev modtaget"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Beskeden blev sendt"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Flyt til folder"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr "pЕ eller efter"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr "pЕ eller fЬr"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "LФst"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Modtagere"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Passer pЕ regulФrt udtryk"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Svaret til"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.c:1081
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Point"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Afsender"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "_SФt Status"
 
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "StЬrrelse"
+
 #: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "lyder som"
@@ -5762,7 +6373,8 @@ msgstr "starter med"
 msgid "Stop Processing"
 msgstr "Stop behandling"
 
-#: filter/libfilter-i18n.h:51 mail/message-list.c:1082
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Emne"
 
@@ -5790,246 +6402,263 @@ msgstr "фndr regel"
 msgid "Score Rules"
 msgstr ""
 
-#: importers/elm-importer.c:512 importers/netscape-importer.c:780
-#: importers/pine-importer.c:646 shell/e-shell-importer.c:655
-#: shell/importer/import.glade.h:4
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "ImportИr"
 
-#: importers/elm-importer.c:517 importers/netscape-importer.c:785
-#: importers/pine-importer.c:651
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
 msgid "Mail"
 msgstr "Epost"
 
-#: importers/elm-importer.c:521
-msgid "Elm Aliases"
-msgstr ""
-
-#: importers/elm-importer.c:528 importers/netscape-importer.c:807
-#: importers/pine-importer.c:668
-msgid "Don't ask me again"
-msgstr ""
-
-#: importers/elm-importer.c:561
+#: importers/elm-importer.c:498
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/elm-importer.c:579
+#: importers/elm-importer.c:527
 #, fuzzy
 msgid "Elm mail"
 msgstr "Epost"
 
-#: importers/evolution-gnomecard-importer.c:156
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+msgid "Addressbook"
+msgstr "Adressebog"
+
+#: importers/evolution-gnomecard-importer.c:253
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:790 importers/pine-importer.c:656
+#: importers/netscape-importer.c:824
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: importers/netscape-importer.c:795 mail/mail-callbacks.c:1472
-msgid "Filters"
-msgstr "Filtre"
-
-#: importers/netscape-importer.c:800
-msgid "Addressbooks"
-msgstr "AdressebЬger"
-
-#: importers/netscape-importer.c:847
+#: importers/netscape-importer.c:849
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:661
-msgid "Addressbook"
-msgstr "Adressebog"
-
-#: importers/pine-importer.c:705
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 msgid "Pine mail"
 msgstr "Pine-post"
 
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "Evolution komponent til hЕndtering af post."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr "Evolution beskedskriver."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr "Fabrik for Evolution beskedskriver."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr "Fabrik for Evolution postkomponent."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "Konfiguration af epost"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "Egenska_ber..."
+
 #: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "фndr filens egenskaber"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initialisere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:410
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere gemning i skallen"
 
-#: mail/folder-browser.c:270
+#: mail/folder-browser-ui.c:254
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Egenskaber for \"%s\""
+
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr "Egenskaber"
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Kunne ikke oprette midlertidig katalog: %s"
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "Gem sЬgning som vMappe"
 
-#: mail/folder-browser.c:594
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr "VFolder pЕ e_mne"
 
-#: mail/folder-browser.c:597
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "vMappe for _afsender"
 
-#: mail/folder-browser.c:600
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "vMappe for _modtagere"
 
-#: mail/folder-browser.c:603
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr "Vfolder efter diskussions_liste"
 
-#: mail/folder-browser.c:609
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "FiltrИr efter emne"
 
-#: mail/folder-browser.c:612
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "FiltrИr efter afsender"
 
-#: mail/folder-browser.c:615
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "FiltrИr efter modtager"
 
-#: mail/folder-browser.c:618
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "FiltrИr efter diskussionsliste"
 
-#: mail/folder-browser.c:627
-msgid "_Open"
-msgstr "_еbn"
-
-#: mail/folder-browser.c:629
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Gensend"
 
-#: mail/folder-browser.c:631 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:118 ui/evolution-tasks.xml.h:8
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "_Gem som..."
 
-#: mail/folder-browser.c:633 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "_Udskriv"
 
-#: mail/folder-browser.c:638 ui/evolution-mail.xml.h:117
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "Svar til afsende_r"
 
-#: mail/folder-browser.c:640 ui/evolution-mail.xml.h:72
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "Svar til _alle"
+
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:642
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "MФr_k som lФst"
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "MФrk som u_lФst"
 
-#: mail/folder-browser.c:652
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "Vigtig"
+
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "MarkИr som ulФst"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "_Flyt til mappe..."
 
-#: mail/folder-browser.c:654
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "_KopiИr til mappe..."
 
-#: mail/folder-browser.c:658 ui/evolution-mail.xml.h:121
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "_Fortryd sletning"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:668
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "TilfЬj adressebog"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Anvend filtre"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "Skab rege_l fra besked"
 
-#: mail/folder-browser.c:811
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "FiltrИr efter epostliste"
 
-#: mail/folder-browser.c:812
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "vMappe efter diskussionsliste"
 
-#: mail/folder-browser.c:814
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "FiltrИr efter diskussionsliste (%s)"
 
-#: mail/folder-browser.c:815
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "vMappe efter diskussionsliste (%s)"
 
-#: mail/folder-browser-factory.c:196
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Egenskaber for \"%s\""
-
-#: mail/folder-browser-factory.c:198 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Egenskaber"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "Evolution komponent til hЕndtering af post."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Evolution beskedskriver."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Fabrik for Evolution beskedskriver."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Fabrik for Evolution postkomponent."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-#, fuzzy
-msgid "Mail configuration interface"
-msgstr "Konfiguration af epost"
-
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
 msgid "Factory to import mbox into Evolution"
@@ -6080,37 +6709,69 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
 msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Evolution kontoredigering"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Evolution kontoredigering"
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "Signaturfil:"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Denne meddelelse er ikke sendt.\n"
+"\n"
+"Vil du gemme Фndringene?"
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr " (standard)"
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "DeaktivИr"
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:30
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "AktivИr"
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker pЕ at du vil slette denne konto?"
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Fortryd sletning"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "GЬr dette til min standardkonto"
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr "Er du sikker pЕ at du vil slette denne nyhedskonto?"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:568
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Evolution kontobehandler"
 
@@ -6178,37 +6839,45 @@ msgstr ""
 "Denne meddelse har intet emne.\n"
 "Skal den sendes alligevel?"
 
-#: mail/mail-callbacks.c:311
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr "Du skal specificere modtagere for at kunne sende denne besked."
 
-#: mail/mail-callbacks.c:354
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr "Du skal konfigurere en konto fЬr du kan sende dette brev."
 
-#: mail/mail-callbacks.c:593
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "Den %s skrev %s:"
 
-#: mail/mail-callbacks.c:755
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Videresendt meddelelse:\n"
 
-#: mail/mail-callbacks.c:849
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "Flyt meddelelse(r) til"
 
-#: mail/mail-callbacks.c:851
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "KopiИr meddelelse(r) til"
 
-#: mail/mail-callbacks.c:1130
+#: mail/mail-callbacks.c:1374
 #, fuzzy, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Er du sikker pЕ at du vil slette opgaven '%s'?"
 
-#: mail/mail-callbacks.c:1152
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6216,7 +6885,7 @@ msgstr ""
 "Du kan kun redigere beskeder lagret\n"
 "i Skitse-kataloget."
 
-#: mail/mail-callbacks.c:1186
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6224,37 +6893,25 @@ msgstr ""
 "Du kan kun sende beskeder igen\n"
 "som er gemt i sendt-kataloget."
 
-#: mail/mail-callbacks.c:1198
+#: mail/mail-callbacks.c:1442
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Er du sikker pЕ at du vil slette opgaven '%s'?"
 
-#: mail/mail-callbacks.c:1219
+#: mail/mail-callbacks.c:1463
 #, fuzzy
 msgid "No Message Selected"
 msgstr "Beskeden blev modtaget"
 
-#: mail/mail-callbacks.c:1253 mail/mail-display.c:92
-msgid "Overwrite file?"
-msgstr "Overskriv fil?"
-
-#: mail/mail-callbacks.c:1257 mail/mail-display.c:96
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"En fil med samme navn eksisterer allerede.\n"
-"Overskriv den?"
-
-#: mail/mail-callbacks.c:1301
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Gem besked som..."
 
-#: mail/mail-callbacks.c:1303
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Gem beskeder som..."
 
-#: mail/mail-callbacks.c:1462
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6263,23 +6920,23 @@ msgstr ""
 "Fejl ved indlФsning af filter information:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1520
+#: mail/mail-callbacks.c:1776
+msgid "Filters"
+msgstr "Filtre"
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Udskriv besked"
 
-#: mail/mail-callbacks.c:1567
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "Udskrivning af besked mislykkedes"
 
-#: mail/mail-callbacks.c:1662
+#: mail/mail-callbacks.c:1966
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Er du sikker pЕ at du vil slette denne nyhedskonto?"
 
-#: mail/mail-config.c:1199 mail/mail-config.c:1202
-msgid "Connecting to server..."
-msgstr "Opkobler til server..."
-
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -6320,10 +6977,14 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:445
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr "Evolution konto-guide"
 
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
+msgstr "Opkobler til server..."
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr " Tjek for stЬttede typer"
@@ -6333,42 +6994,63 @@ msgid " color"
 msgstr " farve"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Den angivne type er ikke understЬttet i denne gemning"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Konto"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "kontoinformation"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "Kontoadministration"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Konti"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
 msgid "Always load images off the net"
 msgstr "IndlФs aftid billeder fra nettet"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Bilag"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Godkendelse"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Godkendelsestype: "
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "Tjek automatisk for nye beskeder hvert"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
 msgid "Composer"
 msgstr "Beskedskriver"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6380,349 +7062,530 @@ msgstr ""
 "Din epost-konfiguration er nu komplet.\n"
 "Klik \"FuldfЬr\" for at gemme dine nye indstillinger"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "Standard"
 
-#: mail/mail-config.glade.h:22
-msgid "Default \"Forward\" style is: "
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "FФrdig"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Kladder"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Kladdemappe:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "RedigИr..."
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "Epostadresse:"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "AktivИr"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Fulde navn:"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
+msgstr ""
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "Signaturfil:"
+
+#: mail/mail-config.glade.h:43
 msgid "Highlight citations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:47
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:48
 msgid "Inline"
 msgstr "Vis i brev"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:50
 msgid "Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "Konfiguration af epost"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Postkasseformat"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "GЬr dette til min standardkonto"
 
-#: mail/mail-config.glade.h:42
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
+msgstr "Udskriv den valgte meddelelse"
+
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "Tjenertype:"
+
+#: mail/mail-config.glade.h:59
 msgid "Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "Nyheder"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: mail/mail-config.glade.h:49
-msgid "PGP"
-msgstr "PGP"
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "PGP binФrsti:"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "VФlg en farve"
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Prompt when sending messages with an empty subject"
+msgstr "Legger til en melding uten emne"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "Kan ikke sende besked: ingen modtagere defineret."
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Quoted"
 msgstr "BemФrkning"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "Modtager post"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "Modtager post"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "Secure MIME"
+msgstr "IMAPv4"
+
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Security"
+msgstr "_Sikkerhed"
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "VФlg PGP binФr"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "Sender post"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "Sender post"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "Sendt"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Konfiguration af tjener"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Tjenertype:"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Server krФver autentificering"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "Kilder"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Ingen information"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Kilder"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "Specielle mapper"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr "Standard-Unix mbox"
 
-#: mail/mail-config.glade.h:78
-msgid "Type"
-msgstr "Type"
-
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "Brug sikker forbindelse (SSL)"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Brugernavn:"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:86 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:33
-msgid "_Edit"
-msgstr "_RedigИr"
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "newswindow1"
+msgstr "nu"
+
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
+msgstr ""
+
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr "sekunder."
+
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "Kunne ikke indlФse sammendrag for %s"
+
+#: mail/mail-crypto.c:86
+#, fuzzy
+msgid "Could not create a PGP verification context."
+msgstr ""
+"Kunne ikke oprette mappe `%s':\n"
+"%s"
+
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr ""
+"Kunne ikke oprette mappe `%s':\n"
+"%s"
+
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
+msgstr ""
+"Kunne ikke oprette mappe `%s':\n"
+"%s"
+
+#: mail/mail-crypto.c:177
+#, fuzzy
+msgid "Could not create a S/MIME signature context."
+msgstr "Kunne ikke indlФse sammendrag for %s"
+
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
+msgstr ""
+
+#: mail/mail-crypto.c:240
+#, fuzzy
+msgid "Could not create a S/MIME encryption context."
+msgstr ""
+"Kunne ikke oprette mappe `%s':\n"
+"%s"
+
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "Kunne ikke koble til POP-tjener pЕ %s."
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr ""
+"Kunne ikke oprette mappe `%s':\n"
+"%s"
 
-#: mail/mail-display.c:196
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Gem bilag"
 
-#: mail/mail-display.c:236
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Kunne ikke oprette midlertidig katalog: %s"
-
-#: mail/mail-display.c:297
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Gem pЕ disk..."
 
-#: mail/mail-display.c:299
-#, c-format
-msgid "Open in %s..."
-msgstr "еbn i %s..."
-
-#: mail/mail-display.c:301
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "Vis i brev"
 
-#: mail/mail-display.c:336
-msgid "External Viewer"
-msgstr "Ekstern visning"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "еbn i %s..."
 
-#: mail/mail-display.c:359
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vis i brev (via %s)"
 
-#: mail/mail-display.c:363
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-display.c:962
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "Ekstern visning"
+
+#: mail/mail-display.c:1048
 msgid "Loading message content"
 msgstr "IndlФser indholdet af beskeden"
 
-#: mail/mail-display.c:1253
-msgid "Open link in browser"
-msgstr ""
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
+msgstr "_еpne i nytt vindu"
+
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "KopiИr placering (RETMIG)"
 
-#: mail/mail-display.c:1255
-msgid "Save as (FIXME)"
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
 msgstr "Gem som (RETMIG)"
 
-#: mail/mail-display.c:1257
-msgid "Copy location (FIXME)"
-msgstr "KopiИr placering (RETMIG)"
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "Gem som..."
+
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr " %d sekunder"
 
-#: mail/mail-format.c:527
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s-bilag"
 
-#: mail/mail-format.c:573
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:1029
+#: mail/mail-format.c:746
+msgid "Date"
+msgstr "Dato"
+
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "Epostadresse:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr "Afsender"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "Svar-til:"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "Modtager"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Kopi:"
+
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr ""
 
-#: mail/mail-format.c:1044
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "Krypteret besked ikke vist"
 
-#: mail/mail-format.c:1050
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Krypteret besked"
 
-#: mail/mail-format.c:1051
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Klik pЕ ikonen for at dekryptere."
 
-#: mail/mail-format.c:1141 mail/mail-format.c:1527
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Denne besked er underskrevet digitalt og er fundet autentisk."
 
-#: mail/mail-format.c:1149 mail/mail-format.c:1535
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Denne besked er underskrevet digitalt, men er ikke fundet autentisk."
 
-#: mail/mail-format.c:1749
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peger til FTP-tjener (%s)"
 
-#: mail/mail-format.c:1761
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peger til lokal fil (%s) gyldig pЕ netsted \"%s\""
 
-#: mail/mail-format.c:1765
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peger til lokal fil (%s)"
 
-#: mail/mail-format.c:1799
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Peger til FTP-tjener (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peger til ukendt eksternt data (\"%s\"-type)"
 
-#: mail/mail-format.c:1804
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr "Fejludformet del for ekstern-krop."
 
-#: mail/mail-local.c:505
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "еbner '%s'"
 
-#: mail/mail-local.c:785
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "фndrer mappe \"%s\" til \"%s\" format"
 
-#: mail/mail-local.c:789
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "фndr mappe \"%s\" til \"%s\" format"
-
-#: mail/mail-local.c:812
-msgid "Reconfiguring folder"
-msgstr "_RekonfigurИr mappe"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:841
-msgid "Closing current folder"
-msgstr "Lukker aktiv mappe"
-
-#: mail/mail-local.c:873
-msgid "Renaming old folder and opening"
-msgstr "фndrer navn pЕ gammel mappe og genЕbner"
-
-#: mail/mail-local.c:891
-msgid "Creating new folder"
-msgstr "Opretter en ny mappe"
-
-#: mail/mail-local.c:905
-msgid "Copying messages"
-msgstr "Kopierer beskeder"
-
-#: mail/mail-local.c:922
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6731,7 +7594,7 @@ msgstr ""
 "Kan ikke gemme metainformation for mappe; du vil sandsynligvis\n"
 "ikke kunne Еbne denne mappe igen: %s"
 
-#: mail/mail-local.c:961
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6739,7 +7602,19 @@ msgstr ""
 "Hvis du ikke kan Еbne denne postboks igen skal\n"
 "du reparere den manuelt."
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr ""
+"Du kan kun redigere beskeder lagret\n"
+"i Skitse-kataloget."
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "KonfigurИr %s"
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6748,7 +7623,7 @@ msgstr ""
 "Fejl ved '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6757,101 +7632,105 @@ msgstr ""
 "Fejl ved udfЬring af operation:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:880
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Arbejder"
 
-#: mail/mail-mt.c:862
-msgid "Evolution progress"
-msgstr "Evolution fremgang"
-
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender '%s'"
 
-#: mail/mail-ops.c:603
-msgid "Sending message"
-msgstr "Sender meddelelse"
-
-#: mail/mail-ops.c:718
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:737
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:739 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "FuldfЬrt."
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Gemmer besked i mappe"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter meddelelser til %s"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer beskeder til %s"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Flytter"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "KopiИrer"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i '%s'"
 
-#: mail/mail-ops.c:1154
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "Papirkurv"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "Videresendte meddelelser"
 
-#: mail/mail-ops.c:1195 mail/mail-ops.c:1333
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "еbner mappe %s"
 
-#: mail/mail-ops.c:1262
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr "еbner lager %s"
 
-#: mail/mail-ops.c:1449
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "еbner mappe %s"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "_RekonfigurИr mappe"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "TЬmmer mappe for slettede beskeder"
 
-#: mail/mail-ops.c:1498
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Modtager meddelelse %s"
 
-#: mail/mail-ops.c:1565
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Modtager meddelelser"
 
-#: mail/mail-ops.c:1575
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Henter besked nummer %d af %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1649
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Gemmer beskeder"
 
-#: mail/mail-ops.c:1728
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6860,12 +7739,7 @@ msgstr ""
 "Kunne ikke oprette uddatafil:  %s\n"
 " %s"
 
-#: mail/mail-ops.c:1741
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Gemmer besked %d af %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6874,11 +7748,11 @@ msgstr ""
 "Fejl ved gemning af beskeder til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "Gemmer bilag"
 
-#: mail/mail-ops.c:1844
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6887,12 +7761,12 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1872
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:1939
+#: mail/mail-ops.c:2101
 #, fuzzy, c-format
 msgid "Disconnecting from %s"
 msgstr "Epost fra %s"
@@ -6901,250 +7775,176 @@ msgstr "Epost fra %s"
 msgid "(Untitled Message)"
 msgstr "(Unavngivet besked)"
 
-#: mail/mail-search.c:268
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Unavngivet besked)"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "Kopierer beskeder"
+
+#: mail/mail-search.c:284
 msgid "Find in Message"
 msgstr "Find i besked"
 
-#: mail/mail-search.c:298
+#: mail/mail-search.c:314
 msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-search.c:299
+#: mail/mail-search.c:315
 #, fuzzy
 msgid "Search Forward"
 msgstr "SЬg efter en streng"
 
-#: mail/mail-search.c:316
+#: mail/mail-search.c:332
 msgid "Find:"
 msgstr "Find:"
 
-#: mail/mail-search.c:319
+#: mail/mail-search.c:335
 msgid "Matches:"
 msgstr "Matcher:"
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "_SЬg"
-
-#: mail/mail-send-recv.c:138
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Afbryder..."
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "Send & modtag e-post"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "Modtager"
 
-#: mail/mail-send-recv.c:285
+#: mail/mail-send-recv.c:302
 msgid "Updating..."
 msgstr "Opdaterer..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "Sender"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "Afbrudt"
 
-#: mail/mail-summary.c:110
-msgid "Incomplete message written on pipe!"
-msgstr "UfuldstФndig meddelse skrevet til rЬr!"
-
-#: mail/mail-summary.c:468
-msgid "Mail Summary"
-msgstr "Sammendrag"
+#: mail/mail-session.c:171
+#, fuzzy
+msgid "User canceled operation."
+msgstr "Handling annulleret"
 
-#: mail/mail-tools.c:145
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Kunne ikke oprette midlertidig mbox '%s': %s"
 
-#: mail/mail-tools.c:192
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (videresendt meddelelse)"
-
-#: mail/mail-tools.c:202
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (uden emne)"
-
-#: mail/mail-tools.c:219
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt meddelelse - %s"
 
-#: mail/mail-tools.c:221
-msgid "Forwarded message (no subject)"
-msgstr "Videresendt meddelelse (intet emne)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Videresendte meddelelser"
 
-#: mail/mail-tools.c:428
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Videresendt besked---<br><b>Fra:</b> %s<br><b>Til:</b> "
-"%s<br><b>Emne:</b> %s<br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Videresendte meddelelser"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:438
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Ny vMappe"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:188 ui/evolution-mail.xml.h:70
-msgid "Reply"
-msgstr "Svar"
-
-#: mail/message-browser.c:188
-msgid "Reply to the sender of this message"
-msgstr "Svar til afsenderen af denne meddelelse"
-
-#: mail/message-browser.c:191 ui/evolution-mail.xml.h:71
-msgid "Reply to All"
-msgstr "Svar til alle"
-
-#: mail/message-browser.c:191
-msgid "Reply to all recipients of this message"
-msgstr "Svar til alle modtagere af denne meddelelse"
-
-#: mail/message-browser.c:194 ui/evolution-mail.xml.h:33
-msgid "Forward"
-msgstr "Videresend"
-
-#: mail/message-browser.c:194
-msgid "Forward this message"
-msgstr "Videresend denne meddelelse"
-
-#: mail/message-browser.c:199
-msgid "Print the selected message"
-msgstr "Udskriv den valgte meddelelse"
-
-#: mail/message-browser.c:202
-msgid "Delete this message"
-msgstr "Slet denne meddelelse"
-
-#: mail/message-browser.c:207 ui/evolution-event-editor.xml.h:33
-#: ui/evolution-mail.xml.h:64 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Forri_ge"
-
-#: mail/message-browser.c:207
-msgid "Previous message"
-msgstr "Forrige besked"
-
-#: mail/message-browser.c:210 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:57
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "NФste"
-
-#: mail/message-browser.c:210
-msgid "Next message"
-msgstr "HjФlpebesked"
-
-#: mail/message-list.c:677
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "UlФst"
 
-#: mail/message-list.c:678
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "LФst"
 
-#: mail/message-list.c:679
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Besvaret"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "Flere ulФste beskeder"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "Flere beskeder"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "Lavest"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "Lavere"
 
-#: mail/message-list.c:690
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "HЬjere"
 
-#: mail/message-list.c:691
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "HЬjest"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "Idag %h:%M"
 
-#: mail/message-list.c:957
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "IgЕr %h:%M"
 
-#: mail/message-list.c:969
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:977
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%a %Y-%m-%d %H:%M:%S"
 
-#: mail/message-list.c:979
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:1081
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "TrЕdet meddelelsesliste"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "MФrket"
 
-#: mail/message-list.c:1082
-msgid "From"
-msgstr "Afsender"
-
-#: mail/message-list.c:1082
-msgid "Date"
-msgstr "Dato"
-
-#: mail/message-list.c:1082
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Modtaget"
 
-#: mail/message-list.c:1083
-msgid "To"
-msgstr "Modtager"
-
-#: mail/message-list.c:1083
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "StЬrrelse"
 
-#: mail/mail-session.c:161
-#, fuzzy
-msgid "User canceled operation."
-msgstr "Handling annulleret"
-
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:48
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Mappe"
 
@@ -7172,15 +7972,1464 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Fjerner abonnement pЕ mappe \"%s\""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "_HЕndtИr abonnementer"
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr ""
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr ""
+
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr ""
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+msgid "Appointments"
+msgstr "Aftaler"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "Vis aftaler"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%H:%M"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%a %H:%M"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Sammendrag"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+#, fuzzy
+msgid "Add a news feed"
+msgstr "TilfЬj tjeneste"
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "Evolution installation"
+
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Fejl ved indlФsning af kalender</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "Vis opgaver"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "Sektioner:"
+
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A den %e. %B %Y"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "Udskrivning af besked mislykkedes"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "TЬm"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+#, fuzzy
+msgid "Invalid"
+msgstr "Vis i brev"
+
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "Variable"
+msgstr "DeaktivИr"
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "for"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "_Notater:"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "IndsФt"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "Kilder"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "for"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "Lavest"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Test"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "Lavest"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "Vis"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "Radio"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Moderate rain"
+msgstr "TilfЬj kriterie"
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Heavy rain"
+msgstr "DagomrЕde"
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Drifting rain"
+msgstr "Beskrivelse indeholder"
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "Find igen"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "nu"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Moderate snow"
+msgstr "OpdatИr nu"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+#, fuzzy
+msgid "Drifting snow grains"
+msgstr "Beskrivelse indeholder"
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+#, fuzzy
+msgid "Few ice crystals"
+msgstr "FФrre kriterier"
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "Epost"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+#, fuzzy
+msgid "Light hail"
+msgstr "HЬjde:"
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "Vis alt"
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "PrimФr epost"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "Modtager post"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Shallow small hail"
+msgstr "Vis alt"
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Showers of small hail"
+msgstr "Vis alt "
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown precipitation"
+msgstr "Autenticering krФves"
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "Ukendt fejl"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "Invitationer til mЬde"
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "FrЬken"
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "PortrФt"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Drifting mist"
+msgstr "Diskussionsliste"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Shallow fog"
+msgstr "Vis alt"
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "Luk dette vindue"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "Point"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "Vis opgaver"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "Luk dette vindue"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "Afsend"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "Toptekst"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Light haze"
+msgstr "HЬjde:"
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "dage"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "august"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Raging tornado"
+msgstr "Opgaver der skal fuldfЬres"
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Thunderous tornado"
+msgstr "Opgaver der skal fuldfЬres"
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "TilfЬj tjeneste"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Mapper"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "Alle deltagere"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Vis mapper som som starter med:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "Vis valgmuligheder"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "Vis"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "fredag"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+#, fuzzy
+msgid "News Feed Settings"
+msgstr "Indstillinger"
+
+#: my-evolution/my-evolution.glade.h:14
+#, fuzzy
+msgid "News Feeds"
+msgstr "%s-tjener %s"
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "onsdag"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "mЕned"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr " 1 uge"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr ""
+"AfsФt\n"
+"tid"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Vis opgaver"
+
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "Vis fulde brev_hoveder"
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "Vis opgaver"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "Opgaver"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
+msgstr ""
+"\n"
+"Enhed:  "
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Andet"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "Sjekk innstillinger"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "april"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "Evolution-skallen."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "Detaljer"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "AnnullИr mЬde"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Specielle mapper"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Evolution installation"
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -7188,29 +9437,25 @@ msgstr ""
 "Denne nye version af Evolution skal installere flere filer i\n"
 "dit personlige Evolution-katalog"
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Klik venligst \"Ok\" for at installere filerne, eller 'annullИr' for at "
 "afslutte."
 
-#: shell/e-setup.c:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "Kunne ikke opdatere filer korrekt"
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr "Evolutions filer blev installeret."
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Dette ser ud til at vФre fЬrste gang du kЬrer Evolution."
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "Venligst klik \"OK\" for at installere Evolutions brugerfiler under"
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -7221,16 +9466,14 @@ msgstr ""
 "%s\n"
 "Fejl: %s"
 
-#: shell/e-setup.c:230
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
-msgstr ""
-"Kan ikke kopiere filer til\n"
-"'%s'."
+msgstr "En fejl skete ved lФsning af filen."
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7241,7 +9484,16 @@ msgstr ""
 "Venligst fjern denne for at tillade installation\n"
 "af Evolution's brugerfiler."
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7252,21 +9504,58 @@ msgstr ""
 "Venligst fjern denne for at tillade installation\n"
 "af Evolution's brugerfiler."
 
-#: shell/e-shell.c:388
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "Kan ikke fЕ fat pЕ mappe: %s: %s"
+
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"Kan ikke kopiere filer til\n"
+"'%s'."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
 #, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Kan ikke opsФtte lokal gemning -- %s"
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "KopiИr til mappe"
 
-#: shell/e-shell.c:1268
+#: shell/e-shell-folder-commands.c:313
 #, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
-"Ups! Visningen for `%s' dЬde uventet. :-(\n"
-"Dette betyder sandsynligvis at %s komponenten er brudt ned."
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "Flyt til folder"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "VФlg mappe"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "Er du sikker pЕ at du vil slette opgaven '%s'?"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "еbner mappe %s"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -7275,15 +9564,15 @@ msgstr ""
 "Kan ikke oprette specificeret katalog:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "Det angivne katalognavn er ikke gyldigt."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - opret ny mappe"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -7291,11 +9580,11 @@ msgstr ""
 "Typen pЕ den valgte mappe er ikke gyldig til\n"
 "den Ьnskede operation."
 
-#: shell/e-shell-folder-selection-dialog.c:321
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Ny..."
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Unavngivet)"
 
@@ -7335,7 +9624,7 @@ msgstr ""
 "Importerer %s\n"
 "Importerer opfЬring %d."
 
-#: shell/e-shell-importer.c:353
+#: shell/e-shell-importer.c:352
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -7344,11 +9633,11 @@ msgstr ""
 "Der er ingen importЬr som kan hЕndtere\n"
 "%s"
 
-#: shell/e-shell-importer.c:363
+#: shell/e-shell-importer.c:362
 msgid "Importing"
 msgstr "Importerer"
 
-#: shell/e-shell-importer.c:371
+#: shell/e-shell-importer.c:370
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -7357,17 +9646,17 @@ msgstr ""
 "Importerer %s.\n"
 "Starter %s"
 
-#: shell/e-shell-importer.c:384
+#: shell/e-shell-importer.c:383
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:404
+#: shell/e-shell-importer.c:402
 #, c-format
 msgid "Error loading %s"
 msgstr "Fejl under indlФsning af %s"
 
-#: shell/e-shell-importer.c:419
+#: shell/e-shell-importer.c:417
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -7376,57 +9665,47 @@ msgstr ""
 "Importerer %s\n"
 "Importerer opfЬring 1."
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:488
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:538
 msgid "Filename:"
 msgstr "Filnavn:"
 
-#: shell/e-shell-importer.c:545 shell/importer/import.glade.h:5
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
 msgid "Select a file"
 msgstr "VФlg fil"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:553
 msgid "File type:"
 msgstr "Filtype:"
 
-#: shell/e-shell-importer.c:601
+#: shell/e-shell-importer.c:599
 msgid "Select folder"
 msgstr "VФlg mappe"
 
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
 #: shell/e-shell-offline-handler.c:554
 msgid "Closing connections..."
 msgstr "Afbryder forbindelser..."
 
-#: shell/e-shell-view.c:149
-msgid "(No folder displayed)"
-msgstr "(Ingen mappe vist)"
-
-#: shell/e-shell-view.c:1204
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1206
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell-view-menu.c:175
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Fejl-Frede fandtes ikke i din $PATH"
 
-#: shell/e-shell-view-menu.c:181
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Fejl-Frede kunne ikke kЬres"
 
-#: shell/e-shell-view-menu.c:226
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Ophavsret tilhЬrende Ximian, Inc. 1999-2001."
 
-#: shell/e-shell-view-menu.c:228
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -7436,31 +9715,88 @@ msgstr ""
 "til administrering af post, kalender og aftaler\n"
 "indenfor Gnomes skrivebordsmiljЬ."
 
-#: shell/e-shell-view-menu.c:392
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "GЕ til mappe..."
 
-#: shell/e-shell-view-menu.c:576
-msgid "Work online"
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Opret en ny genvejsgruppe"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
 msgstr "Arbejd pЕ nettet"
 
-#: shell/e-shell-view-menu.c:588 shell/e-shell-view-menu.c:600
-msgid "Work offline"
-msgstr "Arbejd uden net"
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
+msgstr ""
 
-#: shell/e-shortcuts.c:381
-msgid "Error saving shortcuts."
-msgstr "Fejl under gemning af genveje."
+#: shell/e-shell-view.c:175
+msgid "(No folder displayed)"
+msgstr "(Ingen mappe vist)"
 
-#: shell/e-shortcuts-view.c:134
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1411
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
+
+#: shell/e-shell-view.c:1413
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Kan ikke opsФtte lokal gemning -- %s"
+
+#: shell/e-shell.c:1311
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"Ups! Visningen for `%s' dЬde uventet. :-(\n"
+"Dette betyder sandsynligvis at %s komponenten er brudt ned."
+
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Opret en ny kontakt"
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Gruppenavn:"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -7469,110 +9805,204 @@ msgstr ""
 "ьnsker du virkelig at fjerne gruppe %s\n"
 "fra genvejsbjФlken?"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "Fjern ikke"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "Fjern denne genvejsgruppe"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "Fjern denne genvejsgruppe"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "_SmЕ ikoner"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Vis genveje som smЕ ikoner"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "Store i_koner"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Vis genveje som store ikoner"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_Ny gruppe..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Opret en ny genvejsgruppe"
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "_Fjern denne gruppe..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Fjern denne genvejsgruppe"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "_Fjern denne gruppe..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "Fjern denne genvejsgruppe"
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "Skjul genvejsbjФlken"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Skjul genvejsbjФlken"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "AktivИr"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "Fjern denne genvejsgruppe"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "Fjern denne genvejsgruppe"
+
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "еbn"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#, fuzzy
+msgid "Open in New Window"
+msgstr "_еpne i nytt vindu"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
-msgstr "AktivИr denne genvej"
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Udskriv den valgte meddelelse"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "Regelnavn: "
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "Fjern denne genvejsgruppe"
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne genvej fra genvejsbjФlken"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:585
+msgid "Error saving shortcuts."
+msgstr "Fejl under gemning af genveje."
+
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "_GenvejsbjФlke"
+
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "_Kontakt"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Uden navn)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Ingen fejl"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Almindelig fejl"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "En mappe med samme navn eksisterer allerede"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "Specificeret mappetype er ikke gyldig"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "I/U-fejl"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "Ikke nok plads til at oprette mappen"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "Angivet mappe blev ikke fundet"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "Funktionen ikke implementeret i denne gemning"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "Adgang nФgtet"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "Operationen er ikke understЬttet"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "Den angivne type er ikke understЬttet i denne gemning"
 
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
+
+#: shell/e-task-widget.c:173
+#, fuzzy
+msgid "%s (%d%% complete)"
+msgstr "% fФrdi_g:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "Afbryder forbindelser..."
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "VФrt:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Mappenavn:"
@@ -7585,10 +10015,6 @@ msgstr "Mappetype:"
 msgid "Specify where to create the folder:"
 msgstr "Angiv hvor mappen skal oprettes:"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "Evolution-skallen."
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Klik \"ImportИr\" for at starte importering af filen til Evolution."
@@ -7611,26 +10037,35 @@ msgstr ""
 "Via denne vejviser vil du ledes gennem importprocessen af\n"
 "eksterne filer til Evolution."
 
-#: shell/importer/intelligent.c:186
+#: shell/importer/intelligent.c:191
 msgid "Importers"
 msgstr "Importerer"
 
-#: shell/main.c:82
-#, no-c-format
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "Fjern ikke"
+
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr ""
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
@@ -7655,7 +10090,7 @@ msgstr ""
 "Vi hЕber at du nyder resultatene af vort hЕrde arbejde, og vi venter i\n"
 "spФnding pЕ at du tilbyder din hjФlp!\n"
 
-#: shell/main.c:107
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7663,236 +10098,323 @@ msgstr ""
 "Tak\n"
 "Holdet bag Evolution\n"
 
-#: shell/main.c:138
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "Kan ikke initialisere Evolution-skallen."
 
-#: shell/main.c:184
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "DeaktivИr opstartsskФrm"
 
-#: shell/main.c:185
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:217
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere komponentsystemet, Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "KopiИr"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
+msgstr "KopiИr valget"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "Opret ny kontakt"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Slet kontakt"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "Opret ny kontakt"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Find"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Klip ud"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Find kontakt"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr "Klip valget ud"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "Slet kontakt"
+
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Ny kontakt"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:63
-msgid "Previews the message to be printed"
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New list"
+msgstr "Nyheder"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "IndsФt"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "IndsФt fra klippebordet"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
 msgstr "Viser forhЕndsvisning af beskeden som skal udskrives"
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "Udskriv kontakt"
 
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "VФlg alle"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "Slet kontakt"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Stop"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Stop indlФsning"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "Vis alle"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "Vis alle kontakter"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "_Adressebog-kilder..."
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "_Kontakt"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "_Udskriv..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "_SЬg efter kontakter"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-task-editor-dialog.xml.h:88
-#: ui/evolution.xml.h:46
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
+msgstr "VФlg alle"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_VФrktЬj"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "Fem dage"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "фndr opsФtning"
+#: ui/evolution-calendar.xml.h:2
+#, fuzzy
+msgid "Configure the calendar's settings"
+msgstr "Klik her for adressebogen"
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a new all day Event"
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "Opret en ny aftale for hele dagen"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Opret en ny aftale"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Opret en ny kalender"
+msgid "Create a new appointment"
+msgstr "Opret en ny aftale"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "Dag"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "GЕ til"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "GЕ tilbage i tiden"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "GЕ fremad i tid"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "GЕ til _dato"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
-msgstr "GЕ _til idag"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "GЕ til specifik dato"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "GЕ til nutiden"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "MЕned"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr "Ny aftal_e"
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "еbn kalender"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "Smugkig"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Ny aftale"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Udskriv kalender"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Udskriv denne kalender"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Gem som"
+#: ui/evolution-calendar.xml.h:22
+msgid "Publish Free/Busy Information"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "Gem kalender som noget andet"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Vis Иn dag"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Vis Иn mЕned"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Vis Иn uge"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Vis arbejdsugen"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
-msgid "Today"
-msgstr "I dag"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "Arbejds_uge"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "Uge"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "_Aftale"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "Indstillinger for _post..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "_Dag"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "_MЕned"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:42
-msgid "_New"
-msgstr "_Ny"
-
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "_еbn kalender"
-
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "_Uge"
 
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Luk"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "Luk denne aftale"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "Slet denne aftale"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "Den centrale vФrktЬjslinje"
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "Viser forhЕndsvisning af beskeden som skal udskrives"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "Vis udskrift"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "SkriveropsФtning"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Udskriv denne ting"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "Udskriv..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "Gem og luk"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "Gem aftalen og luk dialogboksen"
+
+#: ui/evolution-comp-editor.xml.h:17
+#, fuzzy
+msgid "Save this item to disk"
+msgstr "фndr visningen til %s"
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr "RedigИr sideindstillinger for aktiv skriver"
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "Ha_ndlinger"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "_Fil"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Slet dette punkt"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "Slet..."
 
@@ -7904,27 +10426,12 @@ msgstr "HjФlp"
 msgid "Print En_velope..."
 msgstr "Skriv kuvert..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Udskriv denne ting"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Udskriv..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "_Gem som..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Gem og luk"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Gem kontakten og luk dialogboksen"
@@ -7941,1028 +10448,1007 @@ msgstr "Se hjФlpetekster"
 msgid "Send _message to contact..."
 msgstr "Ny _meddelelse til kontaktperson"
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:34
-msgid "_File"
-msgstr "_Fil"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Gem"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Om denne applikation"
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Om..."
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "Slet dette punkt"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "Ha_ndlinger"
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "Gem opgaven og luk dialogboksen"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "Adresse_bog..."
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "Send _kontaktperson til andre..."
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "T_Ьm"
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "Ny _meddelelse til kontaktperson"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "Klip _ud"
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "AnnullИr mЬde"
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "_Tjek navne"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+msgid "Cancel the meeting for this item"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "TЬm"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Forward as i_Calendar"
+msgstr "Videresend som v_Kalender (RET)"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "TЬm det valgte"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "Videresend denne meddelelse"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Luk denne aftale"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "KopiИr til mappe... (RETMIG)"
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr ""
+"Anmod\n"
+"om mЬde"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:8
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "KopiИr"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr "_PlanlФg mЬde"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "KopiИr valget"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#, fuzzy
+msgid "Schedule a meeting for this item"
+msgstr "PlanlФg mЬde"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Klip ud"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "Ha_ndlinger"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Klip valget ud"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "%s - Evolution %s"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Slet denne aftale"
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "AnnullИr"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "Dump XML"
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "Gem aktiv fil"
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "Dump beskrivelse af grФnsefladen som XML"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "Skriv"
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "FЬ_rste opfЬring i mappe (RET)"
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Udskriv ny meddelelse"
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "Videresend (RET)"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "Videresend som v_Kalender (RET)"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "GЕ til nФste opfЬring"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "GЕ til forrige opfЬring"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr "_TЬm papirkurven"
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "U_komplet opgave (RETMIG)"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "Glem _adgangskoder"
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "фndr filens egenskaber"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "N_Фste"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
+msgstr "_HЕndtИr abonnement..."
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "IndsФt"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "IndsФt fra klippebordet"
+#: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Flyt meddelelsen til en ny mappe"
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "Forri_ge"
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send / Receive"
+msgstr "Send / modtag"
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "Vis udskrift"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "Afsend kЬet post og modtag ny post"
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "Skriverops_Фtning..."
+#: ui/evolution-mail-global.xml.h:16
+#, fuzzy
+msgid "Show message preview window"
+msgstr "Ny _meddelelse til kontaktperson"
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "SkriveropsФtning"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:241
-msgid "Save"
-msgstr "Gem"
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
+msgstr "R_edigering af virtuelle mapper..."
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "Gem aftalen og luk dialogboksen"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
+msgstr "_Filtre..."
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "Gem aktiv fil"
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr "_Postmeddelelse"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "_PlanlФg mЬde"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "Indstillinger for _post..."
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "OpsФt et eller andet mЬde"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "Smugkig"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "VФlg alle"
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
+msgstr "_Send / modtag"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "VФlg alt"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "RedigИr sideindstillinger for aktiv skriver"
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "Skjul valgte beskeder"
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "_OpgaveforespЬrgsel"
+#: ui/evolution-mail-list.xml.h:5
+#, fuzzy
+msgid "Cut selected messages"
+msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "_Om..."
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "Skjul valgte beskeder"
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:40
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:31
-msgid "_Close"
-msgstr "L_uk"
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "Skjul slettede beskeder"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:32
-msgid "_Contact (FIXME)"
-msgstr "_Kontakt (RETMIG)"
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
+msgstr "Skjul _lФste beskeder"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_KopiИr"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_FejlsЬg"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "MФrk alle som l_Фst"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:45
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:38
-msgid "_Help"
-msgstr "_HjФlp"
+#: ui/evolution-mail-list.xml.h:11
+#, fuzzy
+msgid "Mark all visible messages as read"
+msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "OpfЬring (RETMIG)"
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "IndsФt fra klippebordet"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "_JournalopfЬring (RETMIG)"
+#: ui/evolution-mail-list.xml.h:14
+#, fuzzy
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Flyt meddelelsen til en ny mappe"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "_Sidste opfЬring i mappen (RETMIG)"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "VФlg _alle"
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "_Postmeddelelse (RETMIG)"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "VФlg _trЕd"
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "_Flyt til mappe... (RETMIG)"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "_Note (RETMIG)"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "_IndsФt"
+#: ui/evolution-mail-list.xml.h:19
+#, fuzzy
+msgid "Select all visible messages"
+msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:115
-#: ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
-msgstr "Egenska_ber..."
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "Vis _alt"
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "VФlg alle"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:45
-msgid "_Task (FIXME)"
-msgstr "Opgave (RETMIG)"
+#: ui/evolution-mail-list.xml.h:22
+#, fuzzy
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "_UlФst opfЬring (RETMIG)"
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-event-editor.xml.h:76 ui/evolution-message-composer.xml.h:52
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:47
-msgid "_View"
-msgstr "_Vis"
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "TrЕdet meddelelsesliste"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "TilfЬj tjeneste"
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "_TЬm"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "TilfЬj ny tjeneste til ledelsesresumИ"
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Mappe"
 
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Opret et nyt brev"
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "Indstillinger for LedelsesresumИ..."
+#: ui/evolution-mail-list.xml.h:28
+msgid "_Properties..."
+msgstr "Egenska_ber..."
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Nyt post"
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "TrЕdet meddelelsesliste"
 
-#: ui/evolution-mail.xml.h:1
+#: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "Apply filter rules to the selected messages"
 msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Cancel"
-msgstr "AnnullИr"
-
-#: ui/evolution-mail.xml.h:3
-#, fuzzy
-msgid "Cancel the current mail operation"
-msgstr "Gem aktiv fil"
-
-#: ui/evolution-mail.xml.h:4
-msgid "Change the properties of this folder"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:5
-msgid "Compose"
-msgstr "Skriv"
-
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail-message.xml.h:2
 #, fuzzy
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Svar til alle modtagere af denne meddelelse"
 
-#: ui/evolution-mail.xml.h:7
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "Svar til afsenderen af denne meddelelse"
+
+#: ui/evolution-mail-message.xml.h:4
 #, fuzzy
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Svar til afsenderen af denne meddelelse"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail-message.xml.h:6
 #, fuzzy
 msgid "Copy selected messages to another folder"
 msgstr "KopiИr meddelelse til en ny mappe"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail-message.xml.h:7
 msgid "Create _Virtual Folder From Message"
 msgstr "Opret _virtuel mappe fra besked"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail-message.xml.h:8
 msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail-message.xml.h:9
 msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:14
+#: ui/evolution-mail-message.xml.h:11
 #, fuzzy
 msgid "Create a rule to filter messages with this subject"
 msgstr "Videresendt meddelelse (intet emne)"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail-message.xml.h:12
 #, fuzzy
 msgid "Create a virtual folder for these recipients"
 msgstr "Opret _virtuel mappe fra besked"
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail-message.xml.h:13
 #, fuzzy
 msgid "Create a virtual folder for this mailing list"
 msgstr "Opret _virtuel mappe fra besked"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail-message.xml.h:14
 #, fuzzy
 msgid "Create a virtual folder for this sender"
 msgstr "Opret _virtuel mappe fra besked"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail-message.xml.h:15
 #, fuzzy
 msgid "Create a virtual folder for this subject"
 msgstr "Opret _virtuel mappe fra besked"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Create or edit mail accounts and other preferences"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:17
+#, fuzzy
+msgid "Display the next important message"
+msgstr "den aktuelle tid"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Create or edit rules for filtering new mail"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:18
+#, fuzzy
+msgid "Display the next message"
+msgstr "den aktuelle tid"
 
-#: ui/evolution-mail.xml.h:21
-msgid "Create or edit virtual folder definitions"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
+msgstr "den aktuelle tid"
 
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail-message.xml.h:20
 #, fuzzy
-msgid "Display the next message"
+msgid "Display the next unread thread"
 msgstr "den aktuelle tid"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail-message.xml.h:21
+#, fuzzy
+msgid "Display the previous important message"
+msgstr "Les en tidligere lagret melding"
+
+#: ui/evolution-mail-message.xml.h:22
 #, fuzzy
 msgid "Display the previous message"
 msgstr "Les en tidligere lagret melding"
 
-#: ui/evolution-mail.xml.h:25
-msgid "Empty _Trash"
-msgstr "_TЬm papirkurven"
+#: ui/evolution-mail-message.xml.h:23
+#, fuzzy
+msgid "Display the previous unread message"
+msgstr "Les en tidligere lagret melding"
 
-#: ui/evolution-mail.xml.h:26
-msgid "Filter on Mailing _List"
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "FiltrИr efter epost_liste"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "FiltrИr efter se_nder"
 
-#: ui/evolution-mail.xml.h:28
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "FiltrИr pЕ modtage_re"
 
-#: ui/evolution-mail.xml.h:29
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "FiltrИr pЕ e_mne"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail-message.xml.h:28
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:31
-msgid "Forget _Passwords"
-msgstr "Glem _adgangskoder"
-
-#: ui/evolution-mail.xml.h:32
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "Videresend"
 
-#: ui/evolution-mail.xml.h:34
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "Videresend som"
 
-#: ui/evolution-mail.xml.h:35
+#: ui/evolution-mail-message.xml.h:31
 #, fuzzy
 msgid "Forward _Attached"
 msgstr "Vis bilag"
 
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail-message.xml.h:32
 #, fuzzy
 msgid "Forward _Inline"
 msgstr "Videresend mellem linjerne"
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail-message.xml.h:33
 #, fuzzy
 msgid "Forward _Quoted"
 msgstr "Videresend som"
 
-#: ui/evolution-mail.xml.h:38
+#: ui/evolution-mail-message.xml.h:34
 #, fuzzy
 msgid "Forward the selected message in the body of a new message"
 msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail-message.xml.h:35
 #, fuzzy
 msgid "Forward the selected message quoted like a reply"
 msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail-message.xml.h:36
 #, fuzzy
 msgid "Forward the selected message to someone"
 msgstr "Flyt meddelelsen til en ny mappe"
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail-message.xml.h:37
 #, fuzzy
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Hide S_elected Messages"
-msgstr "Skjul valgte beskeder"
-
-#: ui/evolution-mail.xml.h:43
-msgid "Hide _Deleted Messages"
-msgstr "Skjul slettede beskeder"
-
-#: ui/evolution-mail.xml.h:44
-msgid "Hide _Read messages"
-msgstr "Skjul _lФste beskeder"
-
-#: ui/evolution-mail.xml.h:45
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:39
 #, fuzzy
 msgid "Load _Images"
 msgstr "Videresendte meddelelser"
 
-#: ui/evolution-mail.xml.h:47
-msgid "Manage _Subscriptions..."
-msgstr "_HЕndtИr abonnement..."
-
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail-message.xml.h:41
 #, fuzzy
-msgid "Mar_k As Read"
-msgstr "MФr_k som lФst"
-
-#: ui/evolution-mail.xml.h:49
-msgid "Mark All as R_ead"
-msgstr "MФrk alle som l_Фst"
+msgid "Mark as I_mportant"
+msgstr "Vigtig"
 
-#: ui/evolution-mail.xml.h:50
-msgid "Mark As U_nread"
-msgstr "MФrk som _ulФst"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
+msgstr "MarkИr som ulФst"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail-message.xml.h:44
 #, fuzzy
-msgid "Mark all visible messages as read"
+msgid "Mark the selected messages as having been read"
 msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail-message.xml.h:45
 #, fuzzy
-msgid "Mark the selected messages as having been read"
+msgid "Mark the selected messages as important"
 msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Udskriv den valgte meddelelse"
+
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Mark the selected messages for deletion"
 msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Flyt"
 
-#: ui/evolution-mail.xml.h:56
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Move selected messages to another folder"
 msgstr "Flyt meddelelsen til en ny mappe"
 
-#: ui/evolution-mail.xml.h:58
-msgid "Open a window for composing a mail message"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "NФste"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "HjФlpebesked"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "HjФlpebesked"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "VФlg _trЕd"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "HjФlpebesked"
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail-message.xml.h:56
 #, fuzzy
 msgid "Open the selected message in a new window"
 msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-mail.xml.h:60
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "Viser forhЕndsvisning af beskeden som skal udskrives"
+
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "Forri_ge"
+
+#: ui/evolution-mail-message.xml.h:60
 #, fuzzy
-msgid "Permanently remove all deleted messages from all folders"
-msgstr "Flyt meddelelsen til en ny mappe"
+msgid "Previous Important Message"
+msgstr "Forrige besked"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "Flyt meddelelsen til en ny mappe"
+msgid "Previous Message"
+msgstr "Forrige besked"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Forrige besked"
 
-#: ui/evolution-mail.xml.h:66
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Print Message..."
 msgstr "Udskriv besked..."
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Print Preview..."
 msgstr "ForhЕndsvisning af udskrift"
 
-#: ui/evolution-mail.xml.h:68
-msgid "Print message to the printer"
-msgstr "Udskriv besked til printeren"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "Udskriv besked"
+
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "Svar"
 
-#: ui/evolution-mail.xml.h:69
-msgid "Redirect (FIXME: implement me)"
-msgstr "OmdirigИr"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "Svar til alle"
 
-#: ui/evolution-mail.xml.h:73
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "S_earch Message"
 msgstr "_Postmeddelelse"
 
-#: ui/evolution-mail.xml.h:74
+#: ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Flyt meddelelsen til en ny mappe"
 
-#: ui/evolution-mail.xml.h:75
+#: ui/evolution-mail-message.xml.h:73
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:76 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "VФlg _alle"
-
-#: ui/evolution-mail.xml.h:77
-msgid "Select _Thread"
-msgstr "VФlg _trЕd"
-
-#: ui/evolution-mail.xml.h:78
-msgid "Select all and only the messages that are not currently selected"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:79
-msgid "Select all messages in the same thread as the selected message"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:80
-#, fuzzy
-msgid "Select all visible messages"
-msgstr "Udskriv den valgte meddelelse"
-
-#: ui/evolution-mail.xml.h:81
-msgid "Send / Receive"
-msgstr "Send / modtag"
-
-#: ui/evolution-mail.xml.h:82
-msgid "Send queued mail and retrieve new mail"
-msgstr "Afsend kЬet post og modtag ny post"
-
-#: ui/evolution-mail.xml.h:83
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Show Email _Source"
 msgstr "Kilder"
 
-#: ui/evolution-mail.xml.h:84
+#: ui/evolution-mail-message.xml.h:75
 msgid "Show Full _Headers"
 msgstr "Vis fulde brev_hoveder"
 
-#: ui/evolution-mail.xml.h:85
-msgid "Show _All"
-msgstr "Vis _alt"
-
-#: ui/evolution-mail.xml.h:86
+#: ui/evolution-mail-message.xml.h:76
 #, fuzzy
 msgid "Show message in the normal style"
 msgstr "Ny _meddelelse til kontaktperson"
 
-#: ui/evolution-mail.xml.h:87
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
 msgid "Show message with all email headers"
 msgstr "Ingen besked med uid %s"
 
-#: ui/evolution-mail.xml.h:88
-msgid "Show messages that have been temporarily hidden"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:89
+#: ui/evolution-mail-message.xml.h:78
 #, fuzzy
 msgid "Show the raw email source of the message"
 msgstr "VedhФft bilag til meddelelsen"
 
-#: ui/evolution-mail.xml.h:90
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:91
-#, fuzzy
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Udskriv den valgte meddelelse"
-
-#: ui/evolution-mail.xml.h:92
-#, fuzzy
-msgid "Temporarily hide the selected messages"
-msgstr "Udskriv den valgte meddelelse"
-
-#: ui/evolution-mail.xml.h:93
-msgid "Threaded Message list"
-msgstr "TrЕdet meddelelsesliste"
-
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Udskriv den valgte meddelelse"
 
-#: ui/evolution-mail.xml.h:95
+#: ui/evolution-mail-message.xml.h:80
 msgid "VFolder on Mailing _List..."
 msgstr "vMappe efter epostliste..."
 
-#: ui/evolution-mail.xml.h:96
+#: ui/evolution-mail-message.xml.h:81
 msgid "VFolder on Se_nder..."
 msgstr "vMappe for _afsender..."
 
-#: ui/evolution-mail.xml.h:97
+#: ui/evolution-mail-message.xml.h:82
 msgid "VFolder on _Recipients..."
 msgstr "vMappe for _modtagere..."
 
-#: ui/evolution-mail.xml.h:98
+#: ui/evolution-mail-message.xml.h:83
 msgid "VFolder on _Subject..."
 msgstr "vMappe pЕ e_mne..."
 
-#: ui/evolution-mail.xml.h:99
-msgid "Virtual Folder _Editor..."
-msgstr "R_edigering af virtuelle mapper..."
-
-#: ui/evolution-mail.xml.h:100
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_Anvend filtre"
 
-#: ui/evolution-mail.xml.h:101
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "KopiИr til mappe"
 
-#: ui/evolution-mail.xml.h:102
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "_Opret filter fra besked"
 
-#: ui/evolution-mail.xml.h:104
-msgid "_Expunge"
-msgstr "_TЬm"
-
-#: ui/evolution-mail.xml.h:105
-msgid "_Filters..."
-msgstr "_Filtre..."
-
-#: ui/evolution-mail.xml.h:106 ui/evolution.xml.h:35
-msgid "_Folder"
-msgstr "_Mappe"
-
-#: ui/evolution-mail.xml.h:107
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Videresendte meddelelser"
 
-#: ui/evolution-mail.xml.h:108 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:109
-msgid "_Mail Message"
-msgstr "_Postmeddelelse"
-
-#: ui/evolution-mail.xml.h:110
-msgid "_Mail Settings..."
-msgstr "Indstillinger for _post..."
-
-#: ui/evolution-mail.xml.h:111
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "_Message Display"
 msgstr "Beskeder"
 
-#: ui/evolution-mail.xml.h:112
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Flyt til folder"
 
-#: ui/evolution-mail.xml.h:113
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "_Normal Display"
 msgstr "Vis"
 
-#: ui/evolution-mail.xml.h:114
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Open Message"
 msgstr "Send beskeder _igen"
 
-#: ui/evolution-mail.xml.h:116
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "_Re-send Message"
 msgstr "Send beskeder _igen"
 
-#: ui/evolution-mail.xml.h:119
-msgid "_Send / Receive"
-msgstr "_Send / modtag"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Luk dette vindue"
 
-#: ui/evolution-mail.xml.h:120
-#, fuzzy
-msgid "_Threaded Message List"
-msgstr "TrЕdet meddelelsesliste"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr ""
+
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "PersonliggЬr"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "фndr vФrktЬjslinjerne"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "L_uk"
+
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "_Vis"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "VedlФg"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Luk aktiv fil"
 
 #: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Delete all but signature"
+msgstr "Signaturfil:"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "KryptИr denne besked med PGP"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "F_ormat"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "IndsФt tekstfil..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "VedhФft bilag til meddelelsen"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "IndsФt tekstfil..."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "еbn fil"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "PGP-kryptИr"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "PGP-signИr"
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "Gem _udkast"
+#, fuzzy
+msgid "S/MIME Encrypt"
+msgstr "PGP-kryptИr"
 
 #: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "_Gem i mappe... (RET)"
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "Gem"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Gem som"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr "Gem _udkast"
+
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Gem i mappe..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "Gem aktiv fil"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Gem aktiv fil med et andet navn"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Afsend"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Afsend _senere"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Afsend _senere"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Send brevet i HMTL-format"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Send beskeden senere"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Send beskeden nu"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Send denne meddelelse nu"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Vis/skjul bilag"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Vis _bilag"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Vis bilag"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "_Bilag"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "_B-kopifelt"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "_Kopifelt"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "_FejlsЬg"
+
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Delete all"
+msgstr "_Slet"
+
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "_Fra-felt"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_indsФt"
 
-#: ui/evolution-message-composer.xml.h:47
-msgid "_Insert text file... (FIXME)"
-msgstr "_IndsФt tekstfil... (RETMIG)"
-
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_еbn..."
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "_Svar-til-felt"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "_Sikkerhed"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "_HjФlp"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Mappe"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "OpdatИr liste"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "OpdatИr mappelisten"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "AbonnИr"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Opsig abonnement"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "_Tildel opgave (RET)"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Find igen"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Gentag"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Gentag sidste fortrudte handling"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Erstat"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Erstat en streng"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "Svar til _alle (RETMIG)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "S_end statusrapport (RETMIG)"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "Gem opgaven og luk dialogboksen"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "SЬg efter en streng"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Fortryd"
+#: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Task"
+msgstr "AnnullИr"
 
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr ""
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "Slet opgaven"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:30
-msgid "_Appointment (FIXME)"
-msgstr "_Aftale (RETMIG)"
+#: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Re_fresh Task"
+msgstr "OpdatИr liste"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "_MarkИr som fuldfЬrt (RETMIG)"
+#: ui/evolution-tasks.xml.h:2
+#, fuzzy
+msgid "Configure the task view's settings"
+msgstr "Klik her for adressebogen"
 
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "Sva_r (RETMIG)"
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "Copy selected task"
+msgstr "_еbn valgte beskeder"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Opret en ny opgave"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "Slet opgaven"
+
+#: ui/evolution-tasks.xml.h:7
+#, fuzzy
+msgid "Delete selected tasks"
+msgstr "Slet opgaven"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Ny opgave"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "IndsФt fra klippebordet"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Gem opgave som noget andet"
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "OpsФtning af opgaver"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "Indstillinger for _post..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_Opgave"
 
@@ -8970,151 +11456,219 @@ msgstr "_Opgave"
 msgid "About Evolution..."
 msgstr "Om evolution..."
 
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Luk dette vindue"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
-msgstr ""
+#: ui/evolution.xml.h:2
+#, fuzzy
+msgid "Add to _Shortcut Bar"
+msgstr "_GenvejsbjФlke"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "PersonliggЬr"
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the name of this folder"
+msgstr "фndr visningen til %s"
 
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "фndr vФrktЬjslinjerne"
+#, fuzzy
+msgid "Copy this folder"
+msgstr "KopiИr til mappe"
 
 #: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "Opretter en ny mappe"
+
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "Fjern denne genvej fra genvejsbjФlken"
+
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Opretter en ny mappe"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "Slet dette punkt"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr ""
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_Afslut"
 
 # OSS = Ofte Stillede SpЬrgsmЕl
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:16
 msgid "Evolution _FAQ"
 msgstr "Evolution OSS"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "Evolution _vindue"
 
-#: ui/evolution.xml.h:11
-msgid "Evolution bar _shortcut"
-msgstr ""
-
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Afslut program"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "Kom i gang"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:15
-msgid "Main toolbar"
-msgstr "Den centrale vФrktЬjslinje"
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "Flyt meddelelsen til en ny mappe"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Open in New _Window"
+msgstr "_еpne i nytt vindu"
+
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Open this folder in an other window"
+msgstr "Udskriv den valgte meddelelse"
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Vis information om Evolution"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Indsend fejlrapport"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "Indsend fejlrapport"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Toggle"
 msgstr "Rolle"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr ""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "Brug af kalenderen"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "Brug af postdelen"
 
-#: ui/evolution.xml.h:27
-msgid "Work Offline"
-msgstr ""
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr "Vis den valgte mappe"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "_Om Evolution"
 
-#: ui/evolution.xml.h:29
-msgid "_Actions"
-msgstr "Ha_ndlinger"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "_Aftale (RETMIG)"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "_Kontakt (RETMIG)"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "_KopiИr"
+
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_GЕ til mappe..."
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "_ImportИr fil..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "_Indeks"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "Send besked"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "_Gem som..."
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Ny"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "_Ny Mappe"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "_еbn..."
+
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "_GenvejsbjФlke"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "_GenvejsbjФlke"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "Opgave (RETMIG)"
+
+#: ui/evolution.xml.h:64
 #, fuzzy
 msgid "_Work Offline"
 msgstr "Arbejder"
 
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "Indstillinger for _post..."
+
 #: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
+#, fuzzy
+msgid "Address Cards"
 msgstr "Adressekort"
 
 #: views/addressbook/galview.xml.h:2
@@ -9146,9 +11700,12 @@ msgstr "Beskeder"
 msgid "With Category"
 msgstr "Med kategori"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr ""
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%A den %e. %B %Y"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
@@ -9222,70 +11779,138 @@ msgstr "S_lut-tid for mЬde:"
 msgid "All Attendees"
 msgstr "Alle deltagere"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%A den %e. %B %Y"
-
-#: widgets/menus/gal-view-menus.c:176
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "NuvФrende visning"
 
-#: widgets/menus/gal-view-menus.c:202
+#: widgets/menus/gal-view-menus.c:259
 msgid "Define Views"
 msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:422
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
-msgid "%B %Y"
-msgstr "%a %d %Y"
-
-#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Nu"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "I dag"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "O.k."
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Datoen skal skrives ind pЕ formatet: %s"
 
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+#, fuzzy
+msgid "Chinese"
+msgstr "Foresatte"
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "uge"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "Papirkurv"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "Alternativer"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "Nyheder"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Ukendt fejl: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "Andet"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Kontaktredigering"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "Gem sЬgning"
 
-#: widgets/misc/e-filter-bar.c:239
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "Avanceret sЬgning"
 
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "Gem som..."
-
-#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Vis alt"
 
-#: widgets/misc/e-filter-bar.h:96 widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "RedigИr..."
-
-#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Avanceret..."
 
@@ -9297,6 +11922,10 @@ msgstr "Information"
 msgid "Warning"
 msgstr "Advarsel"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Fejl"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "SpЬrgsmЕl"
@@ -9334,6 +11963,520 @@ msgstr ""
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "фndr opsФtning"
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "OpsФtning af opgaver"
+
+#~ msgid "???"
+#~ msgstr "???"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "K_ontakter..."
+
+#~ msgid "_Company:"
+#~ msgstr "_Firma:"
+
+#~ msgid "As _Minicards"
+#~ msgstr "Som _minikort"
+
+#~ msgid "As _Table"
+#~ msgstr "Som _tabel"
+
+#~ msgid "Find..."
+#~ msgstr "Find..."
+
+#~ msgid "Open calendar"
+#~ msgstr "еbn kalender"
+
+#~ msgid "Save calendar"
+#~ msgstr "Gem kalender"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>Fejl ved indlФsning af kalender:<br>Metode ikke understЬttet"
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "Alarmer afbrydes efter"
+
+#~ msgid "Colors"
+#~ msgstr "Farver"
+
+#~ msgid "Enable snoozing for"
+#~ msgstr "SlЕ udsФttelse til for"
+
+#~ msgid "Highlight"
+#~ msgstr "FremhФv:"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "Punkter som skal afsluttes idag:"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Punkter som ikke skal afsluttes endnu"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Punkter som ikke skal afsluttes endnu:"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "Overskredne opgaver:"
+
+#~ msgid "TaskPad"
+#~ msgstr "Opgaveblok"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Tid til afslutning"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Visuelle alarmer"
+
+#~ msgid "Work week"
+#~ msgstr "Arbejdsuge"
+
+#~ msgid "Edit Task"
+#~ msgstr "RedigИr opgave"
+
+#~ msgid "Percent complete"
+#~ msgstr "Procent fФrdig"
+
+#~ msgid "Mark the task complete"
+#~ msgstr "MarkИr opgaven som fuldfЬrt"
+
+#~ msgid "Edit this task..."
+#~ msgstr "фndr denne opgave..."
+
+#~ msgid "Edit the task"
+#~ msgstr "фndr denne opgave"
+
+#~ msgid "Go to Today"
+#~ msgstr "GЕ til i dag"
+
+#~ msgid "Schedule Meeting"
+#~ msgstr "PlanlФg mЬde"
+
+#~ msgid "This is a reply from someone who was uninvited!"
+#~ msgstr "Dette er et svar fra nogen som ikke er inviteret!"
+
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "Kunne ikke opdatere dit kalenderlager."
+
+#~ msgid "I couldn't delete the calendar component!\n"
+#~ msgstr "Kunne ikke slette kalenderkomponenten!\n"
+
+#~ msgid "Component successfully deleted."
+#~ msgstr "Sletning af komponent fuldfЬrt."
+
+#~ msgid "I don't recognize this type of calendar component."
+#~ msgstr "Kan ikke genkende denne type kalenderkomponent."
+
+#~ msgid "Add to Calendar"
+#~ msgstr "TilfЬj til Kalender"
+
+#~ msgid "Update Calendar"
+#~ msgstr "OpdatИr kalender"
+
+#~ msgid "Attendee address"
+#~ msgstr "Deltagers adresse"
+
+#~ msgid "Attendees: "
+#~ msgstr "Deltagere:"
+
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr ""
+#~ "AnnullИr\n"
+#~ "mЬde"
+
+#~ msgid "Organizer: "
+#~ msgstr "ArrangЬr:"
+
+#~ msgid ""
+#~ "Publish\n"
+#~ "Event"
+#~ msgstr ""
+#~ "OffentliggЬr\n"
+#~ "arrangement"
+
+#~ msgid "Show a dialog"
+#~ msgstr "Vis dialog"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "GrundlФggende om aftaler"
+
+#~ msgid "Settings..."
+#~ msgstr "Indstillinger..."
+
+#~ msgid "_Starting date:"
+#~ msgstr "_Start dato:"
+
+#~ msgid "Summary contains"
+#~ msgstr "Sammendrag indeholder"
+
+#, fuzzy
+#~ msgid "Comment contains"
+#~ msgstr "Navn indeholder"
+
+#~ msgid "Has category"
+#~ msgstr "Har kategori"
+
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "Kunne ikke tjekke lЕsefil for %s: %s"
+
+#, fuzzy
+#~ msgid "Error hashing password."
+#~ msgstr "Fejl under gemning af genveje."
+
+#~ msgid "Invalid password."
+#~ msgstr "Ugyldig adgangskode."
+
+#, fuzzy
+#~ msgid "Could not clearsign: certificate not found for \"%s\"."
+#~ msgstr "Kunne ikke oprette lЕsefil for %s: %s"
+
+#, fuzzy
+#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
+#~ msgstr "Kunne ikke koble til tjener: %s."
+
+#, fuzzy
+#~ msgid "Could not encrypt: encoding failed."
+#~ msgstr "Kunne ikke oprette rЬr: %s"
+
+#, fuzzy
+#~ msgid "Could not sign: failed to create content info."
+#~ msgstr "Kan ikke oprette komponeringsvinduet."
+
+#, fuzzy
+#~ msgid "'clearsign' is not supported by S/MIME."
+#~ msgstr "Den angivne type er ikke understЬttet i denne gemning"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Skanner IMAP-mapper"
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kunne ikke Еbne signaturfilen %s:\n"
+#~ "%s"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "Dette er ikke en almindelig fil."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "Den fil sЕ ud til at vФre tilgФngelig, men open(2) fejlede."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "Filen er meget stor (mere end 100 k).\n"
+#~ "Er du sikker pЕ at du Ьnsker at indsФtte den?"
+
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr " "
+
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr " "
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan ikke Еbne HTML-fil:\n"
+#~ "%s"
+
+#~ msgid "Select a service"
+#~ msgstr "VФlg tjeneste"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "Send et brev til %s"
+
+#~ msgid "Run %s"
+#~ msgstr "KЬr %s"
+
+#~ msgid "Close %s"
+#~ msgstr "Luk %s"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "Flyt %s til venstre"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "Flyt %s til hЬjre"
+
+#~ msgid "RDF Summary"
+#~ msgstr "RDF-sammendrag"
+
+#~ msgid "Test service"
+#~ msgstr "Testtjeneste"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Videresend til adresse"
+
+#~ msgid "Addressbooks"
+#~ msgstr "AdressebЬger"
+
+#~ msgid "PGP"
+#~ msgstr "PGP"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "фndr mappe \"%s\" til \"%s\" format"
+
+#~ msgid "Closing current folder"
+#~ msgstr "Lukker aktiv mappe"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "фndrer navn pЕ gammel mappe og genЕbner"
+
+#~ msgid "Creating new folder"
+#~ msgstr "Opretter en ny mappe"
+
+#~ msgid "Copying messages"
+#~ msgstr "Kopierer beskeder"
+
+#~ msgid "Evolution progress"
+#~ msgstr "Evolution fremgang"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Henter besked nummer %d af %d (uid \"%s\")"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Gemmer besked %d af %d (uid \"%s\")"
+
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "UfuldstФndig meddelse skrevet til rЬr!"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (videresendt meddelelse)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Fwd: (uden emne)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Videresendt meddelelse (intet emne)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Videresendt besked---<br><b>Fra:</b> %s<br><b>Til:</b> "
+#~ "%s<br><b>Emne:</b> %s<br>"
+
+#~ msgid "Reply to the sender of this message"
+#~ msgstr "Svar til afsenderen af denne meddelelse"
+
+#~ msgid "Reply to all recipients of this message"
+#~ msgstr "Svar til alle modtagere af denne meddelelse"
+
+#~ msgid "Delete this message"
+#~ msgstr "Slet denne meddelelse"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Evolutions filer blev installeret."
+
+#~ msgid "Activate"
+#~ msgstr "AktivИr"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "AktivИr denne genvej"
+
+#~ msgid "Find"
+#~ msgstr "Find"
+
+#~ msgid "Find a contact"
+#~ msgstr "Find kontakt"
+
+#~ msgid "View All"
+#~ msgstr "Vis alle"
+
+#~ msgid "View all contacts"
+#~ msgstr "Vis alle kontakter"
+
+#~ msgid "5 Days"
+#~ msgstr "Fem dage"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Opret en ny kalender"
+
+#~ msgid "Day"
+#~ msgstr "Dag"
+
+#~ msgid "Open Calendar"
+#~ msgstr "еbn kalender"
+
+#~ msgid "Prev"
+#~ msgstr "Smugkig"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Gem kalender som noget andet"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_еbn kalender"
+
+#~ msgid "About this application"
+#~ msgstr "Om denne applikation"
+
+#~ msgid "About..."
+#~ msgstr "Om..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "Ha_ndlinger"
+
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "Adresse_bog..."
+
+#~ msgid "C_lear"
+#~ msgstr "T_Ьm"
+
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "_Tjek navne"
+
+#~ msgid "Clear the selection"
+#~ msgstr "TЬm det valgte"
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "KopiИr til mappe... (RETMIG)"
+
+#~ msgid "Dump XML"
+#~ msgstr "Dump XML"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "Dump beskrivelse af grФnsefladen som XML"
+
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "FЬ_rste opfЬring i mappe (RET)"
+
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "Videresend (RET)"
+
+#~ msgid "Go to the next item"
+#~ msgstr "GЕ til nФste opfЬring"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "GЕ til forrige opfЬring"
+
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "U_komplet opgave (RETMIG)"
+
+#~ msgid "N_ext"
+#~ msgstr "N_Фste"
+
+#~ msgid "Pre_vious"
+#~ msgstr "Forri_ge"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "Skriverops_Фtning..."
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "OpsФt et eller andet mЬde"
+
+#~ msgid "Select everything"
+#~ msgstr "VФlg alt"
+
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "_OpgaveforespЬrgsel"
+
+#~ msgid "_About..."
+#~ msgstr "_Om..."
+
+#~ msgid "_Item (FIXME)"
+#~ msgstr "OpfЬring (RETMIG)"
+
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "_JournalopfЬring (RETMIG)"
+
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "_Sidste opfЬring i mappen (RETMIG)"
+
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "_Postmeddelelse (RETMIG)"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "_Flyt til mappe... (RETMIG)"
+
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_Note (RETMIG)"
+
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "_UlФst opfЬring (RETMIG)"
+
+#~ msgid "Add Service"
+#~ msgstr "TilfЬj tjeneste"
+
+#~ msgid "Add a new service to the Executive Summary"
+#~ msgstr "TilfЬj ny tjeneste til ledelsesresumИ"
+
+#~ msgid "Create a new email"
+#~ msgstr "Opret et nyt brev"
+
+#~ msgid "Executive Summary Settings..."
+#~ msgstr "Indstillinger for LedelsesresumИ..."
+
+#~ msgid "New Mail"
+#~ msgstr "Nyt post"
+
+#, fuzzy
+#~ msgid "Mar_k As Read"
+#~ msgstr "MФr_k som lФst"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "MФrk som _ulФst"
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Udskriv besked til printeren"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "OmdirigИr"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "_Gem i mappe... (RET)"
+
+#~ msgid "Send the message now"
+#~ msgstr "Send beskeden nu"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_IndsФt tekstfil... (RETMIG)"
+
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "_Tildel opgave (RET)"
+
+#~ msgid "Redo"
+#~ msgstr "Gentag"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Gentag sidste fortrudte handling"
+
+#~ msgid "Replace"
+#~ msgstr "Erstat"
+
+#~ msgid "Replace a string"
+#~ msgstr "Erstat en streng"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "Svar til _alle (RETMIG)"
+
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "S_end statusrapport (RETMIG)"
+
+#~ msgid "Search for a string"
+#~ msgstr "SЬg efter en streng"
+
+#~ msgid "Undo"
+#~ msgstr "Fortryd"
+
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "_MarkИr som fuldfЬrt (RETMIG)"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "Sva_r (RETMIG)"
+
 #~ msgid ""
 #~ "We were unable to open this addressbook.  This either\n"
 #~ "means you have entered an incorrect URI, or have tried\n"
@@ -9356,10 +12499,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "SASL"
 #~ msgstr "SASL"
 
-#, fuzzy
-#~ msgid "Show all "
-#~ msgstr "Vis alt"
-
 #~ msgid "VFolder on Subject"
 #~ msgstr "vMappe for emne"
 
@@ -9372,27 +12511,15 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Mark as Read"
 #~ msgstr "MarkИr som _lФst"
 
-#~ msgid "Mark as Unread"
-#~ msgstr "MarkИr som ulФst"
-
 #~ msgid "Move to Folder..."
 #~ msgstr "Flyt til mappe..."
 
 #~ msgid "Copy to Folder..."
 #~ msgstr "KopiИr til mappe..."
 
-#~ msgid "Undelete"
-#~ msgstr "Fortryd sletning"
-
 #~ msgid "Do you accept?"
 #~ msgstr "Accepterer du?"
 
-#~ msgid "View the selected folder"
-#~ msgstr "Vis den valgte mappe"
-
-#~ msgid "Compose a new message"
-#~ msgstr "Udskriv ny meddelelse"
-
 #~ msgid "Copy message to a new folder"
 #~ msgstr "KopiИr meddelelse til en ny mappe"
 
@@ -9402,10 +12529,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Hide Deleted Messages"
 #~ msgstr "Skjul slettede beskeder"
 
-#, fuzzy
-#~ msgid "Open in New Window"
-#~ msgstr "_еpne i nytt vindu"
-
 #~ msgid "Print Preview of message..."
 #~ msgstr "Vis udskrift af besked..."
 
@@ -9423,12 +12546,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "View Raw Message Source"
 #~ msgstr "Vis rЕ beskedskildetekst"
 
-#~ msgid "_Attachment"
-#~ msgstr "_Bilag"
-
-#~ msgid "_Open Selected Items"
-#~ msgstr "_еbn valgte beskeder"
-
 #~ msgid "_Reply"
 #~ msgstr "_Svar"
 
@@ -9477,10 +12594,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Portnummer i URL `%s' er ikke-numerisk"
 
 #, fuzzy
-#~ msgid "Secure IMAPv4"
-#~ msgstr "IMAPv4"
-
-#, fuzzy
 #~ msgid "For reading and storing mail on IMAP servers over an SSL connection."
 #~ msgstr "For lФsning og gemning af e-post pЕ IMAP-tjenere."
 
@@ -9515,10 +12628,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ "POP-tjenere."
 
 #, fuzzy
-#~ msgid "Remove action"
-#~ msgstr "UdfЬr handlinger"
-
-#, fuzzy
 #~ msgid "Remove criterion"
 #~ msgstr "TilfЬj kriterie"
 
@@ -9537,9 +12646,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Advanced"
 #~ msgstr "Avanceret..."
 
-#~ msgid "Check settings"
-#~ msgstr "Sjekk innstillinger"
-
 #, fuzzy
 #~ msgid "Email address:"
 #~ msgstr "Epostadresse:"
@@ -9549,10 +12655,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Konfiguration af epost"
 
 #, fuzzy
-#~ msgid "Hostname:"
-#~ msgstr "VФrt:"
-
-#, fuzzy
 #~ msgid "IMAP"
 #~ msgstr "IMAPv4"
 
@@ -9576,10 +12678,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Konfiguration af epost"
 
 #, fuzzy
-#~ msgid "Optional"
-#~ msgstr "Alternativer"
-
-#, fuzzy
 #~ msgid "Password:"
 #~ msgstr "Adgangskode"
 
@@ -9599,22 +12697,10 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "_NЬdvendig deltager"
 
 #, fuzzy
-#~ msgid "Select signature file"
-#~ msgstr "Signaturfil:"
-
-#, fuzzy
 #~ msgid "Server type:"
 #~ msgstr "Tjenertype:"
 
 #, fuzzy
-#~ msgid "Signature:"
-#~ msgstr "Signaturfil:"
-
-#, fuzzy
-#~ msgid "Source"
-#~ msgstr "Kilder"
-
-#, fuzzy
 #~ msgid "Transport"
 #~ msgstr "Gennemsigtig"
 
@@ -9703,9 +12789,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "JP Rosevear <jpr@helixcode.com>"
 #~ msgstr "JP Rosevar <jpr@helixcode.com>"
 
-#~ msgid "Original Author:"
-#~ msgstr "Opprinnelig forfatter:"
-
 #~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
 #~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
 
@@ -9747,10 +12830,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ "pilot-listen fra gnome-pilot daemonen"
 
 #, fuzzy
-#~ msgid "Configure the address conduit"
-#~ msgstr "Klik her for adressebogen"
-
-#, fuzzy
 #~ msgid "Evolution Address conduit "
 #~ msgstr "Evolution kontoredigering"
 
@@ -9817,10 +12896,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Account Properties"
 #~ msgstr "Egenskaber for bilag"
 
-#, fuzzy
-#~ msgid "E-Mail Address:"
-#~ msgstr "Epostadresse:"
-
 #~ msgid "Include in \"Get Mail\" operations."
 #~ msgstr "Ta med i \"Hent e-post\"-operasjoner."
 
@@ -9912,22 +12987,10 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "ProcentvФrdien skal vФre mellem 0 og 100, inklusive"
 
 #, fuzzy
-#~ msgid "Schedule meeting"
-#~ msgstr "PlanlФg mЬde"
-
-#, fuzzy
 #~ msgid "Edit this appointment..."
 #~ msgstr "RedigИr aftale"
 
 #, fuzzy
-#~ msgid "New"
-#~ msgstr "Nyheder"
-
-#, fuzzy
-#~ msgid "Saving changes to message..."
-#~ msgstr "Gemmer beskeder"
-
-#, fuzzy
 #~ msgid "Save changes to message..."
 #~ msgstr "Gem besked som..."
 
@@ -9973,9 +13036,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Appending \"%s\""
 #~ msgstr "Sender '%s'"
 
-#~ msgid "Appending a message without a subject"
-#~ msgstr "Legger til en melding uten emne"
-
 #, fuzzy
 #~ msgid "Moving messages from \"%s\" into \"%s\""
 #~ msgstr "Flytter meddelelser til %s"
@@ -10006,14 +13066,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 
 #, fuzzy
 #~ msgid ""
-#~ "Error while preparing to %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Fejl ved udfЬring af operation:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid ""
 #~ "Error while `%s':\n"
 #~ "%s"
 #~ msgstr ""
@@ -10042,10 +13094,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Fjerner abonnement pЕ mappe \"%s\""
 
 #, fuzzy
-#~ msgid "All Folders"
-#~ msgstr "Mapper"
-
-#, fuzzy
 #~ msgid "Display folders whose name contain:"
 #~ msgstr "Vis mapper som som starter med:"
 
@@ -10061,9 +13109,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Local stores do not have a default folder"
 #~ msgstr "Lokale gemmesteder har ikke en indbakke"
 
-#~ msgid "Local folders may not be nested."
-#~ msgstr "Lokale mapper kan ikke vФre rekursive."
-
 #, fuzzy
 #~ msgid "Page Set_up"
 #~ msgstr "SideopsФtning"
@@ -10100,10 +13145,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Sa_mmendrag:"
 
 #, fuzzy
-#~ msgid "Time"
-#~ msgstr "Titel"
-
-#, fuzzy
 #~ msgid "description"
 #~ msgstr "Beskrivelse:"
 
@@ -10196,14 +13237,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Du har ikke konfigurert en utboks"
 
 #, fuzzy
-#~ msgid ""
-#~ "Could not open file %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kunne ikke Еbne fil `%s':\n"
-#~ "%s"
-
-#, fuzzy
 #~ msgid "Fetch email from %s"
 #~ msgstr "Epost fra %s"
 
@@ -10247,18 +13280,10 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "_Redo"
 #~ msgstr "LФst"
 
-#, fuzzy
-#~ msgid "_Replace..."
-#~ msgstr "_еbn..."
-
 #~ msgid "_Undo"
 #~ msgstr "_Angre"
 
 #, fuzzy
-#~ msgid "Group %i"
-#~ msgstr "Gruppenavn:"
-
-#, fuzzy
 #~ msgid "<b>Error loading calendar:<br>Calendar in use."
 #~ msgstr "<b>Fejl ved indlФsning af kalender:<br>Metode ikke understЬttet"
 
@@ -10267,20 +13292,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Kunne ikke indlФse opgaverne i '%s'"
 
 #, fuzzy
-#~ msgid "Could not create a folder in `%s'"
-#~ msgstr ""
-#~ "Kunne ikke oprette mappe `%s':\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid " for "
-#~ msgstr "for"
-
-#, fuzzy
-#~ msgid "Show all hidden"
-#~ msgstr "Vis alt "
-
-#, fuzzy
 #~ msgid "Hide selected"
 #~ msgstr "Skjul valgte beskeder"
 
@@ -10346,10 +13357,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Signaturfil:"
 
 #, fuzzy
-#~ msgid "Server:"
-#~ msgstr "Tjenertype:"
-
-#, fuzzy
 #~ msgid "Mail source type:"
 #~ msgstr "Filtype:"
 
@@ -10409,10 +13416,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Edit Source"
 #~ msgstr "Kilder"
 
-#, fuzzy
-#~ msgid "Add News Server"
-#~ msgstr "TilfЬj tjeneste"
-
 #~ msgid "Edit News Server"
 #~ msgstr "RedigИr news-tjener"
 
@@ -10438,10 +13441,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Gennemsigtig"
 
 #, fuzzy
-#~ msgid "News Servers"
-#~ msgstr "%s-tjener %s"
-
-#, fuzzy
 #~ msgid "News Sources"
 #~ msgstr "Kilder"
 
@@ -10540,9 +13539,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "To-Do item that is not yet due:"
 #~ msgstr "OppgavelisteoppfЬring som ikke har gЕtt ut ennЕ:"
 
-#~ msgid "To-Do item that is due today:"
-#~ msgstr "OppgavelisteoppfЬring som gЕr ut idag:"
-
 #~ msgid "To-Do item that is overdue:"
 #~ msgstr "OppgavelisteoppfЬring som har gЕtt ut:"
 
@@ -10560,10 +13556,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Load \"%s\""
 #~ msgstr "Last \"%s\""
 
-#, fuzzy
-#~ msgid "Synchronizing \"%s\""
-#~ msgstr "Synkroniserer mappe"
-
 #~ msgid "Synchronize \"%s\""
 #~ msgstr "SynkronisИr \"%s\""
 
@@ -10707,10 +13699,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "I dag"
 
 #, fuzzy
-#~ msgid "last"
-#~ msgstr "IndsФt"
-
-#, fuzzy
 #~ msgid "this"
 #~ msgstr "."
 
@@ -10726,10 +13714,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "third"
 #~ msgstr "Andet"
 
-#, fuzzy
-#~ msgid "fourth"
-#~ msgstr "for"
-
 #~ msgid "fifth"
 #~ msgstr "femte"
 
@@ -10741,10 +13725,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "UlФst"
 
 #, fuzzy
-#~ msgid "eighth"
-#~ msgstr "HЬjde:"
-
-#, fuzzy
 #~ msgid "ninth"
 #~ msgstr "Udskriv"
 
@@ -10758,9 +13738,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "twelfth"
 #~ msgstr "tolvte"
 
-#~ msgid "ago"
-#~ msgstr "siden"
-
 #, fuzzy
 #~ msgid "Could not create summary"
 #~ msgstr "Kunne ikke oprette rЬr: %s"
@@ -10833,10 +13810,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Kunne ikke udfЬre %s: besked ikke sendt."
 
 #, fuzzy
-#~ msgid "Cannot fork %s: %s"
-#~ msgstr "Kan ikke fЕ fat pЕ mappe: %s: %s"
-
-#, fuzzy
 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr "Kan ikke initialisere Evolutions e-postkomponent."
 
@@ -10845,14 +13818,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Ny aftale..."
 
 #, fuzzy
-#~ msgid "Create a new folder"
-#~ msgstr "Opretter en ny mappe"
-
-#, fuzzy
-#~ msgid "_Create New Folder..."
-#~ msgstr "Opretter en ny mappe"
-
-#, fuzzy
 #~ msgid "Monday\n"
 #~ msgstr "mandag"
 
@@ -10866,10 +13831,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ "Outgoing"
 #~ msgstr "udgЕende"
 
-#, fuzzy
-#~ msgid "window2"
-#~ msgstr "nu"
-
 #~ msgid ""
 #~ "This appointment has custom recurrence rules that cannot be edited by "
 #~ "Evolution.\n"
@@ -10920,9 +13881,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Weeks start on"
 #~ msgstr "Uken starter pЕ"
 
-#~ msgid "Day range"
-#~ msgstr "DagomrЕde"
-
 #~ msgid ""
 #~ "Please select the start and end hours you want\n"
 #~ "to be displayed in the day view and week view.\n"
@@ -10938,10 +13896,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Day end:"
 #~ msgstr "Dato:"
 
-#, fuzzy
-#~ msgid "Colors for display"
-#~ msgstr "(Ingen mappe vist)"
-
 #~ msgid "Show on TODO List:"
 #~ msgstr "Vis pЕ oppgavelisten:"
 
@@ -10968,10 +13922,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Preferences"
 #~ msgstr "фndr opsФtning"
 
-#, fuzzy
-#~ msgid "Alarm Properties"
-#~ msgstr "Egenskaber"
-
 #~ msgid "Beep on display alarms"
 #~ msgstr "Pip ved visning av alarmer"
 
@@ -11027,10 +13977,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Din e-post tjener stЬtter fЬlgende typer autentisering. Vennligst"
 
 #, fuzzy
-#~ msgid "Threading message list"
-#~ msgstr "TrЕdet meddelelsesliste"
-
-#, fuzzy
 #~ msgid "Thread message list"
 #~ msgstr "TrЕdet meddelelsesliste"
 
@@ -11059,10 +14005,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "de dagen i mЕneden"
 
 #, fuzzy
-#~ msgid "Copy Message"
-#~ msgstr "Kopierer beskeder"
-
-#, fuzzy
 #~ msgid "Quick Search"
 #~ msgstr "SЬg"
 
@@ -11081,10 +14023,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "PrimФr epost"
 
 #, fuzzy
-#~ msgid "Could not connect to IMAP server on %s."
-#~ msgstr "Kunne ikke koble til POP-tjener pЕ %s."
-
-#, fuzzy
 #~ msgid "_Summary:"
 #~ msgstr "Sammendrag:"
 
@@ -11156,10 +14094,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "Dagen slutter:"
 
 #, fuzzy
-#~ msgid "Change"
-#~ msgstr "Foresatte"
-
-#, fuzzy
 #~ msgid "_Unselect All"
 #~ msgstr "VФlg alle"
 
@@ -11220,19 +14154,8 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "label8"
 #~ msgstr "etikett8"
 
-#, fuzzy
-#~ msgid "_Save..."
-#~ msgstr "_Gem som..."
-
 #~ msgid "Quit the message composer"
 #~ msgstr "Avslutt meldingsredigering"
 
-#, fuzzy
-#~ msgid "More criteria"
-#~ msgstr "TilfЬj kriterie"
-
-#~ msgid "Fewer criteria"
-#~ msgstr "FФrre kriterier"
-
 #~ msgid "Run filter \"%s\""
 #~ msgstr "KjЬr filter \"%s\""
diff --git a/po/de.po b/po/de.po
index ac4a001290..1c21dededd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-0.8cvs\n"
-"POT-Creation-Date: 2001-07-30 18:20+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-07-30 18:29+02:00\n"
 "Last-Translator: Matthias Warkus <mawarkus@gnome.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -327,8 +327,8 @@ msgstr "VCard fЭr %s"
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
 #: addressbook/gui/component/addressbook-factory.c:46
-#: calendar/conduits/calendar/calendar-conduit.c:1202
-#: calendar/conduits/todo/todo-conduit.c:1017
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo konnte nicht initialisiert werden"
@@ -342,14 +342,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook nicht geladen\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:776
-#: calendar/conduits/todo/todo-conduit.c:591
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Der Wombat-Server konnte nicht gestartet werden"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:777
-#: calendar/conduits/todo/todo-conduit.c:592
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Wombat konnte nicht gestartet werden"
 
@@ -455,7 +455,7 @@ msgstr "FIXME DN-Bindungs-Hilfetext hier"
 
 #. Remember the password?
 #: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:80 mail/mail-mt.c:436
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
 msgid "Remember this password"
 msgstr "Dieses Passwort speichern"
 
@@ -509,15 +509,15 @@ msgstr "FIXME Pfad-Hilfetext hier"
 msgid "Create path if it doesn't exist."
 msgstr "Pfad erstellen wenn er noch nicht existiert."
 
-#: addressbook/gui/component/addressbook-config.c:662
+#: addressbook/gui/component/addressbook-config.c:663
 msgid "Edit Addressbook"
 msgstr "Adressbuch bearbeiten"
 
-#: addressbook/gui/component/addressbook-config.c:664
+#: addressbook/gui/component/addressbook-config.c:665
 msgid "Add Addressbook"
 msgstr "Adressbuch hinzufЭgen"
 
-#: addressbook/gui/component/addressbook-config.c:682
+#: addressbook/gui/component/addressbook-config.c:683
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
@@ -525,22 +525,22 @@ msgstr ""
 "WДhlen Sie den Typ ihres Adressbuches und geben Sie die relevanten "
 "Informationen ein."
 
-#: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:894
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr "Name:"
 
-#: addressbook/gui/component/addressbook-config.c:689
+#: addressbook/gui/component/addressbook-config.c:692
 msgid "FIXME Name help text here"
 msgstr "FIXME Hilfetext zum Namen hier"
 
-#: addressbook/gui/component/addressbook-config.c:691
+#: addressbook/gui/component/addressbook-config.c:694
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: addressbook/gui/component/addressbook-config.c:692
+#: addressbook/gui/component/addressbook-config.c:695
 msgid "FIXME Description help text here"
 msgstr "FIXME Hilfetext zur Beschreibung hier"
 
@@ -641,15 +641,6 @@ msgstr "Kategorie enthДlt"
 msgid "The URI that the Folder Browser will display"
 msgstr "Die URI, die der Suchdienst anzeigen wird"
 
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * card.
-#.
-#: addressbook/gui/component/e-address-popup.c:178
-msgid "(none)"
-msgstr "(keine)"
-
 #: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: addressbook/gui/contact-editor/e-contact-editor.c:1536
@@ -722,10 +713,10 @@ msgstr "Factory fЭr die Namenauswahl-Schnittstelle des Adressbuchs"
 #: addressbook/gui/component/select-names/e-select-names.c:630
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
 #: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: my-evolution/e-summary-preferences.c:1181
-#: my-evolution/e-summary-preferences.c:1235
-#: my-evolution/e-summary-preferences.c:1296 shell/e-shortcuts-view.c:272
-#: shell/e-shortcuts-view.c:475
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -743,7 +734,8 @@ msgstr "Namenloser Kontakt"
 
 #: addressbook/gui/component/select-names/e-select-names.c:403
 msgid "Unable to get local storage.  This should never happen."
-msgstr "Lokaler Speicher kann nicht erreicht werden. Dies sollte nie passieren."
+msgstr ""
+"Lokaler Speicher kann nicht erreicht werden. Dies sollte nie passieren."
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Message Recipients"
@@ -850,10 +842,10 @@ msgstr "Kontakte..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1450
+#: calendar/gui/dialogs/meeting-page.c:1447
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
-#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:79
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "LЖschen"
 
@@ -1336,7 +1328,7 @@ msgstr "Nachricht an Kontakt schicken"
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
 #: addressbook/gui/widgets/e-addressbook-view.c:604
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-mail-message.xml.h:55 ui/evolution-tasks.xml.h:9
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Drucken"
@@ -1348,10 +1340,10 @@ msgstr "Umschlag drucken"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
 #: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:8 mail/mail-accounts.c:267
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
 #: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "LЖschen"
 
@@ -1733,18 +1725,18 @@ msgstr "Breite:"
 msgid "_Font..."
 msgstr "_Schrift..."
 
-#: calendar/conduits/calendar/calendar-conduit.c:733
-#: calendar/conduits/todo/todo-conduit.c:547
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Fehler bei der Kommunikation mit dem Kalender-Server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:837
-#: calendar/conduits/calendar/calendar-conduit.c:840
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "Calendar-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
-#: calendar/conduits/todo/todo-conduit.c:652
-#: calendar/conduits/todo/todo-conduit.c:655
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "ToDo-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
@@ -1892,7 +1884,35 @@ msgstr "gnome-vfs konnte nicht initialisiert werden"
 msgid "Could not create the alarm notify service factory"
 msgstr "Factory fЭr Alarm-Benachrichtigungsdienst konnte nicht angelegt werden"
 
-#: calendar/gui/calendar-commands.c:497
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A, %d. %B %Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a, %d. %b"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a, %d. %b"
+
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -1900,22 +1920,27 @@ msgstr ""
 "ORBit und OAF Einstellungen. "
 
 #: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
-#: calendar/gui/e-calendar-table.c:306
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "жffentlich"
 
 #: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
-#: calendar/gui/e-calendar-table.c:307
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Privat"
 
 #: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Vertraulich"
 
 #: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
 #: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
 #: camel/providers/smtp/camel-smtp-transport.c:223
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
@@ -1937,56 +1962,58 @@ msgstr "O"
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1182
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
 #: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:625
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Hoch"
 
-#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1184
-#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:624
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1186
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:623
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Niedrig"
 
-#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1238
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Transparent"
 
-#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1240
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Opak"
 
-#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1292
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
 #: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:402
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Nicht gestartet"
 
-#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1294
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
 #: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
-#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1296
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1298
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
 #: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:405 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Storniert"
@@ -2020,12 +2047,13 @@ msgstr ""
 "sein"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1236
-#: calendar/gui/calendar-model.c:1290
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
 #: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
 #: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:305 calendar/gui/e-calendar-table.c:380
-#: mail/mail-account-gui.c:1379 mail/mail-accounts.c:134
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
 #: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
 #: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
 #: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
@@ -2033,7 +2061,7 @@ msgstr ""
 msgid "None"
 msgstr "Keine"
 
-#: calendar/gui/calendar-model.c:1086
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2043,39 +2071,43 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1126
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Der Prozentwert muss zwischen 0 und 100 (einschlieъlich) sein"
 
-#: calendar/gui/calendar-model.c:1167
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "Die PrioritДt muss 'Hoch', 'Normal', 'Niedrig' oder 'Undefiniert' sein."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1180
+#: calendar/gui/calendar-model.c:1181
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Undefiniert"
 
-#: calendar/gui/calendar-model.c:1221
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "Die Transparenz muss 'Transparent', 'Opak' oder 'Keine' sein."
 
-#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: calendar/gui/calendar-model.c:1711
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Nein"
 
@@ -2273,11 +2305,12 @@ msgstr "Zusammenfassung:"
 msgid "_Options..."
 msgstr "_Optionen..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
 msgid "after"
 msgstr "nach"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:36
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
 msgid "before"
 msgstr "vor"
 
@@ -2385,7 +2418,7 @@ msgid "Fri"
 msgstr "Fr"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:983
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Freitag"
 
@@ -2394,7 +2427,7 @@ msgid "Mon"
 msgstr "Mo"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:979
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Montag"
 
@@ -2415,7 +2448,7 @@ msgid "Sat"
 msgstr "Sa"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:984
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Samstag"
 
@@ -2436,7 +2469,7 @@ msgid "Sun"
 msgstr "So"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:985
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Sonntag"
 
@@ -2453,7 +2486,7 @@ msgid "Thu"
 msgstr "Do"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:982
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Donnerstag"
 
@@ -2478,7 +2511,7 @@ msgid "Tue"
 msgstr "Di"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:980
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Dienstag"
 
@@ -2487,7 +2520,7 @@ msgid "Wed"
 msgstr "Mi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:981
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Mittwoch"
 
@@ -2569,27 +2602,27 @@ msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Sie haben keine дnderungen gemacht, den Editor aktualisieren?"
 
 #: calendar/gui/dialogs/comp-editor-util.c:154
-#: calendar/gui/e-itip-control.c:619 calendar/gui/print.c:2116
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
 msgid " to "
 msgstr " an "
 
 #: calendar/gui/dialogs/comp-editor-util.c:158
-#: calendar/gui/e-itip-control.c:623 calendar/gui/print.c:2120
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
 msgid " (Completed "
 msgstr " (Abgeschlossen "
 
 #: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:625 calendar/gui/print.c:2122
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
 msgid "Completed "
 msgstr "Abgeschlossen "
 
 #: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:630 calendar/gui/print.c:2127
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
 msgid " (Due "
 msgstr " (FДllig am "
 
 #: calendar/gui/dialogs/comp-editor-util.c:167
-#: calendar/gui/e-itip-control.c:632 calendar/gui/print.c:2129
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
 msgid "Due "
 msgstr "FДllig am "
 
@@ -2631,7 +2664,7 @@ msgstr ""
 "эberschreiben?"
 
 #: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+#: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Speichern unter..."
 
@@ -2764,15 +2797,135 @@ msgstr "_Endzeit:"
 msgid "_Start time:"
 msgstr "Anfangszeit:"
 
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Gruppenname:"
+
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Quelle"
+
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+#, fuzzy
+msgid "Chair"
+msgstr "Auto"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+#, fuzzy
+msgid "Required Participant"
+msgstr "BenЖtigte Information"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+#, fuzzy
+msgid "Optional Participant"
+msgstr "Optionale Information"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Eine Aktion wДhlen"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Accepted"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr "GelЖscht"
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "VorlДufig"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "GelЖscht"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "In Bearbeitung"
+
 #: calendar/gui/dialogs/meeting-page.c:712
 msgid "That person is already attending the meeting!"
 msgstr "Diese Person nimmt schon an der Besprechung teil!"
 
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Autotelefon"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "BenЖtigte Information"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Optionale Information"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Non-Participants"
+msgstr ""
+
 #: calendar/gui/dialogs/meeting-page.c:891
 msgid "Sent By:"
 msgstr "Verschickt durch:"
 
-#: calendar/gui/dialogs/meeting-page.c:1445
+#: calendar/gui/dialogs/meeting-page.c:1442
 msgid "_Delegate To..."
 msgstr "_Delegieren an..."
 
@@ -2809,7 +2962,7 @@ msgid "Role"
 msgstr "Position"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:32
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
 #: mail/message-list.etspec.h:8
 msgid "Status"
 msgstr "Status"
@@ -2838,34 +2991,34 @@ msgstr "Andere _einladen"
 msgid "_Other Organizer"
 msgstr "_Anderer Organisator"
 
-#: calendar/gui/dialogs/recurrence-page.c:439 calendar/gui/print.c:1839
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
 #: calendar/gui/print.c:1841 calendar/gui/print.c:1842
 msgid "%a %b %d %Y"
 msgstr "%a, %d. %b %Y"
 
-#: calendar/gui/dialogs/recurrence-page.c:587
+#: calendar/gui/dialogs/recurrence-page.c:584
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Dieser Termin enthДlt Wiederholungsregeln, die Evolution nicht bearbeiten "
 "kann."
 
-#: calendar/gui/dialogs/recurrence-page.c:952
+#: calendar/gui/dialogs/recurrence-page.c:938
 msgid "on"
 msgstr "bei"
 
-#: calendar/gui/dialogs/recurrence-page.c:978 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
 msgid "day"
 msgstr "Tag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1108
+#: calendar/gui/dialogs/recurrence-page.c:1094
 msgid "on the"
 msgstr "am"
 
-#: calendar/gui/dialogs/recurrence-page.c:1116
+#: calendar/gui/dialogs/recurrence-page.c:1102
 msgid "th"
 msgstr "."
 
-#: calendar/gui/dialogs/recurrence-page.c:1286
+#: calendar/gui/dialogs/recurrence-page.c:1274
 msgid "occurrences"
 msgstr "Auftreten"
 
@@ -2963,7 +3116,7 @@ msgid "No one"
 msgstr "Niemanden"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:902
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
@@ -2996,102 +3149,106 @@ msgstr "_PrioritДt:"
 msgid "_Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-calendar-table.c:350
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:840
-msgid "Edit this task"
-msgstr "Diese Aufgabe bearbeiten"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "ж_ffnen"
 
-#: calendar/gui/e-calendar-table.c:841 calendar/gui/e-calendar-table.c:851
-#: calendar/gui/e-day-view.c:3331 calendar/gui/e-week-view.c:3168
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
-msgid "Cut"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
 msgstr "Ausschneiden"
 
-#: calendar/gui/e-calendar-table.c:842 calendar/gui/e-calendar-table.c:852
-#: calendar/gui/e-day-view.c:3333 calendar/gui/e-week-view.c:3170
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
-msgid "Copy"
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
 msgstr "Kopieren"
 
-#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-table.c:853
-#: calendar/gui/e-day-view.c:3306 calendar/gui/e-day-view.c:3335
-#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3172
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
-msgid "Paste"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
 msgstr "EinfЭgen"
 
-#: calendar/gui/e-calendar-table.c:845
-msgid "Mark as complete"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
 msgstr "Als abgeschlossen markieren"
 
-#: calendar/gui/e-calendar-table.c:846
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Diese Aufgabe lЖschen"
 
-#: calendar/gui/e-calendar-table.c:855
-msgid "Mark tasks as complete"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
 msgstr "Als abgeschlossen markieren"
 
-#: calendar/gui/e-calendar-table.c:856 ui/evolution-tasks.xml.h:6
-msgid "Delete selected tasks"
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "AusgewДhlte Aufgaben lЖschen"
 
-#: calendar/gui/e-calendar-table.c:1122
+#: calendar/gui/e-calendar-table.c:1137
 msgid "Click here to add a task"
 msgstr "Hier klicken, um eine Aufgabe hinzuzufЭgen"
 
@@ -3165,13 +3322,6 @@ msgstr "%02i Minuten-Unterteilungen"
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:289 calendar/gui/e-day-view.c:1344
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr "%a, %d. %b"
-
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
 #: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
@@ -3191,121 +3341,124 @@ msgstr "AM"
 msgid "pm"
 msgstr "PM"
 
-#: calendar/gui/e-day-view.c:3311 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Neuer Termin"
 
-#: calendar/gui/e-day-view.c:3313 calendar/gui/e-week-view.c:3151
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "Neues ganztДgiges Ereignis"
 
 #: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-msgid "Go to Today"
-msgstr "Zum heutigen Tag"
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "Zum _heutigen Tag"
 
 #: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
-msgid "Go to Date..."
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "Gehe zu Datum..."
 
-#: calendar/gui/e-day-view.c:3327 calendar/gui/e-week-view.c:3164
-#: shell/e-shortcuts-view.c:468 ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "жffnen"
-
 #: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
-msgid "Delete this Appointment"
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Diesen Termin lЖschen"
 
-#: calendar/gui/e-day-view.c:3344 calendar/gui/e-week-view.c:3186
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Dieses Auftreten beweglich machen"
 
-#: calendar/gui/e-day-view.c:3346 calendar/gui/e-week-view.c:3188
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "Dieses Auftreten lЖschen"
 
-#: calendar/gui/e-day-view.c:3348
-msgid "Delete all Occurrences"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "Jedes Auftreten lЖschen"
 
-#: calendar/gui/e-itip-control.c:686
+#: calendar/gui/e-itip-control.c:694
 msgid "This is an event that can be added to your calendar."
 msgstr "Dies ist ein Ereignis, das zu Ihrem Kalender hinzugefЭgt werden kann."
 
-#: calendar/gui/e-itip-control.c:689
+#: calendar/gui/e-itip-control.c:697
 msgid "This is a meeting request."
 msgstr "Dies ist eine Besprechungsanfrage."
 
-#: calendar/gui/e-itip-control.c:692
+#: calendar/gui/e-itip-control.c:700
 msgid "This is one or more additions to a current meeting."
 msgstr "Dies sind ein oder mehrere NachtrДge zu einer aktuellen Besprechung."
 
-#: calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:703
 msgid "This is a request for the latest event information."
 msgstr "Dies ist eine Anfrage zu den neuesten Ereignisinformationen."
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:706
 msgid "This is a reply to a meeting request."
 msgstr "Dies ist eine Antwort auf eine Besprechungsanfrage."
 
-#: calendar/gui/e-itip-control.c:701
+#: calendar/gui/e-itip-control.c:709
 msgid "This is an event cancellation."
 msgstr "Dies ist eine Ereignisstornierung."
 
-#: calendar/gui/e-itip-control.c:704 calendar/gui/e-itip-control.c:744
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 msgid "The message is not understandable."
 msgstr "Diese Nachricht ist unverstДndlich."
 
-#: calendar/gui/e-itip-control.c:729
+#: calendar/gui/e-itip-control.c:737
 msgid "This is an task that can be added to your calendar."
 msgstr "Dies ist eine Aufgabe, die zu Ihrem Kalender hinzugefЭgt werden kann."
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:740
 msgid "This is a task request."
 msgstr "Dies ist eine Aufgabenanfrage."
 
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:743
 msgid "This is a request for the latest task information."
 msgstr "Dies ist eine Anfrage zur neuesten Aufgabeninformation."
 
-#: calendar/gui/e-itip-control.c:738
+#: calendar/gui/e-itip-control.c:746
 msgid "This is a reply to a task request."
 msgstr "Dies ist eine Antwort auf eine Aufgabenanfrage."
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:749
 msgid "This is an task cancellation."
 msgstr "Dies ist eine Aufgabenstornierung."
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:771
 msgid "This is freebusy information."
 msgstr "Dies sind VerfЭgbarkeitsinformationen."
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:774
 msgid "This is a request for freebusy information."
 msgstr "Dies ist eine Anfrage um VerfЭgbarkeitsinformationen."
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:777
 msgid "This is a reply to a freebusy request."
 msgstr "Dies ist eine Antwort auf eine VerfЭgbarkeitsanfrage."
 
-#: calendar/gui/e-itip-control.c:826
+#: calendar/gui/e-itip-control.c:834
 msgid "The message does not appear to be properly formed"
 msgstr "Diese Nachricht schein formell ungЭltig zu sein"
 
-#: calendar/gui/e-itip-control.c:845
+#: calendar/gui/e-itip-control.c:853
 msgid "The message contains only unsupported requests."
 msgstr "Die Nachricht enthДlt keine unterstЭtzten Anfragen."
 
-#: calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:877
 msgid "The information contained in this attachment was not valid"
 msgstr "Die in diesem Anhang enthaltene Information war ungЭltig."
 
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:989
 msgid "I couldn't update your calendar file!\n"
 msgstr "Ihre Kalenderdatei konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1007
+#: calendar/gui/e-itip-control.c:1015
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Der Eintrag konnte nicht aus Ihrer Kalenderdatei entfernt werden!\n"
 
@@ -3374,20 +3527,17 @@ msgstr ""
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: calendar/gui/e-week-view.c:3149 calendar/gui/e-week-view.c:3177
-msgid "New Appointment..."
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
 msgstr "Neuer Termin..."
 
-#: calendar/gui/e-week-view.c:3190
-msgid "Delete All Occurrences"
-msgstr "Jedes Auftreten lЖschen"
-
-#: calendar/gui/gnome-cal.c:969
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Der Ordner in `%s' konnte nicht geЖffnet werden"
 
-#: calendar/gui/gnome-cal.c:980
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -3658,7 +3808,7 @@ msgstr "Eintrag drucken"
 msgid "Print Setup"
 msgstr "Druckeinstellungen"
 
-#: calendar/gui/tasks-control.c:122
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "Der URI, den der Aufgabenordner anzeigen wird"
 
@@ -3746,7 +3896,7 @@ msgstr ""
 "%s\n"
 "дnderungen an diesem Ordner werden nicht resynchronisiert werden."
 
-#: camel/camel-disco-diary.c:280
+#: camel/camel-disco-diary.c:278
 msgid "Resynchronizing with server"
 msgstr "Resynchronisieren mit dem Server"
 
@@ -3767,7 +3917,6 @@ msgid "Unable to process spool folder"
 msgstr "Der Spool-Ordner kann nicht verarbeitet werden"
 
 #: camel/camel-filter-driver.c:667
-#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Nachricht %d wird abgerufen (%d%%)"
 
@@ -5650,11 +5799,11 @@ msgstr "Datei Жffnen"
 msgid "Insert File"
 msgstr "Datei einfЭgen"
 
-#: composer/e-msg-composer.c:1856 composer/e-msg-composer.c:2245
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Eine Nachricht erstellen"
 
-#: composer/e-msg-composer.c:2339
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "Erstellungsfenster konnte nicht erzeugt werden."
 
@@ -5944,9 +6093,9 @@ msgid "outgoing"
 msgstr "Ausgang"
 
 #: filter/filter.glade.h:1 mail/mail-config.glade.h:8
-#: my-evolution/e-summary-preferences.c:1174
-#: my-evolution/e-summary-preferences.c:1226
-#: my-evolution/e-summary-preferences.c:1288
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
 msgid "Add"
 msgstr "HinzufЭgen"
 
@@ -5994,202 +6143,197 @@ msgstr "mit allen lokalen Ordnern und aktiven Ordnern aus dem Netz"
 msgid "with all local folders"
 msgstr "mit allen lokalen Ordnern"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Farbe zuweisen"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Bewertung zuweisen"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Anlagen"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "enthДlt"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "In Ordner kopieren"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Empfangsdatum"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Sendedatum"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "GelЖscht"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "enthДlt nicht"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "endet nicht mit"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "existiert nicht"
+
+#: filter/libfilter-i18n.h:16
+msgid "does not sound like"
+msgstr "klingt nicht wie"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
+msgstr "beginnt nicht mit"
+
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr "Existieren nicht"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "Entwurf"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:20
+msgid "ends with"
+msgstr "endet mit"
+
+#: filter/libfilter-i18n.h:21
 msgid "Exist"
 msgstr "Existiert"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:22
+msgid "exists"
+msgstr "existiert"
+
+#: filter/libfilter-i18n.h:23
 msgid "Expression"
 msgstr "Ausdruck"
 
-#: filter/libfilter-i18n.h:14
-msgid "Forward to Address"
-msgstr "Weiterleiten an Adresse"
-
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:24
 msgid "Important"
 msgstr "Wichtig"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
+msgid "is"
+msgstr "ist"
+
+#: filter/libfilter-i18n.h:26
+msgid "is greater than"
+msgstr "ist grЖъer als"
+
+#: filter/libfilter-i18n.h:27
+msgid "is less than"
+msgstr "ist kleiner als"
+
+#: filter/libfilter-i18n.h:28
+msgid "is not"
+msgstr "ist nicht"
+
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Mailingliste"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Nachrichtenrumpf"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Nachrichtenkopf"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Nachricht wurde empfangen"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Nachricht wurde verschickt"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "In Ordner verschieben"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:35
+msgid "on or after"
+msgstr "am oder nach"
+
+#: filter/libfilter-i18n.h:36
+msgid "on or before"
+msgstr "am oder vor"
+
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Gelesen"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "EmpfДnger"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Regex-Treffer"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Beantwortet an"
 
-#: filter/libfilter-i18n.h:26 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Bewertung"
 
-#: filter/libfilter-i18n.h:27 mail/mail-callbacks.c:1091
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Absender"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Status setzen:"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:44
 msgid "Size (kB)"
 msgstr "GrЖъe (kB)"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:45
+msgid "sounds like"
+msgstr "klingt wie"
+
+#: filter/libfilter-i18n.h:46
 msgid "Source Account"
 msgstr "Herkunfts-Account"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr "Bestimmte Kopfzeile"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:48
+msgid "starts with"
+msgstr "beginnt mit"
+
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Verarbeitung abbrechen"
 
-#: filter/libfilter-i18n.h:34 mail/mail-format.c:866
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Betreff"
 
-#: filter/libfilter-i18n.h:37
-msgid "contains"
-msgstr "enthДlt"
-
-#: filter/libfilter-i18n.h:38
-msgid "does not contain"
-msgstr "enthДlt nicht"
-
-#: filter/libfilter-i18n.h:39
-msgid "does not end with"
-msgstr "endet nicht mit"
-
-#: filter/libfilter-i18n.h:40
-msgid "does not exist"
-msgstr "existiert nicht"
-
-#: filter/libfilter-i18n.h:41
-msgid "does not sound like"
-msgstr "klingt nicht wie"
-
-#: filter/libfilter-i18n.h:42
-msgid "does not start with"
-msgstr "beginnt nicht mit"
-
-#: filter/libfilter-i18n.h:43
-msgid "ends with"
-msgstr "endet mit"
-
-#: filter/libfilter-i18n.h:44
-msgid "exists"
-msgstr "existiert"
-
-#: filter/libfilter-i18n.h:45
-msgid "is greater than"
-msgstr "ist grЖъer als"
-
-#: filter/libfilter-i18n.h:46
-msgid "is less than"
-msgstr "ist kleiner als"
-
-#: filter/libfilter-i18n.h:47
-msgid "is not"
-msgstr "ist nicht"
-
-#: filter/libfilter-i18n.h:48
-msgid "is"
-msgstr "ist"
-
-#: filter/libfilter-i18n.h:49
-msgid "on or after"
-msgstr "am oder nach"
-
-#: filter/libfilter-i18n.h:50
-msgid "on or before"
-msgstr "am oder vor"
-
-#: filter/libfilter-i18n.h:51
-msgid "sounds like"
-msgstr "klingt wie"
-
 #: filter/libfilter-i18n.h:52
-msgid "starts with"
-msgstr "beginnt mit"
-
-#: filter/libfilter-i18n.h:53
 msgid "was after"
 msgstr "war nach"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:53
 msgid "was before"
 msgstr "war vor"
 
@@ -6379,32 +6523,28 @@ msgstr "Filter Эber _EmpfДnger"
 msgid "Filter on _Mailing List"
 msgstr "Filter Эber _Mailingliste"
 
-#: mail/folder-browser.c:1271
-msgid "_Open"
-msgstr "ж_ffnen"
-
 #: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Nochmals schicken"
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:87
-#: ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Speichern _unter..."
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:16
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "Drucken"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:86
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "Antwort an Ab_sender"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:62
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
 msgid "Reply to _List"
 msgstr "_Liste antworten"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:61
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "_Allen antworten"
 
@@ -6412,11 +6552,11 @@ msgstr "_Allen antworten"
 msgid "_Forward"
 msgstr "Weiterleiten"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:39
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Als gelesen markieren"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:41
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Als ungelesen markieren"
 
@@ -6436,7 +6576,7 @@ msgstr "In Ordner verschieben..."
 msgid "_Copy to Folder..."
 msgstr "In Ordner kopieren..."
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:88
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "LЖschen rЭckgДngig"
 
@@ -6800,7 +6940,7 @@ msgstr ""
 msgid "Evolution Account Wizard"
 msgstr "Evolution-Account-Druide"
 
-#: mail/mail-config.c:1589 mail/mail-config.c:1592
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 msgid "Connecting to server..."
 msgstr "Verbindung zu Server..."
 
@@ -6916,8 +7056,7 @@ msgstr "EntwЭrfe"
 msgid "Drafts folder:"
 msgstr "EntwЭrfe-Ordner:"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Bearbeiten..."
 
@@ -7039,7 +7178,8 @@ msgstr "Beim Abschicken von Nachrichten ohne Betreff nachfragen"
 
 #: mail/mail-config.glade.h:73
 msgid "Prompt when sending messages with only Bcc recipients defined"
-msgstr "Beim Abschicken von Nachrichten mit ausschlieъlich BCC-EmpfДngern nachfragen"
+msgstr ""
+"Beim Abschicken von Nachrichten mit ausschlieъlich BCC-EmpfДngern nachfragen"
 
 #: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
@@ -7281,84 +7421,94 @@ msgstr "%d nicht verschickt"
 msgid "%d total"
 msgstr "%d insgesamt"
 
-#: mail/mail-format.c:608
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s-Anlage"
 
-#: mail/mail-format.c:657
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "MIME-Nachricht konnte nicht geparst werden. Wird als Quellcode angezeigt."
 
-#: mail/mail-format.c:739
+#: mail/mail-format.c:746
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:855 mail/message-list.etspec.h:3
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "E-Mail-Adresse:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Von"
 
-#: mail/mail-format.c:858
+#: mail/mail-format.c:867
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: mail/mail-format.c:861 mail/message-list.etspec.h:10
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "An"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:873
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1283
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "Kein GPG/PGP-Programm konfiguriert."
 
-#: mail/mail-format.c:1298
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "VerschlЭsselte Nachricht nicht angezeigt"
 
-#: mail/mail-format.c:1304
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "VerschlЭsselte Nachricht"
 
-#: mail/mail-format.c:1305
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Zum EntschlЭsseln Icon klicken."
 
-#: mail/mail-format.c:1361
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 "Diese Nachricht ist digital signiert und wurde als authentisch nachgewiesen."
 
-#: mail/mail-format.c:1369
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Diese Nachricht ist digital signiert, kann aber nicht als authentisch "
 "nachgewiesen werden."
 
-#: mail/mail-format.c:2023
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Zeiger auf FTP-Site (%s)"
 
-#: mail/mail-format.c:2035
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Zeiger auf lokale Datei (%s) gЭltig auf Site \"%s\""
 
-#: mail/mail-format.c:2039
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Zeiger auf lokale Datei (%s)"
 
-#: mail/mail-format.c:2073
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Zeiger auf FTP-Site (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Zeiger auf unbekannte externe Daten (Typ \"%s\")"
 
-#: mail/mail-format.c:2078
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr "UngЭltiger external-body-Teil."
 
@@ -7414,7 +7564,7 @@ msgstr ""
 "Fehler beim AusfЭhren eines Vorgangs:\n"
 "%s"
 
-#: mail/mail-mt.c:785
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "In Arbeit"
 
@@ -7612,36 +7762,29 @@ msgstr "Verschicken"
 msgid "Cancelled."
 msgstr "Storniert"
 
-#: mail/mail-session.c:170
+#: mail/mail-session.c:171
 msgid "User canceled operation."
 msgstr "Benutzer hat Aktion abgebrochen."
 
-#: mail/mail-tools.c:175
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "TemporДre Mbox `%s' konnte nicht angelegt werden: %s"
 
-#: mail/mail-tools.c:228
-msgid "[Fwd: No Subject]"
-msgstr "[Fwd: (kein Betreff)]"
-
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Weitergeleitete Nachricht - %s"
 
-#: mail/mail-tools.c:247
-msgid "Forwarded message (no subject)"
-msgstr "Weitergeleitete Nachricht (kein Betreff)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Weitergeleitete Nachrichten"
 
 #: mail/mail-tools.c:469
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
-"s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Weitergeleitete Nachricht-----<br><b>Von:</b> %s<br><b>An:</b> %"
-"s<br><b>Betreff:</b> %s<br>"
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Weitergeleitete Nachrichten"
 
 #: mail/mail-vfolder.c:270
 msgid "VFolders"
@@ -7792,31 +7935,32 @@ msgstr "%a %H.%M"
 msgid "Mail summary"
 msgstr "Mail-Zusammenfassung"
 
-#: my-evolution/e-summary-preferences.c:424
+#: my-evolution/e-summary-preferences.c:420
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com: Wort des Tages"
 
-#: my-evolution/e-summary-preferences.c:446
+#: my-evolution/e-summary-preferences.c:442
 msgid "Quotes of the Day"
 msgstr "Zitate des Tages"
 
-#: my-evolution/e-summary-preferences.c:882
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "Einen Newsstrom hinzufЭgen"
 
-#: my-evolution/e-summary-preferences.c:890
+#: my-evolution/e-summary-preferences.c:877
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Geben Sie die Adresse des Newsstromes ein, den Sie hinzufЭgen wollen"
 
-#: my-evolution/e-summary-preferences.c:1425
+#: my-evolution/e-summary-preferences.c:1408
 msgid "My Evolution Settings"
 msgstr "Einstellungen von My Evolution"
 
-#: my-evolution/e-summary-rdf.c:311
-msgid "There was an error downloading news feed</b></dt>"
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
 msgstr "Beim Herunterladen des Newsstromes ist ein Fehler aufgetreten</b></dt>"
 
-#: my-evolution/e-summary-rdf.c:393 my-evolution/e-summary-rdf.c:419
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Fehler beim Herunterladen von RDF</b>"
 
@@ -7831,8 +7975,8 @@ msgstr "Mein Wetter"
 #: my-evolution/e-summary-weather.c:313
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
-"<dd><b>Es konnte keine Verbindung mit dem Wetterserver aufgenommen werden</"
-"b></dd>"
+"<dd><b>Es konnte keine Verbindung mit dem Wetterserver aufgenommen "
+"werden</b></dd>"
 
 #: my-evolution/e-summary-weather.c:643
 msgid "Regions"
@@ -7854,38 +7998,6 @@ msgstr "Drucken von My Evolution fehlgeschlagen"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Chefsesselansichts-Komponente konnte Bonobo nicht initialisieren.\n"
 
-#: my-evolution/metar.c:29
-msgid "╟F"
-msgstr "╟F"
-
-#: my-evolution/metar.c:29
-msgid "╟C"
-msgstr "╟C"
-
-#: my-evolution/metar.c:33
-msgid "knots"
-msgstr "Knoten"
-
-#: my-evolution/metar.c:33
-msgid "kph"
-msgstr "km/h"
-
-#: my-evolution/metar.c:38
-msgid "inHg"
-msgstr "Zoll Hg"
-
-#: my-evolution/metar.c:38
-msgid "mmHg"
-msgstr "Torr"
-
-#: my-evolution/metar.c:41
-msgid "miles"
-msgstr "Meilen"
-
-#: my-evolution/metar.c:41
-msgid "kilometers"
-msgstr "Kilometer"
-
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Wolkenloser Himmel"
@@ -9133,14 +9245,10 @@ msgid "Weather settings"
 msgstr "Wetter-Einstellungen"
 
 #: my-evolution/my-evolution.glade.h:27
-msgid "Wipe trackers"
-msgstr "Verfolgungen auswischen"
-
-#: my-evolution/my-evolution.glade.h:28
 msgid "imperial"
 msgstr "englisch"
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:28
 msgid "metric"
 msgstr "metrisch"
 
@@ -9297,7 +9405,7 @@ msgstr "Sind Sie sicher, dass Sie den Ordner '%s' entfernen wollen?"
 msgid "Rename folder '%s'"
 msgstr "Ordner '%s' umbenennen"
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -9306,11 +9414,11 @@ msgstr ""
 "Der angegebene Ordner kann nicht erstellt werden:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "Der angegebene Ordnername ist nicht gЭltig"
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Neuen Ordner anlegen"
 
@@ -9553,92 +9661,96 @@ msgstr ""
 msgid "Don't remove"
 msgstr "Nicht entfernen"
 
-#: shell/e-shortcuts-view.c:297
+#: shell/e-shortcuts-view.c:300
 msgid "Rename Shortcut Group"
 msgstr "VerknЭpfungsgruppe umbenennen"
 
-#: shell/e-shortcuts-view.c:298
+#: shell/e-shortcuts-view.c:301
 msgid "Rename selected shortcut group to:"
 msgstr "AusgewДhlte VerknЭpfungsgruppe umbenennen in:"
 
-#: shell/e-shortcuts-view.c:308
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "Kleine Icons"
 
-#: shell/e-shortcuts-view.c:309
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Die VerknЭpfungen als kleine Icons anzeigen"
 
-#: shell/e-shortcuts-view.c:311
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "Groъe Icons"
 
-#: shell/e-shortcuts-view.c:312
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Die VerknЭpfungen als groъe Icons zeigen"
 
-#: shell/e-shortcuts-view.c:323
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "Neue Gruppe..."
 
-#: shell/e-shortcuts-view.c:324
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Eine neue VerknЭpfungsgruppe anlegen"
 
-#: shell/e-shortcuts-view.c:326
+#: shell/e-shortcuts-view.c:332
 msgid "_Remove this Group..."
 msgstr "Diese Gruppe _entfernen..."
 
-#: shell/e-shortcuts-view.c:327
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Diese VerknЭpfungsgruppe entfernen"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:335
 msgid "Re_name this Group..."
 msgstr "Diese Gruppe _umbenennen..."
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:336
 msgid "Rename this shortcut group"
 msgstr "Diese VerknЭpfungsgruppe umbenennen"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "Die VerknЭpfungsleiste verbergen"
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Die VerknЭpfungsleiste verbergen"
 
-#: shell/e-shortcuts-view.c:455
+#: shell/e-shortcuts-view.c:461
 msgid "Rename shortcut"
 msgstr "VerknЭpfung umbenennen"
 
-#: shell/e-shortcuts-view.c:456
+#: shell/e-shortcuts-view.c:462
 msgid "Rename selected shortcut to:"
 msgstr "AusgewДhlte VerknЭpfungsgruppe umbenennen in:"
 
-#: shell/e-shortcuts-view.c:468
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "жffnen"
+
+#: shell/e-shortcuts-view.c:474
 msgid "Open the folder linked to this shortcut"
 msgstr "Den mit dieser VerknЭpfung verbundenen Ordner Жffnen"
 
-#: shell/e-shortcuts-view.c:470 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "In neuem Fenster Жffnen"
 
-#: shell/e-shortcuts-view.c:470
+#: shell/e-shortcuts-view.c:476
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr ""
 "Den mit dieser VerknЭpfung verbundenen Ordner in einem neuen Fenster Жffnen"
 
-#: shell/e-shortcuts-view.c:473
+#: shell/e-shortcuts-view.c:479
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: shell/e-shortcuts-view.c:473
+#: shell/e-shortcuts-view.c:479
 msgid "Rename this shortcut"
 msgstr "Diese VerknЭpfung umbenennen"
 
-#: shell/e-shortcuts-view.c:475
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Diese VerknЭpfung aus der VerknЭpfungsleiste entfernen"
 
@@ -9708,7 +9820,6 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:173
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (zu %d%% abgeschlossen)"
 
@@ -9834,10 +9945,10 @@ msgstr "Die Diagnoseausgabe aller Komponenten in eine Datei umleiten."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Das Bonobo-Komponentensystem kann nicht initialisiert werden."
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
-msgid "C_ut"
-msgstr "Ausschneiden"
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Kopieren"
 
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
@@ -9851,6 +9962,10 @@ msgstr "Einen neuen Kontakt anlegen"
 msgid "Create new contact list"
 msgstr "Neuen Kontaktliste anlegen"
 
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Ausschneiden"
+
 #: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
 msgid "Cut the selection"
 msgstr "Die Auswahl ausschneiden"
@@ -9867,6 +9982,10 @@ msgstr "Neuer Kontakt"
 msgid "New list"
 msgstr "Neue Liste"
 
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "EinfЭgen"
+
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Inhalt der Zwischenablage einfЭgen"
@@ -9907,16 +10026,6 @@ msgstr "_Kontakt"
 msgid "_Contact Group"
 msgstr "_Kontaktgruppe"
 
-#: ui/evolution-addressbook.xml.h:25 ui/evolution-calendar.xml.h:31
-#: ui/evolution-tasks.xml.h:13
-msgid "_Copy"
-msgstr "Kopieren"
-
-#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:34
-#: ui/evolution-tasks.xml.h:15
-msgid "_Paste"
-msgstr "EinfЭgen"
-
 #: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
 #: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
@@ -9955,7 +10064,7 @@ msgstr "Einen neuen Termin anlegen"
 msgid "Create an event for the whole day"
 msgstr "Ein ganztДgiges Ereignis anlegen"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Gehe zu"
 
@@ -9971,10 +10080,6 @@ msgstr "In der Zeit vorangehen"
 msgid "Go to _Date"
 msgstr "Gehe zu _Datum"
 
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
-msgstr "Zum _heutigen Tag"
-
 #: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Zu bestimmtem Datum gehen"
@@ -9983,6 +10088,10 @@ msgstr "Zu bestimmtem Datum gehen"
 msgid "Go to present time"
 msgstr "Zur aktuellen Zeit gehen"
 
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Neuer Termin"
+
 #: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Zeigt eine Vorschau des zu druckenden Kalenders"
@@ -10068,7 +10177,7 @@ msgstr "Hauptwerkzeugleiste"
 msgid "Preview the printed item"
 msgstr "Eine Vorschau des zu druckenden Objektes zeigen"
 
-#: ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
 msgid "Print Pre_view"
 msgstr "Druckvorschau"
 
@@ -10558,172 +10667,207 @@ msgstr "Die ausgewДhlte Nachricht an jemanden weiterleiten"
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Die ausgewДhlte Nachricht an jemanden als Anlage weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 msgid "Load _Images"
 msgstr "_Bilder laden"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 msgid "Mark as I_mportant"
 msgstr "Als _wichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:43
 msgid "Mark as Unimp_ortant"
 msgstr "Als _unwichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "Die gewДhlten Nachrichten als gelesen markieren"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark the selected messages as important"
 msgstr "Die ausgewДhlten Nachrichten als wichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "Die ausgewДhlten Nachrichten als ungelesen markieren"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected messages as unimportant"
 msgstr "Die ausgewДhlten Nachrichten als unwichtig markieren"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages for deletion"
 msgstr "Alle sichtbaren Nachrichten zum LЖschen vorsehen"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Verschieben"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "AusgewДhlte Nachrichten in einen anderen Ordner kopieren"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Next"
 msgstr "Weiter"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Die nДchste wichtige Nachricht anzeigen"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Meldung"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "_Strang auswДhlen"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Unbenannte Nachricht"
+
+#: ui/evolution-mail-message.xml.h:56
 msgid "Open the selected message in a new window"
 msgstr "Die ausgewДhlte Nachricht in einem neuen Fenster Жffnen"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:57
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 "Die gewДhlte Nachrichten im Maileditor Жffnen, um sie nochmals zu verschicken"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:58
 msgid "Previews the message to be printed"
 msgstr "Zeigt eine Vorschau der zu druckenden Nachricht"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Previous"
 msgstr "ZurЭck"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Die letzte wichtige Nachricht anzeigen"
+
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Nachricht drucken"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Die letzte ungelesene Nachricht anzeigen"
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Print Message..."
 msgstr "Nachricht drucken..."
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:65
 msgid "Print Preview..."
 msgstr "Druckvorschau..."
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print this message"
 msgstr "Diese Nachricht drucken"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply"
 msgstr "Antworten"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:68
 msgid "Reply to All"
 msgstr "Allen antworten"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:71
 msgid "S_earch Message"
 msgstr "Nachricht durch_suchen"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:72
 msgid "Save the message as a text file"
 msgstr "Die Nachricht als Textdatei speichern"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:73
 msgid "Search for text in the body of the displayed message"
 msgstr "Im Rumpf der angezeigten Nachricht nach einem Text suchen"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "E-Mail-_Quellcode zeigen"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:75
 msgid "Show Full _Headers"
 msgstr "Alle _Kopfzeilen anzeigen"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:76
 msgid "Show message in the normal style"
 msgstr "Nachricht im normalen Stil zeigen"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:77
 msgid "Show message with all email headers"
 msgstr "Nachricht mit allen E-Mail-Kopfzeilen zeigen"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:78
 msgid "Show the raw email source of the message"
 msgstr "Den rohen E-Mail-Quellcode dieser Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "LЖschen fЭr ausgewДhlte Nachrichten rЭckgДngig machen"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:80
 msgid "VFolder on Mailing _List..."
 msgstr "VOrdner Эber Mailing_liste..."
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:81
 msgid "VFolder on Se_nder..."
 msgstr "VOrdner Эber _Absender..."
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:82
 msgid "VFolder on _Recipients..."
 msgstr "VOrdner Эber _EmpfДnger..."
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:83
 msgid "VFolder on _Subject..."
 msgstr "VOrdner Эber _Betreff..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "Filter _anwenden"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Copy to Folder"
 msgstr "In Ordner _kopieren"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "Filter aus Nachricht _erzeugen"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:88
 msgid "_Forward Message"
 msgstr "Nachricht _weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:89
 msgid "_Message Display"
 msgstr "_Nachrichtenanzeige"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Move to Folder"
 msgstr "In Ordner _verschieben"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Normal Display"
 msgstr "_Normale Anzeige"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Open Message"
 msgstr "Nachricht _Жffnen"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Re-send Message"
 msgstr "Nachricht _nochmals verschicken"
 
@@ -10993,45 +11137,47 @@ msgid "Re_fresh Task"
 msgstr "Aufgabe _aktualisieren"
 
 #: ui/evolution-tasks.xml.h:2
+#, fuzzy
+msgid "Configure the task view's settings"
+msgstr "Einstellungen des Kalenders konfigurieren"
+
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "AusgewДhlte Aufgabe kopieren"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Eine neue Aufgabe anlegen"
 
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "AusgewДhlte Aufgabe ausschneiden"
 
 #: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
+msgstr "AusgewДhlte Aufgaben lЖschen"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Neue Aufgabe"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Paste task from the clipboard"
 msgstr "Aufgabe aus der Zwischenablage einfЭgen"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Aufgabe als etwas anderes speichern"
 
-#: ui/evolution-tasks.xml.h:11
-msgid "Set task view preferences"
-msgstr "Aufgaben-Ansichtseinstellungen Дndern"
-
-#: ui/evolution-tasks.xml.h:12
-msgid "TasksPreferences"
-msgstr "Aufgaben-Vorlieben"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "_Aufgaben-Einstellungen..."
 
-#: ui/evolution-tasks.xml.h:18
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "Aufgabe"
 
-#: ui/evolution-tasks.xml.h:19
-msgid "_Tasks Settings..."
-msgstr "_Aufgaben-Einstellungen..."
-
 #: ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "эber Evolution..."
@@ -11267,10 +11413,6 @@ msgstr "Mit Kategorie"
 msgid "%A, %B %d, %Y"
 msgstr "%a, %d. %B %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "VorlДufig"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "BeschДftigt"
@@ -11357,11 +11499,6 @@ msgstr "Ansichten definieren"
 msgid "MTWTFSS"
 msgstr "MDMDFSS"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1068
-msgid "%B %Y"
-msgstr "%B %Y"
-
 #: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Jetzt"
@@ -11468,11 +11605,11 @@ msgstr "Suche speichren"
 msgid "Advanced Search"
 msgstr "Komplexe Suche"
 
-#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Alle zeigen"
 
-#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Komplex..."
 
@@ -11524,3 +11661,64 @@ msgstr "init-corba(): GNOME konnte nicht initialisiert werden"
 #: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
+
+#~ msgid "Set task view preferences"
+#~ msgstr "Aufgaben-Ansichtseinstellungen Дndern"
+
+#~ msgid "TasksPreferences"
+#~ msgstr "Aufgaben-Vorlieben"
+
+#~ msgid "(none)"
+#~ msgstr "(keine)"
+
+#~ msgid "Edit this task"
+#~ msgstr "Diese Aufgabe bearbeiten"
+
+#~ msgid "Go to Today"
+#~ msgstr "Zum heutigen Tag"
+
+#~ msgid "Delete all Occurrences"
+#~ msgstr "Jedes Auftreten lЖschen"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Weiterleiten an Adresse"
+
+#~ msgid "[Fwd: No Subject]"
+#~ msgstr "[Fwd: (kein Betreff)]"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Weitergeleitete Nachricht (kein Betreff)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Weitergeleitete Nachricht-----<br><b>Von:</b> %s<br><b>An:</b> "
+#~ "%s<br><b>Betreff:</b> %s<br>"
+
+#~ msgid "╟F"
+#~ msgstr "╟F"
+
+#~ msgid "╟C"
+#~ msgstr "╟C"
+
+#~ msgid "knots"
+#~ msgstr "Knoten"
+
+#~ msgid "kph"
+#~ msgstr "km/h"
+
+#~ msgid "inHg"
+#~ msgstr "Zoll Hg"
+
+#~ msgid "mmHg"
+#~ msgstr "Torr"
+
+#~ msgid "miles"
+#~ msgstr "Meilen"
+
+#~ msgid "kilometers"
+#~ msgstr "Kilometer"
+
+#~ msgid "Wipe trackers"
+#~ msgstr "Verfolgungen auswischen"
diff --git a/po/el.po b/po/el.po
index 303c9a121c..44f9fd886b 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2001-04-14 08:51-0400\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2000-04-04 19:42-0500\n"
 "Last-Translator: Spiros Papadimitriou <spapadim+@cs.cmu.edu>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -13,197 +13,205 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -219,24 +227,26 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:4037
+#, fuzzy
+msgid "Multiple VCards"
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
+#: addressbook/backend/ebook/e-card.c:4045
+#, c-format
+msgid "VCard for %s"
 msgstr ""
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
@@ -244,10 +254,10 @@ msgstr ""
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:43
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 #, fuzzy
 msgid "Could not initialize Bonobo"
 msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
@@ -261,14 +271,14 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 #, fuzzy
 msgid "Could not start wombat"
 msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
@@ -278,761 +288,885 @@ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook minicard viewer"
+msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#, fuzzy
+msgid "Evolution component for handling contacts."
+msgstr "жэЙЕККОР ПОУ ПЕЯИщВЕИ ЦМЫЯИЛъЕР"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Addressbook Minicard control"
+msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution addressbook component."
+msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#, fuzzy
+msgid "Factory for the sample Addressbook control"
+msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
+
+#: addressbook/gui/component/addressbook-config.c:148
+#, fuzzy
+msgid "LDAP Server"
+msgstr "мщА оЛэДА"
+
+#: addressbook/gui/component/addressbook-config.c:150
+#, fuzzy
+msgid "File"
+msgstr "_жэЙЕККОР"
+
+#: addressbook/gui/component/addressbook-config.c:153
+#, fuzzy
+msgid "Unknown addressbook type"
+msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:177
+#, fuzzy
+msgid "Base"
+msgstr "еПИЙЭККГСГ"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:181
+#, fuzzy
+msgid "Subtree"
+msgstr "мщА сУМТЭЛЕУСГ"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:411
+#, fuzzy
+msgid "Port:"
+msgstr "пЯОТЕЯАИЭТГТА"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+#, fuzzy
+msgid "Path:"
+msgstr "еПИЙЭККГСГ"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:663
+#, fuzzy
+msgid "Edit Addressbook"
+msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
+
+#: addressbook/gui/component/addressbook-config.c:665
+#, fuzzy
+msgid "Add Addressbook"
+msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr ""
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "мщА сУМТЭЛЕУСГ"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+msgid "De_lete"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-storage.c:118
+#, fuzzy
+msgid "Other Contacts"
+msgstr "кОИПщР сУМТОЛЕЩСЕИР"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:373
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
+
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:554
+#, fuzzy
+msgid "Any field contains"
+msgstr "жэЙЕКОР ПОУ ПЕЯИщВЕИ ЕЙЙЯЕЛЭТГТЕР"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:556
+#, fuzzy
+msgid "Email contains"
+msgstr "лИЙЯэ еИЙОМъДИА"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "лИЙЯэ еИЙОМъДИА"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "тО URI ПОУ ХА ЕЛЖАМъСЕИ О еНЕЯЕУМГТчР жАЙщККЫМ"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "кОИПщР сУМТОЛЕЩСЕИР"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr ""
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr ""
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr ""
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "дИАЦЯАЖч"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+#, fuzzy
+msgid "Remove All"
+msgstr "дИАЦЯАЖч"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "аПОСТОКч"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "кОИПщР сУМТОЛЕЩСЕИР"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+#, fuzzy
+msgid "Message Recipients"
+msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+#, fuzzy
+msgid "Select Names"
+msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "пЯОТЕЯАИЭТГТА"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+#, fuzzy
+msgid "_Search"
+msgstr "гЛЕЯОКЭЦИО"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-#, fuzzy
-msgid "C_ontacts..."
-msgstr "_цМЫЯИЛъА"
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 #, fuzzy
 msgid "Contact Editor"
 msgstr "_цМЫЯИЛъА"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 #, fuzzy
 msgid "No_tes:"
 msgstr "сГЛЕъЫ_ЛА"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
-msgid "Phone Types"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid "Organi_zation:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+msgid "Phone Types"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
-msgstr ""
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
 #, fuzzy
-msgid "_Company:"
-msgstr "аМТИЦЯАЖч"
+msgid "_Contacts..."
+msgstr "_цМЫЯИЛъА"
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:91 ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #, fuzzy
 msgid "_Home"
 msgstr "сГЛЕъЫ_ЛА"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "_Job title:"
 msgstr "_лчМУЛА"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "_Mobile"
 msgstr "_лчМУЛА"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 #, fuzzy
 msgid "Delete Contact?"
 msgstr "еПИКщНТЕ ЕПИСЩМАЬГ"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 #, fuzzy
 msgid "Company"
 msgstr "аМТИЦЯАЖч"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 #, fuzzy
 msgid "Home"
 msgstr "сГЛЕъЫ_ЛА"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 #, fuzzy
 msgid "Home 2"
 msgstr "сГЛЕъЫ_ЛА"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 #, fuzzy
 msgid "Home Fax"
 msgstr "сГЛЕъЫ_ЛА"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 #, fuzzy
 msgid "Mobile"
 msgstr "_лчМУЛА"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 #, fuzzy
 msgid "Pager"
 msgstr "еПИЙЭККГСГ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 #, fuzzy
 msgid "Primary"
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
-msgid "Email 2"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
-msgid "Email 3"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-quick-add.c:223
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:225
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 #, fuzzy
 msgid "Edit Full"
 msgstr "_жэЙЕККОР"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:262
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 #, fuzzy
 msgid "Full Name"
 msgstr "лЕТОМОЛАСъА оЛэДАР"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:268
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 #, fuzzy
 msgid "E-mail"
 msgstr "_лчМУЛА"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 #, fuzzy
 msgid "Canada"
 msgstr "гЛЕЯОКЭЦИО"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 #, fuzzy
 msgid "_City:"
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 #, fuzzy
 msgid "_Middle:"
 msgstr "_лчМУЛА"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:241
-msgid "As _Minicards"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:247
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:399
-#, c-format
-msgid "Enter password for %s"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:427
-#, fuzzy
-msgid "Unable to open addressbook"
-msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
-
-#: addressbook/gui/component/addressbook.c:432
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:555
-msgid "Show All"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:557
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #, fuzzy
-msgid "Advanced..."
-msgstr "аМАФчТГСГ ЦИА пЯОВЫЯГЛщМОУР"
-
-#: addressbook/gui/component/addressbook.c:587
-#, fuzzy
-msgid "Any field contains"
-msgstr "жэЙЕКОР ПОУ ПЕЯИщВЕИ ЕЙЙЯЕЛЭТГТЕР"
-
-#: addressbook/gui/component/addressbook.c:588
-msgid "Name contains"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:589
-#, fuzzy
-msgid "Email contains"
-msgstr "лИЙЯэ еИЙОМъДИА"
-
-#: addressbook/gui/component/addressbook.c:732
-msgid "The URI that the Folder Browser will display"
-msgstr "тО URI ПОУ ХА ЕЛЖАМъСЕИ О еНЕЯЕУМГТчР жАЙщККЫМ"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-#, fuzzy
-msgid "Other Contacts"
-msgstr "кОИПщР сУМТОЛЕЩСЕИР"
-
-#: addressbook/gui/component/addressbook-config.c:148
-#, fuzzy
-msgid "LDAP Server"
-msgstr "мщА оЛэДА"
-
-#: addressbook/gui/component/addressbook-config.c:150
-#, fuzzy
-msgid "File"
-msgstr "_жэЙЕККОР"
+msgid "List _name:"
+msgstr "лЕТОМОЛАСъА оЛэДАР"
 
-#: addressbook/gui/component/addressbook-config.c:153
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
 #, fuzzy
-msgid "Unknown addressbook type"
-msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
-msgid "Password"
-msgstr ""
+msgid "Members"
+msgstr "аПОСТОКч"
 
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:170
-msgid "Unknown auth type"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:179
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 #, fuzzy
-msgid "Base"
-msgstr "еПИЙЭККГСГ"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "One"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:183
-#, fuzzy
-msgid "Subtree"
-msgstr "мщА сУМТЭЛЕУСГ"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Unknown scope type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:353
-msgid "Bind DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:354
-msgid "FIXME Bind DN Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
-msgid "Host:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Host help text here."
-msgstr ""
+msgid "_Remove"
+msgstr "дИАЦЯАЖч"
 
-#: addressbook/gui/component/addressbook-config.c:409
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 #, fuzzy
-msgid "Port:"
-msgstr "пЯОТЕЯАИЭТГТА"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:435
-msgid "Search Scope:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:489
-msgid "Authentication:"
-msgstr ""
+msgid "contact-list-editor"
+msgstr "_цМЫЯИЛъА"
 
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
 #, fuzzy
-msgid "Path:"
-msgstr "еПИЙЭККГСГ"
+msgid "Contact List Editor"
+msgstr "_цМЫЯИЛъА"
 
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "FIXME Path Help text here"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:513
-msgid "Create path if it doesn't exist."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:647
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
 #, fuzzy
-msgid "Edit Addressbook"
-msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
+msgid "New Contact:"
+msgstr "_цМЫЯИЛъА"
 
-#: addressbook/gui/component/addressbook-config.c:649
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
 #, fuzzy
-msgid "Add Addressbook"
-msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
+msgid "Original Contact:"
+msgstr "кОИПщР сУМТОЛЕЩСЕИР"
 
-#: addressbook/gui/component/addressbook-config.c:665
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
-msgid "Name:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:672
-msgid "FIXME Name help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:674
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:675
-msgid "FIXME Description help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-#, fuzzy
-msgid "Addressbook Sources"
-msgstr "мщА сУМТЭЛЕУСГ"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:8 mail/folder-browser.c:597
-#: mail/mail-config.glade.h:19 mail/mail-view.c:156
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr ""
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr ""
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr ""
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
-msgstr ""
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
-msgid "Add to Contacts"
+msgid "Changed Contact:"
 msgstr "кОИПщР сУМТОЛЕЩСЕИР"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook minicard viewer"
-msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-#, fuzzy
-msgid "Evolution component for handling contacts."
-msgstr "жэЙЕККОР ПОУ ПЕЯИщВЕИ ЦМЫЯИЛъЕР"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the Addressbook Minicard control"
-msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-#, fuzzy
-msgid "Factory for the Evolution addressbook component."
-msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-#, fuzzy
-msgid "Factory for the sample Addressbook control"
-msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:402
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
-msgstr "дИАЦЯАЖч"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
-#, fuzzy
-msgid "Remove All"
-msgstr "дИАЦЯАЖч"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-#, fuzzy
-msgid "Find..."
-msgstr "пЯОТЕЯАИЭТГТА"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-#, fuzzy
-msgid "Message Recipients"
-msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-#, fuzzy
-msgid "Select Names"
-msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-#, fuzzy
-msgid "Select name from:"
-msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr ""
 
@@ -1147,177 +1281,270 @@ msgstr ""
 msgid "z"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 #, fuzzy
 msgid "Send message to contact"
 msgstr "_цМЫЯИЛъА"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/folder-browser.c:572
-#: mail/mail-view.c:154 ui/evolution-addressbook.xml.h:9
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:50
-#: ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 #, fuzzy
 msgid "Print"
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 #, fuzzy
 msgid "Print Envelope"
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "мщА сУМТЭЛЕУСГ"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+msgid "Repository offline"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+msgid "Protocol not supported"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "гЛЕЯОКЭЦИО"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "кОИПщР сУМТОЛЕЩСЕИР"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 #, fuzzy
 msgid "File As"
 msgstr "_жэЙЕККОР"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 #, fuzzy
 msgid "Email"
 msgstr "_лчМУЛА"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 #, fuzzy
 msgid "Primary Phone"
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 #, fuzzy
 msgid "Company Phone"
 msgstr "аМТИЦЯАЖч"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 #, fuzzy
 msgid "Home Phone"
 msgstr "сГЛЕъЫ_ЛА"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 #, fuzzy
 msgid "Home Address"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 #, fuzzy
 msgid "Mobile Phone"
 msgstr "_лчМУЛА"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "сГЛЕъЫ_ЛА"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 #, fuzzy
 msgid "Other Phone"
 msgstr "кОИПщР сУМТОЛЕЩСЕИР"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 #, fuzzy
 msgid "Other Address"
 msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 #, fuzzy
 msgid "Department"
 msgstr "еПИЙЭККГСГ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 #, fuzzy
 msgid "Title"
 msgstr "_жэЙЕККОР"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #, fuzzy
 msgid "Profession"
 msgstr "е_МщЯЦЕИЕР"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 #, fuzzy
 msgid "Manager"
 msgstr "еПИЙЭККГСГ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 #, fuzzy
 msgid "Spouse"
 msgstr "мщА сУМТЭЛЕУСГ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 #, fuzzy
 msgid "Note"
 msgstr "сГЛЕъЫ_ЛА"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "сГЛЕъЫ_ЛА"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "гЛЕЯОКЭЦИО"
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 #, fuzzy
 msgid "Save in addressbook"
 msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
 
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1358,7 +1585,7 @@ msgstr "е_МщЯЦЕИЕР"
 
 #: addressbook/printing/e-contact-print.glade.h:7
 #, fuzzy
-msgid "Font..."
+msgid "F_ont..."
 msgstr "пЯОТЕЯАИЭТГТА"
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1422,7 +1649,6 @@ msgid "Margins"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr ""
 
@@ -1514,145 +1740,327 @@ msgstr "пЯОР:"
 msgid "Width:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "пЯОТЕЯАИЭТГТА"
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:290
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
 #, fuzzy
-msgid "Open calendar"
-msgstr "тО ГЛЕЯОКЭЦИЭ САР"
+msgid "Evolution calendar executive summary component."
+msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 
-#: calendar/gui/calendar-commands.c:332
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #, fuzzy
-msgid "Save calendar"
-msgstr "тО ГЛЕЯОКЭЦИЭ САР"
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#, fuzzy
+msgid "Factory for the Calendar Summary component."
+msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the calendar iTip view control"
+msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the sample Calendar control"
+msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "я_АМТЕБОЩ"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, c-format
+msgid "Notification about your task starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, c-format
+msgid "Notification about your task ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+msgid "Notification about your task"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "_жэЙЕККОР"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "лщЦЕХОР"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "я_АМТЕБОЩ"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+msgid "No description available."
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+#, fuzzy
+msgid "Snooze"
+msgstr "лщЦЕХОР"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:58
+#, c-format
+msgid ""
+"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+"know."
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
+
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
+#, fuzzy
+msgid "Could not create the alarm notify service factory"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: calendar/gui/calendar-commands.c:468
+#: calendar/gui/calendar-commands.c:402
+msgid "%A %d %B %Y"
+msgstr ""
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+msgid "%a %d %b %Y"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 #, fuzzy
 msgid "Private"
 msgstr "еПИЙЭККГСГ"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1592
-#: calendar/gui/event-editor.c:1619
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:660
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
-#: calendar/gui/calendar-model.c:1569
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:659
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 #, fuzzy
 msgid "Normal"
 msgstr "аПЭ"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:658
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 #, fuzzy
 msgid "Low"
 msgstr "_мщО"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:635 calendar/gui/calendar-model.c:1173
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1175
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1177
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1179
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
-#: camel/camel-service.c:586
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:799
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1660,170 +2068,325 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:879
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:893 calendar/gui/calendar-model.c:1117
-#: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1129
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:430
-#: widgets/misc/e-dateedit.c:1339 widgets/misc/e-dateedit.c:1454
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 #, fuzzy
 msgid "None"
 msgstr "сГЛЕъЫ_ЛА"
 
-#: calendar/gui/calendar-model.c:967
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1007
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1048
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1061
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1102
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1571
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1573
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 #, fuzzy
 msgid "No"
 msgstr "_мщО"
 
-#: calendar/gui/calendar-summary.c:196
-msgid "%A, %e %B %Y"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "_мщО"
+
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+msgid "Work Week View"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
-msgid "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+msgid "Week View"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:437
-msgid "<b>Error loading calendar</b>"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "цМЫЯИЛъЕР"
+
+#: calendar/gui/control-factory.c:128
+#, fuzzy
+msgid "The URI that the calendar will display"
+msgstr "тО URI ПОУ ХА ЕЛЖАМъСЕИ О еНЕЯЕУМГТчР жАЙщККЫМ"
+
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "еПИЙЭККГСГ"
+
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
+
+#: calendar/gui/dialogs/alarm-options.c:372
+msgid "Mail Alarm Options"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:449
-msgid "<b>Error loading calendar:<br>Method not supported"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:616
-msgid "Display"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:621
+#: calendar/gui/dialogs/alarm-options.glade.h:1
 #, fuzzy
-msgid "Show appointments"
-msgstr "я_АМТЕБОЩ"
+msgid "Alarm Repeat"
+msgstr "еПИСЩМАЬГ"
 
-#: calendar/gui/calendar-summary.c:629
-#, fuzzy
-msgid "Show tasks"
-msgstr "еЛЖэМИСГ ЕПИСУМэ_ЬЕЫМ"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 #, fuzzy
-msgid "Loading Calendar"
-msgstr "гЛЕЯОКЭЦИО"
+msgid "Message to Display"
+msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+msgid "Play sound:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
 
-#: calendar/gui/control-factory.c:126
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+msgid "Run program:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
 #, fuzzy
-msgid "The URI that the calendar will display"
-msgstr "тО URI ПОУ ХА ЕЛЖАМъСЕИ О еНЕЯЕУМГТчР жАЙщККЫМ"
+msgid "days"
+msgstr "пЯЭВЕИЯА"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+msgid "extra times every"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr "пЯЭВЕИЯА"
+
+#: calendar/gui/dialogs/alarm-page.c:286
 #, fuzzy
-msgid "Snooze"
-msgstr "лщЦЕХОР"
+msgid "1 day"
+msgstr "пЯЭВЕИЯА"
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
+#: calendar/gui/dialogs/alarm-page.c:289
+#, c-format
+msgid "%d weeks"
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
+#: calendar/gui/dialogs/alarm-page.c:291
+msgid "1 week"
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
+#: calendar/gui/dialogs/alarm-page.c:294
+#, c-format
+msgid "%d hours"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:296
+msgid "1 hour"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:52
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr "цМЫЯИЛъЕР"
+
+#: calendar/gui/dialogs/alarm-page.c:301
 #, fuzzy
-msgid "Could not initialize GNOME"
-msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
+msgid "1 minute"
+msgstr "цМЫЯИЛъЕР"
 
-#: calendar/gui/alarm-notify/notify-main.c:77
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr "аПОСТОКч"
+
+#: calendar/gui/dialogs/alarm-page.c:306
 #, fuzzy
-msgid "Could not create the alarm notify service factory"
-msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+msgid "1 second"
+msgstr "аПОСТОКч"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr ""
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an email"
+msgstr "аПОСТОКч"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr "я_АМТЕБОЩ"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "еПИЙЭККГСГ"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "еПИЙЭККГСГ"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Reminders"
+msgstr "аПОСТОКч"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+#, fuzzy
+msgid "Summary:"
+msgstr "аПОСТОКч"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "е_МщЯЦЕИЕР"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "after"
+msgstr "еПИЙЭККГСГ"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
 #, fuzzy
-msgid "Edit appointment"
+msgid "day(s)"
+msgstr "пЯЭВЕИЯА"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+#, fuzzy
+msgid "end of appointment"
 msgstr "я_АМТЕБОЩ"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
 msgstr ""
 
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#, fuzzy
+msgid "minute(s)"
+msgstr "цМЫЯИЛъЕР"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+#, fuzzy
+msgid "start of appointment"
+msgstr "я_АМТЕБОЩ"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 #, fuzzy
 msgid "05 minutes"
@@ -1858,40 +2421,38 @@ msgid "60 minutes"
 msgstr "цМЫЯИЛъЕР"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#, fuzzy
-msgid "Audio Alarms"
-msgstr "еПИЙЭККГСГ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 #, fuzzy
 msgid "Calendar"
 msgstr "гЛЕЯОКЭЦИО"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #, fuzzy
 msgid "Calendar Preferences"
 msgstr "гЛЕЯОКЭЦИО"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#, fuzzy
-msgid "Colors"
-msgstr "_жэЙЕККОР"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+msgid "Compress weekends in month view"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+msgid "Date Navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1899,1093 +2460,1176 @@ msgid "Defaults"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
+#: mail/mail-config.glade.h:30
+msgid "Display"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 #, fuzzy
 msgid "Friday"
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 #, fuzzy
 msgid "Monday"
 msgstr "счЛЕЯА"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+msgid "Overdue tasks"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "пЯОТЕЯАИЭТГТА"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 #, fuzzy
 msgid "Remind me of all appointments"
 msgstr "я_АМТЕБОЩ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-#, fuzzy
-msgid "Reminders"
-msgstr "аПОСТОКч"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 #, fuzzy
 msgid "Saturday"
 msgstr "аПОСТОКч"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #, fuzzy
-msgid "Show appointment end times"
+msgid "Show appointment end times in week and month views"
 msgstr "я_АМТЕБОЩ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #, fuzzy
 msgid "Start of day:"
 msgstr "аъ_ТГСГ сУМэМТГСГР"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 #, fuzzy
 msgid "Sunday"
 msgstr "аПОСТОКч"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #, fuzzy
-msgid "TaskPad"
-msgstr "еЙЙЯЕЛЭ_ТГТА"
+msgid "Task List"
+msgstr "йАТэКОЦОР ЕЙЙЯЕЛОТчТЫМ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "Tasks due today"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 #, fuzzy
 msgid "Thursday"
 msgstr "счЛЕЯА"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr ""
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Time"
+msgstr "_жэЙЕККОР"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr "сГЛЕъЫ_ЛА"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 #, fuzzy
 msgid "Tuesday"
 msgstr "счЛЕЯА"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-#, fuzzy
-msgid "Visual Alarms"
-msgstr "_жэЙЕККОР"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+msgid "Work Week"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
-#, fuzzy
-msgid "seconds."
-msgstr "аПОСТОКч"
-
-#: calendar/gui/dialogs/delete-comp.c:70
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:73
-msgid "Are you sure you want to delete this untitled appointment?"
+#: calendar/gui/dialogs/cancel-comp.c:58
+msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:79
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
+#: calendar/gui/dialogs/cancel-comp.c:63
+msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:82
-msgid "Are you sure you want to delete this untitled task?"
+#: calendar/gui/dialogs/cancel-comp.c:68
+msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:88
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:91
-msgid "Are you sure want to delete this untitled journal entry?"
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Classification"
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
-#, fuzzy
-msgid "Date & Time"
-msgstr "еПИЙЭККГСГ"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
-#, fuzzy
-msgid "Pri_vate"
-msgstr "еПИЙЭККГСГ"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-#, fuzzy
-msgid "Progress"
-msgstr "е_МщЯЦЕИЕР"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Pu_blic"
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-#, fuzzy
-msgid "Sta_rt Date:"
-msgstr "аъ_ТГСГ сУМэМТГСГР"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
-#, fuzzy
-msgid "Su_mmary:"
-msgstr "аПОСТОКч"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-#, fuzzy
-msgid "Task"
-msgstr "еЙЙЯЕЛЭ_ТГТА"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Confidential"
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-#, fuzzy
-msgid "_Contacts..."
-msgstr "_цМЫЯИЛъА"
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#, fuzzy
-msgid "_Priority:"
-msgstr "пЯОТЕЯАИЭТГТА"
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+msgid " (Completed "
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-#, fuzzy
-msgid "_Status:"
-msgstr "йАТэСТАСГ СЩМДЕСГР"
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+msgid "Completed "
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:697
-msgid "Edit Task"
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
-msgid "No summary"
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
+#: calendar/gui/dialogs/comp-editor.c:449
+#, fuzzy
+msgid "Edit Appointment"
+msgstr "я_АМТЕБОЩ"
+
+#: calendar/gui/dialogs/comp-editor.c:454
 #, fuzzy, c-format
 msgid "Appointment - %s"
 msgstr "я_АМТЕБОЩ"
 
-#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
+#: calendar/gui/dialogs/comp-editor.c:457
 #, fuzzy, c-format
 msgid "Task - %s"
 msgstr "еЙЙЯЕЛЭТГТЕР"
 
-#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
+#: calendar/gui/dialogs/comp-editor.c:460
 #, fuzzy, c-format
 msgid "Journal entry - %s"
 msgstr "йАТАВЧЯГСГ гЛЕЯО_КОЦъОУ"
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:159
-msgid "Completion Date"
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:160
-#, fuzzy
-msgid "End Date"
-msgstr "аъ_ТГСГ сУМэМТГСГР"
-
-#: calendar/gui/e-calendar-table.c:161
-#, fuzzy
-msgid "Start Date"
-msgstr "аъ_ТГСГ сУМэМТГСГР"
-
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:164
-msgid "Percent complete"
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:166
-#, fuzzy
-msgid "Summary"
-msgstr "аПОСТОКч"
-
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:169
-#, fuzzy
-msgid "Alarms"
-msgstr "еПИЙЭККГСГ"
-
-#: calendar/gui/e-calendar-table.c:170
-#, fuzzy
-msgid "Click here to add a task"
-msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
-
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
-msgid "0%"
+msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:375
-#, c-format
-msgid "10%"
+#: calendar/gui/dialogs/delete-comp.c:87
+msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
-msgid "20%"
+msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:377
-#, c-format
-msgid "30%"
+#: calendar/gui/dialogs/delete-comp.c:96
+msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
-msgid "40%"
+msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:379
-#, c-format
-msgid "50%"
+#: calendar/gui/dialogs/delete-comp.c:105
+msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/dialogs/delete-comp.c:120
 #, c-format
-msgid "60%"
+msgid "Are you sure you want to delete %d appointments?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/dialogs/delete-comp.c:125
 #, c-format
-msgid "70%"
+msgid "Are you sure you want to delete %d tasks?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/dialogs/delete-comp.c:130
 #, c-format
-msgid "80%"
+msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:383
-#, c-format
-msgid "90%"
-msgstr ""
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
 
-#: calendar/gui/e-calendar-table.c:384
-#, c-format
-msgid "100%"
-msgstr ""
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "е_МщЯЦЕИЕР"
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr ""
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr "сГЛЕъЫ_ЛА"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit this task..."
-msgstr ""
+#: calendar/gui/dialogs/event-editor.c:154
+#, fuzzy
+msgid "Appointment"
+msgstr "я_АМТЕБОЩ"
 
-#: calendar/gui/e-calendar-table.c:558
+#: calendar/gui/dialogs/event-editor.c:159
 #, fuzzy
-msgid "Edit the task"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+msgid "Reminder"
+msgstr "аПОСТОКч"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
+#: calendar/gui/dialogs/event-editor.c:164
 #, fuzzy
-msgid "Delete this task"
+msgid "Recurrence"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: calendar/gui/e-calendar-table.c:561
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
 #, fuzzy
-msgid "Delete the task"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+msgid "Meeting"
+msgstr "еКчЖХГ"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
 msgstr ""
 
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
-msgid "%A %d %B"
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
+msgid "Classification"
 msgstr ""
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
+#, fuzzy
+msgid "Date & Time"
+msgstr "еПИЙЭККГСГ"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "Pri_vate"
+msgstr "еПИЙЭККГСГ"
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
+msgid "Pu_blic"
 msgstr ""
 
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
-#: calendar/gui/e-week-view-main-item.c:348
-msgid "%d %b"
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
+#, fuzzy
+msgid "Su_mmary:"
+msgstr "аПОСТОКч"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
+msgid "_Confidential"
 msgstr ""
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
+#: calendar/gui/dialogs/event-page.glade.h:10
+#, fuzzy
+msgid "_End time:"
+msgstr "аъ_ТГСГ сУМэМТГСГР"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#, fuzzy
+msgid "_Start time:"
+msgstr "аъ_ТГСГ сУМэМТГСГР"
+
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
 msgstr ""
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+msgid "Group"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
 #, fuzzy
-msgid "New Appointment"
-msgstr "я_АМТЕБОЩ"
+msgid "Resource"
+msgstr "мщА сУМТЭЛЕУСГ"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
-msgid "New All Day Event"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
-#, fuzzy
-msgid "Go to Today"
-msgstr "счЛЕЯА"
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
-#, fuzzy
-msgid "Go to Date..."
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: mail/folder-browser.c:566 ui/evolution-calendar.xml.h:19
-#: ui/evolution-message-composer.xml.h:10
-#, fuzzy
-msgid "Open"
-msgstr "╤МОИ_ЦЛА"
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
 #, fuzzy
-msgid "Delete this Appointment"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+msgid "Needs Action"
+msgstr "дИАЦЯАЖч оЛэДАР"
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
 #, fuzzy
-msgid "Make this Occurrence Movable"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+msgid "Declined"
+msgstr "еКчЖХГ"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
 #, fuzzy
-msgid "Delete this Occurrence"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+msgid "Delegated"
+msgstr "еПИЙЭККГСГ"
 
-#: calendar/gui/e-day-view.c:3179
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
 #, fuzzy
-msgid "Delete all Occurrences"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+msgid "In Process"
+msgstr "е_МщЯЦЕИЕР"
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
-msgid "Component successfully updated."
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Non-Participants"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "аПОСТОКч"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+msgid "_Delegate To..."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+msgid "Common Name"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:499
-msgid "I couldn't update your calendar store."
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+msgid "Delegated From"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+msgid "Delegated To"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Component successfully deleted."
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "еПИЙЭККГСГ"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+msgid "Member"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
 #, fuzzy
-msgid "I don't recognize this type of calendar component."
-msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+msgid "Role"
+msgstr "_лчМУЛА"
 
-#: calendar/gui/e-itip-control.c:780
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
 #, fuzzy
-msgid "Add to Calendar"
-msgstr "тО ГЛЕЯОКЭЦИЭ САР"
+msgid "Status"
+msgstr "йАТэСТАСГ СЩМДЕСГР"
 
-#: calendar/gui/e-itip-control.c:814
-msgid " Accept "
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:815
-msgid " Decline "
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Tentative "
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+msgid "_Change Organizer"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:860
-#, fuzzy
-msgid "Update Calendar"
-msgstr "гЛЕЯОКЭЦИО"
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+msgid "_Invite Others"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+msgid "_Other Organizer"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:2
-#, no-c-format
-msgid "%P %%"
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:3
-msgid "--to--"
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:4
+#: calendar/gui/dialogs/recurrence-page.c:938
 #, fuzzy
-msgid "Calendar Message"
-msgstr "гЛЕЯОКЭЦИО"
+msgid "on"
+msgstr "пЯОР"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
-msgid "Date:"
-msgstr "еПИЙЭККГСГ"
+msgid "on the"
+msgstr "цМЫЯИЛъЕР"
 
-#: calendar/gui/e-itip-control.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
 #, fuzzy
-msgid "Loading calendar..."
-msgstr "гЛЕЯОКЭЦИО"
+msgid "occurrences"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#, fuzzy
+msgid "Custom recurrence"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
 #, fuzzy
-msgid "Server Message:"
-msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
+msgid "Exceptions"
+msgstr "е_МщЯЦЕИЕР"
 
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
 #, fuzzy
-msgid "Summary:"
-msgstr "аПОСТОКч"
+msgid "No recurrence"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#, fuzzy
+msgid "Recurrence Rule"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "счЛЕЯА"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#, fuzzy
+msgid "month(s)"
+msgstr "цМЫЯИЛъЕР"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:10
-#, fuzzy
-msgid "Meeting Invitations"
-msgstr "аъ_ТГСГ сУМэМТГСГР"
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+msgid "Delegated To:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "сГЛЕъЫ_ЛА"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Required Participant"
+#: calendar/gui/dialogs/task-editor.c:130
+#, fuzzy
+msgid "Task"
+msgstr "еЙЙЯЕЛЭ_ТГТА"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:21
+#: calendar/gui/dialogs/task-page.glade.h:14
 #, fuzzy
-msgid "Role"
-msgstr "_лчМУЛА"
+msgid "Progress"
+msgstr "е_МщЯЦЕИЕР"
 
-#: calendar/gui/e-meeting-dialog.glade.h:22
-msgid ""
-"Schedule\n"
-"Time"
+#: calendar/gui/dialogs/task-page.glade.h:16
+#, fuzzy
+msgid "Sta_rt Date:"
+msgstr "аъ_ТГСГ сУМэМТГСГР"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:33
-#: mail/message-list.c:1052
+#: calendar/gui/dialogs/task-page.glade.h:22
 #, fuzzy
-msgid "Status"
+msgid "_Priority:"
+msgstr "пЯОТЕЯАИЭТГТА"
+
+#: calendar/gui/dialogs/task-page.glade.h:23
+#, fuzzy
+msgid "_Status:"
 msgstr "йАТэСТАСГ СЩМДЕСГР"
 
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
-msgid "All"
+#: calendar/gui/e-calendar-table.c:351
+#, c-format
+msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:155
-msgid "Category:"
+#: calendar/gui/e-calendar-table.c:352
+#, c-format
+msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:298
-#, fuzzy, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
-
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
-msgid "The method required to load `%s' is not supported"
+msgid "20%"
 msgstr ""
 
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
-msgid "%d %B"
+#: calendar/gui/e-calendar-table.c:354
+#, c-format
+msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-#, fuzzy
-msgid "New Appointment..."
-msgstr "я_АМТЕБОЩ"
+#: calendar/gui/e-calendar-table.c:355
+#, c-format
+msgid "40%"
+msgstr ""
 
-#: calendar/gui/e-week-view.c:3314
-#, fuzzy
-msgid "Delete All Occurrences"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+#: calendar/gui/e-calendar-table.c:356
+#, c-format
+msgid "50%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
+#: calendar/gui/e-calendar-table.c:357
+#, c-format
+msgid "60%"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:3
-#, fuzzy
-msgid "Appointment"
-msgstr "я_АМТЕБОЩ"
+#: calendar/gui/e-calendar-table.c:358
+#, c-format
+msgid "70%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:4
-#, fuzzy
-msgid "Appointment Basics"
-msgstr "я_АМТЕБОЩ"
+#: calendar/gui/e-calendar-table.c:359
+#, c-format
+msgid "80%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:7
-#, fuzzy
-msgid "Custom recurrence"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+#: calendar/gui/e-calendar-table.c:360
+#, c-format
+msgid "90%"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
+#: calendar/gui/e-calendar-table.c:361
+#, c-format
+msgid "100%"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:11
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
 #, fuzzy
-msgid "Exceptions"
-msgstr "е_МщЯЦЕИЕР"
+msgid "_Open"
+msgstr "╤МОИ_ЦЛА"
 
-#: calendar/gui/event-editor-dialog.glade.h:12
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 #, fuzzy
-msgid "Modify"
-msgstr "счЛЕЯА"
+msgid "C_ut"
+msgstr "йОПч"
 
-#: calendar/gui/event-editor-dialog.glade.h:13
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
 #, fuzzy
-msgid "No recurrence"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+msgid "_Copy"
+msgstr "аМТИЦЯАЖч"
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1579
-msgid "Play a sound"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+#, fuzzy
+msgid "_Paste"
+msgstr "еПИЙЭККГСГ"
 
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "_лчМУЛА"
 
-#: calendar/gui/event-editor-dialog.glade.h:18
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
-msgid "Recurrence"
+msgid "_Delete this Task"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: calendar/gui/event-editor-dialog.glade.h:19
+#: calendar/gui/e-calendar-table.c:866
 #, fuzzy
-msgid "Recurrence Rule"
+msgid "_Mark Tasks as Complete"
+msgstr "_лчМУЛА"
+
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: calendar/gui/event-editor-dialog.glade.h:20
+#: calendar/gui/e-calendar-table.c:1137
 #, fuzzy
-msgid "Reminder"
-msgstr "аПОСТОКч"
+msgid "Click here to add a task"
+msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
 
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1588
-msgid "Run a program"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1585
+#: calendar/gui/e-calendar-table.etspec.h:3
 #, fuzzy
-msgid "Send an email"
-msgstr "аПОСТОКч"
+msgid "Alarms"
+msgstr "еПИЙЭККГСГ"
 
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-#, fuzzy
-msgid "Settings..."
-msgstr "е_МщЯЦЕИЕР"
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1582
-msgid "Show a dialog"
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:30
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
-msgid "_End time:"
+msgid "End Date"
 msgstr "аъ_ТГСГ сУМэМТГСГР"
 
-#: calendar/gui/event-editor-dialog.glade.h:31
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "пЯОТЕЯАИЭТГТА"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
 #, fuzzy
-msgid "_Start time:"
+msgid "Start Date"
 msgstr "аъ_ТГСГ сУМэМТГСГР"
 
-#: calendar/gui/event-editor-dialog.glade.h:32
+#: calendar/gui/e-calendar-table.etspec.h:14
 #, fuzzy
-msgid "_Starting date:"
-msgstr "аъ_ТГСГ сУМэМТГСГР"
+msgid "Summary"
+msgstr "аПОСТОКч"
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:36
+#: calendar/gui/e-calendar-table.etspec.h:15
 #, fuzzy
-msgid "after"
-msgstr "еПИЙЭККГСГ"
+msgid "Task sort"
+msgstr "йАТэКОЦОР ЕЙЙЯЕЛОТчТЫМ"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
-msgid "before"
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-#, fuzzy
-msgid "day(s)"
-msgstr "пЯЭВЕИЯА"
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:36
-#, fuzzy
-msgid "end of appointment"
-msgstr "я_АМТЕБОЩ"
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
+msgid "%A %d %B"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
+#: calendar/gui/e-week-view-main-item.c:348
+msgid "%d %b"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr ""
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
+#: calendar/gui/e-day-view.c:3306
 #, fuzzy
-msgid "minute(s)"
-msgstr "цМЫЯИЛъЕР"
+msgid "New _Appointment"
+msgstr "я_АМТЕБОЩ"
 
-#: calendar/gui/event-editor-dialog.glade.h:41
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
 #, fuzzy
-msgid "month(s)"
-msgstr "цМЫЯИЛъЕР"
+msgid "New All Day _Event"
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: calendar/gui/event-editor-dialog.glade.h:42
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
 #, fuzzy
-msgid "start of appointment"
-msgstr "я_АМТЕБОЩ"
+msgid "Go to _Today"
+msgstr "счЛЕЯА"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "until"
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "week(s)"
+#: calendar/gui/e-itip-control.c:697
+msgid "This is a meeting request."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "year(s)"
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
 msgstr ""
 
-#: calendar/gui/event-editor.c:373
-#, fuzzy
-msgid "Edit Appointment"
-msgstr "я_АМТЕБОЩ"
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
+msgstr ""
 
-#: calendar/gui/event-editor.c:451
-#, fuzzy
-msgid "on"
-msgstr "пЯОР"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
+msgstr ""
 
-#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
-msgid "day"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
 msgstr ""
 
-#: calendar/gui/event-editor.c:603
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 #, fuzzy
-msgid "on the"
-msgstr "цМЫЯИЛъЕР"
+msgid "The message is not understandable."
+msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
-#: calendar/gui/event-editor.c:610
-msgid "th"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/event-editor.c:756
-#, fuzzy
-msgid "occurrences"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/event-editor.c:873
-msgid "This appointment contains recurrences that Evolution cannot edit."
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1534
-#, fuzzy, c-format
-msgid " %d days"
-msgstr "пЯЭВЕИЯА"
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1536
-#, fuzzy
-msgid " 1 day"
-msgstr "пЯЭВЕИЯА"
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1539
-#, c-format
-msgid " %d weeks"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1541
-msgid " 1 week"
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1544
-#, c-format
-msgid " %d hours"
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1546
-msgid " 1 hour"
+#: calendar/gui/e-itip-control.c:834
+msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1549
-#, fuzzy, c-format
-msgid " %d minutes"
-msgstr "цМЫЯИЛъЕР"
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1551
-#, fuzzy
-msgid " 1 minute"
-msgstr "цМЫЯИЛъЕР"
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
 
-#: calendar/gui/event-editor.c:1554
-#, fuzzy, c-format
-msgid " %d seconds"
-msgstr "аПОСТОКч"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1015
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr ""
 
-#: calendar/gui/event-editor.c:1556
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:4
 #, fuzzy
-msgid " 1 second"
-msgstr "аПОСТОКч"
+msgid "Calendar Message"
+msgstr "гЛЕЯОКЭЦИО"
 
-#: calendar/gui/event-editor.c:1603
+#: calendar/gui/e-itip-control.glade.h:5
 #, fuzzy
-msgid " before start of appointment"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+msgid "Date:"
+msgstr "еПИЙЭККГСГ"
 
-#: calendar/gui/event-editor.c:1605
+#: calendar/gui/e-itip-control.glade.h:7
 #, fuzzy
-msgid " after start of appointment"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+msgid "Loading Calendar"
+msgstr "гЛЕЯОКЭЦИО"
 
-#: calendar/gui/event-editor.c:1613
+#: calendar/gui/e-itip-control.glade.h:8
 #, fuzzy
-msgid " before end of appointment"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+msgid "Loading calendar..."
+msgstr "гЛЕЯОКЭЦИО"
 
-#: calendar/gui/event-editor.c:1615
+#: calendar/gui/e-itip-control.glade.h:10
 #, fuzzy
-msgid " after end of appointment"
-msgstr "я_АМТЕБОЩ"
+msgid "Server Message:"
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: calendar/gui/event-editor.c:3123 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+#: calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-#, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#, fuzzy
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
+msgid "All"
+msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
+#: calendar/gui/e-tasks.c:252
+msgid "Category:"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-#, fuzzy
-msgid "Factory for the Calendar Summary component."
-msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+#: calendar/gui/e-tasks.c:403
+#, fuzzy, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+#: calendar/gui/e-tasks.c:415
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the calendar iTip view control"
-msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
+msgid "%d %B"
+msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
 #, fuzzy
-msgid "Factory for the sample Calendar control"
-msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+msgid "New _Appointment..."
+msgstr "я_АМТЕБОЩ"
 
-#: calendar/gui/gnome-cal.c:700
+#: calendar/gui/gnome-cal.c:999
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: calendar/gui/gnome-cal.c:711
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -3013,241 +3657,258 @@ msgid "Go To Date"
 msgstr "счЛЕЯА"
 
 #: calendar/gui/goto-dialog.glade.h:6
-#, fuzzy
-msgid "Go To Today"
-msgstr "счЛЕЯА"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 #, fuzzy
 msgid "May"
 msgstr "счЛЕЯА"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "счЛЕЯА"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 #, fuzzy
 msgid "Fr"
 msgstr "аПЭ"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr ""
 
-#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
 #, fuzzy
 msgid "Tasks"
 msgstr "еЙЙЯЕЛЭ_ТГТА"
 
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1104
+#: calendar/gui/print.c:1846
 #, c-format
-msgid "Current week (%s - %s)"
+msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 #, fuzzy
 msgid "Print Calendar"
 msgstr "гЛЕЯОКЭЦИО"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1342
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:52
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: calendar/gui/print.c:2398
+#, fuzzy
+msgid "Print Setup"
+msgstr "пЯОТЕЯАИЭТГТА"
+
+#: calendar/gui/tasks-control.c:126
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "тО URI ПОУ ХА ЕЛЖАМъСЕИ О еНЕЯЕУМГТчР жАЙщККЫМ"
@@ -3284,86 +3945,106 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:207
+#: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:245
+#: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:326
+#: camel/camel-cipher-context.c:336
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 #, fuzzy
 msgid "Syncing folders"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 #, fuzzy
 msgid "Getting message %d (%d%%)"
 msgstr "мщА ЛГМЩЛАТА"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, fuzzy, c-format
-msgid "Failed message %d"
+msgid "Failed on message %d"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 #, fuzzy
 msgid "Cannot open message"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 #, fuzzy
 msgid "Syncing folder"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-msgid "Complete"
-msgstr ""
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "мщА ЛГМЩЛАТА"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
@@ -3395,14 +4076,33 @@ msgstr ""
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
+#: camel/camel-lock-client.c:110
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, fuzzy, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3417,113 +4117,108 @@ msgstr ""
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:199
+#: camel/camel-movemail.c:159
 #, c-format
-msgid "Could not test lock file for %s: %s"
+msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:245
+#: camel/camel-movemail.c:189
 #, c-format
-msgid "Error reading mail file: %s"
+msgid "Could not create pipe: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:256
+#: camel/camel-movemail.c:201
 #, c-format
-msgid "Error writing mail temp file: %s"
+msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:239
 #, c-format
-msgid "Failed to store mail in temp file %s: %s"
+msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:306
-#, c-format
-msgid "Could not create pipe: %s"
+#: camel/camel-movemail.c:240
+msgid "(Unknown error)"
 msgstr ""
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:263
 #, c-format
-msgid "Could not fork: %s"
+msgid "Error reading mail file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:274
 #, c-format
-msgid "Movemail program failed: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:357
-msgid "(Unknown error)"
+msgid "Error writing mail temp file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:186
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:189
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:509
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
-#: camel/camel-pgp-context.c:1021 camel/camel-pgp-context.c:1235
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr ""
 
-#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
-#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1028
-#: camel/camel-pgp-context.c:1242
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:681
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:871
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr ""
 
-#: camel/camel-pgp-context.c:888
+#: camel/camel-pgp-context.c:903
 #, fuzzy, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: camel/camel-pgp-context.c:1011
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr ""
 
-#: camel/camel-pgp-context.c:1037
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1227
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -3542,38 +4237,38 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:264
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "тО ГЛЕЯОКЭЦИЭ САР"
 
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr ""
 
@@ -3670,145 +4365,239 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:417
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
+msgstr ""
+
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
 msgstr ""
 
-#: camel/camel-search-private.c:110
+#: camel/camel-sasl-login.c:127
+msgid "Unknown authentication state."
+msgstr ""
+
+#: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:152
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:168
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:554
+#: camel/camel-service.c:548
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:581
+#: camel/camel-service.c:575
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:606
+#: camel/camel-service.c:600
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:608
+#: camel/camel-service.c:602
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:57
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:59
+#: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:274 camel/camel-session.c:364
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:462
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
 
-#. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:994 mail/mail-ops.c:1001
-#: mail/mail-ops.c:1019 mail/mail-ops.c:1020
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr ""
+
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr ""
+
+#: camel/camel-smime-context.c:249
+#, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr ""
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr ""
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
 #, fuzzy
-msgid "Trash"
-msgstr "еЙЙЯЕЛЭ_ТГТА"
+msgid "Failed to decode message."
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
+#, fuzzy, c-format
+msgid ""
+"Issuer: %s\n"
+"Subject: %s"
+msgstr "хщЛА"
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
 
 #: camel/camel-url.c:289
 #, fuzzy, c-format
 msgid "Could not parse URL `%s'"
 msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: camel/camel-vee-folder.c:545
+#: camel/camel-vee-folder.c:547
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: camel/providers/imap/camel-imap-command.c:209
+#: camel/camel-vtrash-folder.c:109
+#, fuzzy
+msgid "You cannot copy messages from this trash folder."
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:217
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:272
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:456
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:490
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:172
+#: camel/providers/imap/camel-imap-folder.c:192
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:351
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
+msgstr ""
+
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
 #, fuzzy
-msgid "Scanning IMAP folder"
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+msgid "Scanning for changed messages"
+msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: camel/providers/imap/camel-imap-folder.c:986
-#: camel/providers/imap/camel-imap-folder.c:1197
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1016
-#: camel/providers/imap/camel-imap-folder.c:1231
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, fuzzy, c-format
+msgid "Could not open cache directory: %s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr ""
 
@@ -3817,7 +4606,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:484
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 #, fuzzy
 msgid "Folders"
 msgstr "_жэЙЕККОР"
@@ -3851,28 +4640,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:440
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:450
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:475
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:490
-#: camel/providers/smtp/camel-smtp-transport.c:403
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3880,117 +4669,126 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:865
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, fuzzy, c-format
-msgid "%s is not a selectable folder"
-msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
-
-#: camel/providers/imap/camel-imap-store.c:879
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr ""
+msgid "No such folder %s"
+msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: camel/providers/imap/camel-imap-store.c:1382
-msgid "You must be working online to complete this operation"
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-provider.c:70
+msgid "Unix mbox spool-format mail files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:71
+msgid "For storing local mail in standard Unix spool directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:136
+#: camel/providers/local/camel-local-store.c:134
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:144
-#: camel/providers/local/camel-local-store.c:160
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: camel/providers/local/camel-local-store.c:175
+#: camel/providers/local/camel-local-store.c:173
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:241
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:283
+#: camel/providers/local/camel-local-store.c:279
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:293
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
+msgid "Unable to add message to summary: unknown reason"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 #, fuzzy
 msgid "No such message"
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -3998,14 +4796,14 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, fuzzy, c-format
 msgid ""
@@ -4013,28 +4811,41 @@ msgid ""
 "%s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr ""
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
+#, fuzzy, c-format
+msgid "Cannot open maildir directory path: %s: %s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
@@ -4044,20 +4855,25 @@ msgstr ""
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -4096,82 +4912,99 @@ msgstr ""
 
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 #, fuzzy
 msgid "Summarising folder"
 msgstr "_мщОР жэЙЕККОР"
 
-#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:501
-#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:506
-#: camel/providers/local/camel-mbox-summary.c:707
+#: camel/providers/local/camel-mbox-summary.c:507
+#: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:523
+#: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:556
-#: camel/providers/local/camel-mbox-summary.c:745
-#: camel/providers/local/camel-mbox-summary.c:753
+#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:557
+#: camel/providers/local/camel-mbox-summary.c:746
+#: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:616
+#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:634
-#: camel/providers/local/camel-mbox-summary.c:803
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:643
+#: camel/providers/local/camel-mbox-summary.c:644
 #, fuzzy, c-format
 msgid "Could not close temp folder: %s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: camel/providers/local/camel-mbox-summary.c:654
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, fuzzy, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
@@ -4181,39 +5014,97 @@ msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 msgid "`%s' is not a directory."
 msgstr ""
 
+#: camel/providers/local/camel-mh-summary.c:218
+#, fuzzy, c-format
+msgid "Cannot open MH directory path: %s: %s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:159
+#, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:176
+msgid "Spool stores do not have an inbox"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:186
+#, c-format
+msgid "Spool mail file %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, fuzzy, c-format
 msgid "Message %s not found."
 msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -4226,24 +5117,24 @@ msgstr ""
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:226
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:288
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:295
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
@@ -4253,21 +5144,31 @@ msgstr ""
 msgid "Retrieving POP summary"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: camel/providers/pop3/camel-pop3-folder.c:192
+#: camel/providers/pop3/camel-pop3-folder.c:155
+#, fuzzy, c-format
+msgid "Could not check POP server for new messages: %s"
+msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
+
+#: camel/providers/pop3/camel-pop3-folder.c:199
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:292
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:289
+#: camel/providers/pop3/camel-pop3-folder.c:296
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "мщА ЛГМЩЛАТА"
 
-#: camel/providers/pop3/camel-pop3-folder.c:307
+#: camel/providers/pop3/camel-pop3-folder.c:303
+#, fuzzy, c-format
+msgid "Could not fetch message: %s"
+msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
+
+#: camel/providers/pop3/camel-pop3-folder.c:320
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
@@ -4287,7 +5188,7 @@ msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 msgid "Delete after %s day(s)"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr ""
 
@@ -4315,53 +5216,58 @@ msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:207
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:319
+#: camel/providers/pop3/camel-pop3-store.c:215
+#, fuzzy, c-format
+msgid "Could not connect to server: %s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:358
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:377
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:380
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:407
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:483
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Sendmail"
 msgstr "аПОСТОКч"
@@ -4415,7 +5321,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr ""
 
@@ -4423,124 +5329,124 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 #, fuzzy
 msgid "Help message"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 #, fuzzy
 msgid "Service ready"
 msgstr "аПОСТОКч"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4548,197 +5454,199 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:527
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:575
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#, fuzzy
+msgid "Sending message"
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:721
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:736
 #: camel/providers/smtp/camel-smtp-transport.c:748
+msgid "SMTP Authentication"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:782
+msgid "AUTH request failed."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:824
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:843
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:887
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:952
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u byte"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 #, fuzzy
 msgid "attachment"
 msgstr "мЕА ЕПИСЩМАЬГ"
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "еПИСЩМАЬГ АЯВЕъОУ"
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "дИАЦЯАЖч ЕПИКЕЦЛщМЫМ АМТИЙЕИЛщМЫМ АПЭ ТОМ ЙАТэКОЦО ЕПИСУМэЬЕЫМ"
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "мщА ЕПИСЩМАЬГ..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "еПИСЩМАЬГ АЯВЕъОУ СТО ЛчМУЛА"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
-#, fuzzy
-msgid "Attachment"
-msgstr "мЕА ЕПИСЩМАЬГ"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 #, fuzzy
 msgid "Attachment properties"
 msgstr "еПИСЩМАЬГ"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 #, fuzzy
 msgid "File name:"
 msgstr "лЕТОМОЛАСъА оЛэДАР"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-#, fuzzy
-msgid "Inline attachment"
-msgstr "мЕА ЕПИСЩМАЬГ"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:7
-#, fuzzy
-msgid "Send as:"
-msgstr "е_МщЯЦЕИЕР"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
+msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:321
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
+#: composer/e-msg-composer-hdrs.c:359
 #, fuzzy
 msgid "From:"
 msgstr "аПЭ"
@@ -4746,38 +5654,38 @@ msgstr "аПЭ"
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "хщЛА:"
 
-#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "пЯОР:"
 
-#: composer/e-msg-composer-hdrs.c:384
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "аМТъЦЯАЖО:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "еИСэЦЕТЕ ТИР ДИЕУХЩМСЕИР ЭПОУ ХА СТАКЕъ АМТъЦЯАЖО ТОУ ЛГМЩЛАТОР"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "йЯУЖЭ АМТъЦЯАЖО:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4785,92 +5693,126 @@ msgstr ""
 "еИСэЦЕТЕ ТИР ДИЕУХЩМСЕИР ЭПОУ ХА СТАКЕъ АМТъЦЯАЖО ТОУ ЛГМЩЛАТОР ВЫЯъР АУТщР "
 "МА ЕЛЖАМИСТОЩМ СТОМ ЙАТэКОЦО ПАЯАКГПТЧМ ТОУ ЛГМЩЛАТОР."
 
-#: composer/e-msg-composer.c:528
-#, c-format
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "еПИСЩМАЬГ АЯВЕъОУ"
+
+#: composer/e-msg-composer.c:670
+#, fuzzy, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
 "%s"
-msgstr ""
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: composer/e-msg-composer.c:716
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:727
+#: composer/e-msg-composer.c:882
+msgid "Warning!"
+msgstr ""
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:819
+#: composer/e-msg-composer.c:997
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: composer/e-msg-composer.c:877 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: composer/e-msg-composer.c:1055
+msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:883
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
 msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: composer/e-msg-composer.c:908
-#, fuzzy
-msgid "Open file"
-msgstr "╤МОИЦЛА жАЙщККОУ"
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: composer/e-msg-composer.c:1034
-msgid "That file does not exist."
-msgstr ""
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: composer/e-msg-composer.c:1044
-msgid "That is not a regular file."
+#: composer/e-msg-composer.c:1173
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1054
-msgid "That file exists but is not readable."
+#: composer/e-msg-composer.c:1321
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1064
-msgid "That file appeared accesible but open(2) failed."
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
 msgstr ""
 
-#: composer/e-msg-composer.c:1086
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
+#: composer/e-msg-composer.c:1351
+#, fuzzy
+msgid "Open file"
+msgstr "╤МОИЦЛА жАЙщККОУ"
 
-#: composer/e-msg-composer.c:1107
-msgid "An error occurred while reading the file."
+#: composer/e-msg-composer.c:1500
+msgid "Insert File"
 msgstr ""
 
-#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 #, fuzzy
 msgid "Compose a message"
 msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
 
-#: composer/e-msg-composer.c:1829
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:355
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:370
+#: composer/evolution-composer.c:374
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
@@ -4889,315 +5831,137 @@ msgid "calendar information"
 msgstr ""
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr ""
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+msgid "%I:%M:%S %p"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+msgid "%H:%M:%S"
 msgstr ""
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr ""
+
+#: e-util/e-time-utils.c:240
+msgid "%d/%m/%Y"
+msgstr ""
+
+#: e-util/e-time-utils.c:241
+msgid "%Y/%m/%d"
+msgstr ""
+
+#: e-util/e-time-utils.c:242
+#, c-format
+msgid "%x"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
 msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr ""
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1257
-#: widgets/misc/e-dateedit.c:1316 widgets/misc/e-dateedit.c:1495
-msgid "%H:%M"
-msgstr ""
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-msgid "%H:%M:%S"
-msgstr ""
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1260
-#: widgets/misc/e-dateedit.c:1319 widgets/misc/e-dateedit.c:1498
-msgid "%I:%M %p"
-msgstr ""
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-msgid "%I:%M:%S %p"
-msgstr ""
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr ""
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the Evolution executive summary component."
-msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
-
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "аПОСТОКч"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:76
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "_мщОР жэЙЕККОР"
-
-#: executive-summary/component/e-summary.c:924
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
-
-#: executive-summary/component/e-summary.c:938
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
-
-#: executive-summary/component/e-summary.c:956
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr ""
-
-#: executive-summary/component/main.c:62
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-#, fuzzy
-msgid "RDF Summary"
-msgstr "аПОСТОКч"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-#, fuzzy
-msgid "Factory for the test bonobo component."
-msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the test component."
-msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:768
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:778
-msgid "Update now"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:788
-msgid "Update every "
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:796
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr ""
-
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr ""
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr ""
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 #, fuzzy
 msgid "month"
 msgstr "цМЫЯИЛъЕР"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 #, fuzzy
 msgid "months"
 msgstr "цМЫЯИЛъЕР"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr ""
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr ""
 
-#: filter/filter-datespec.c:81
-#, fuzzy
-msgid "days"
-msgstr "пЯЭВЕИЯА"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr ""
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr ""
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr ""
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 #, fuzzy
 msgid "second"
 msgstr "аПОСТОКч"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 #, fuzzy
 msgid "seconds"
 msgstr "аПОСТОКч"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
 
-#: filter/filter-datespec.c:298
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:338
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5205,28 +5969,36 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr ""
 
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr ""
 
 #. The label
-#: filter/filter-datespec.c:432
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr ""
 
-#: filter/filter-datespec.c:706
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr ""
 
@@ -5236,11 +6008,11 @@ msgid "Filter Rules"
 msgstr "_жэЙЕККОР"
 
 #. and now for the action area
-#: filter/filter-filter.c:453
+#: filter/filter-filter.c:452
 msgid "Then"
 msgstr ""
 
-#: filter/filter-filter.c:467
+#: filter/filter-filter.c:466
 #, fuzzy
 msgid "Add action"
 msgstr "е_МщЯЦЕИЕР"
@@ -5251,28 +6023,28 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 #, fuzzy
 msgid "Select Folder"
 msgstr "_мщОР жэЙЕККОР"
 
-#: filter/filter-folder.c:247
+#: filter/filter-folder.c:250
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:293
+#: filter/filter-folder.c:296
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-input.c:194
+#: filter/filter-input.c:193
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-part.c:475
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr ""
 
@@ -5285,27 +6057,46 @@ msgstr "лЕТОМОЛАСъА оЛэДАР"
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 #, fuzzy
 msgid "Execute actions"
 msgstr "е_МщЯЦЕИЕР"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr ""
 
+#: filter/filter-rule.c:771
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:771
+msgid "outgoing"
+msgstr ""
+
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr ""
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr ""
+
 #: filter/filter.glade.h:4
 #, fuzzy
 msgid "Edit Filters"
@@ -5350,397 +6141,536 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
+#: filter/libfilter-i18n.h:3
+msgid "Assign Color"
 msgstr ""
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 #, fuzzy
 msgid "Attachments"
 msgstr "мЕА ЕПИСЩМАЬГ"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "contains"
+msgstr "е_МщЯЦЕИЕР"
+
+#: filter/libfilter-i18n.h:8
 #, fuzzy
 msgid "Copy to Folder"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 #, fuzzy
 msgid "Date received"
 msgstr "еКчЖХГ"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 #, fuzzy
 msgid "Date sent"
 msgstr "еПИЙЭККГСГ"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr ""
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr ""
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr ""
+
+#: filter/libfilter-i18n.h:16
+msgid "does not sound like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:19
 #, fuzzy
 msgid "Draft"
 msgstr "еПИЙЭККГСГ"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:20
+msgid "ends with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:21
 msgid "Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:22
+msgid "exists"
+msgstr ""
+
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Expression"
 msgstr "е_МщЯЦЕИЕР"
 
-#: filter/libfilter-i18n.h:14
-#, fuzzy
-msgid "Forward to Address"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
-
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:24
 msgid "Important"
 msgstr ""
 
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "Is Not"
-msgstr "сГЛЕъЫ_ЛА"
+#: filter/libfilter-i18n.h:25
+msgid "is"
+msgstr ""
 
-#: filter/libfilter-i18n.h:17
-msgid "Is"
+#: filter/libfilter-i18n.h:26
+msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:27
+msgid "is less than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:28
+msgid "is not"
+msgstr ""
+
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "Message Body"
 msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:31
 #, fuzzy
 msgid "Message Header"
 msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Message was sent"
 msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "Move to Folder"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:35
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:36
+msgid "on or before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
 #, fuzzy
 msgid "Read"
 msgstr "дИАЦЯАЖч"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28 filter/score-rule.c:203 filter/score-rule.c:205
-#: mail/message-list.c:1052
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 #, fuzzy
 msgid "Sender"
 msgstr "аПОСТОКч"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:43
 #, fuzzy
 msgid "Set Status"
 msgstr "йАТэСТАСГ СЩМДЕСГР"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "лщЦЕХОР"
+
+#: filter/libfilter-i18n.h:45
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:46
 #, fuzzy
 msgid "Source Account"
 msgstr "лИЙЯэ еИЙОМъДИА"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:48
+msgid "starts with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "хщЛА"
 
-#: filter/libfilter-i18n.h:38
-#, fuzzy
-msgid "contains"
-msgstr "е_МщЯЦЕИЕР"
-
-#: filter/libfilter-i18n.h:39
-msgid "does not contain"
+#: filter/libfilter-i18n.h:52
+msgid "was after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
-msgid "does not end with"
+#: filter/libfilter-i18n.h:53
+msgid "was before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
-msgid "does not exist"
-msgstr ""
+#: filter/rule-editor.c:147
+#, fuzzy
+msgid "Rules"
+msgstr "_лчМУЛА"
 
-#: filter/libfilter-i18n.h:42
-msgid "does not sound like"
-msgstr ""
+#: filter/rule-editor.c:240
+#, fuzzy
+msgid "Add Rule"
+msgstr "мщА сУМТЭЛЕУСГ"
 
-#: filter/libfilter-i18n.h:43
-msgid "does not start with"
-msgstr ""
+#: filter/rule-editor.c:299
+#, fuzzy
+msgid "Edit Rule"
+msgstr "_жэЙЕККОР"
 
-#: filter/libfilter-i18n.h:44
-msgid "ends with"
-msgstr ""
+#: filter/score-editor.c:130
+#, fuzzy
+msgid "Score Rules"
+msgstr "_жэЙЕККОР"
 
-#: filter/libfilter-i18n.h:45
-msgid "exists"
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/libfilter-i18n.h:46
-msgid "is greater than"
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47
-msgid "is less than"
-msgstr ""
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "Mail"
+msgstr "_лчМУЛА"
 
-#: filter/libfilter-i18n.h:48
-msgid "is not"
+#: importers/elm-importer.c:498
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
-msgid "is"
-msgstr ""
+#: importers/elm-importer.c:527
+#, fuzzy
+msgid "Elm mail"
+msgstr "_лчМУЛА"
 
-#: filter/libfilter-i18n.h:50
-msgid "on or after"
-msgstr ""
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
 
-#: filter/libfilter-i18n.h:51
-msgid "on or before"
+#: importers/evolution-gnomecard-importer.c:253
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: filter/libfilter-i18n.h:52
-msgid "sounds like"
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "е_МщЯЦЕИЕР"
+
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: filter/libfilter-i18n.h:53
-msgid "starts with"
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
 msgstr ""
 
-#: filter/libfilter-i18n.h:54
-msgid "was after"
+#: importers/pine-importer.c:691
+#, fuzzy
+msgid "Pine mail"
+msgstr "аПОСТОКч"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
 msgstr ""
 
-#: filter/libfilter-i18n.h:55
-msgid "was before"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Evolution mail composer."
+msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Evolution mail executive summary component."
+msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Evolution mail folder display component."
+msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Evolution mail folder factory component."
+msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution composer."
+msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution mail component."
+msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Mail Summary component."
+msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
 msgstr ""
 
-#: filter/score-editor.c:130
+#: mail/component-factory.c:337
 #, fuzzy
-msgid "Score Rules"
-msgstr "_жэЙЕККОР"
+msgid "Properties..."
+msgstr "иДИЭТГТЕР"
 
-#: mail/component-factory.c:329
+#: mail/component-factory.c:337
+msgid "Change this folder's properties"
+msgstr ""
+
+#: mail/component-factory.c:757
 #, fuzzy
 msgid "Cannot initialize Evolution's mail component."
 msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-factory.c:209
+#: mail/folder-browser-ui.c:254
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "иДИЭТГТЕР"
 
-#: mail/folder-browser-factory.c:211 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
+#: mail/folder-browser-ui.c:256
 #, fuzzy
 msgid "Properties"
 msgstr "иДИЭТГТЕР"
 
-#: mail/folder-browser.c:225
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr ""
+
+#: mail/folder-browser.c:893
 #, fuzzy
 msgid "Store search as vFolder"
 msgstr "_мщОР жэЙЕККОР"
 
-#: mail/folder-browser.c:533
-msgid "VFolder on Subject"
-msgstr ""
+#: mail/folder-browser.c:1238
+#, fuzzy
+msgid "VFolder on _Subject"
+msgstr "хщЛА"
 
-#: mail/folder-browser.c:536
-msgid "VFolder on Sender"
+#: mail/folder-browser.c:1241
+msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:539
-msgid "VFolder on Recipients"
-msgstr ""
+#: mail/folder-browser.c:1244
+#, fuzzy
+msgid "VFolder on _Recipients"
+msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
-#: mail/folder-browser.c:542 mail/folder-browser.c:733
+#: mail/folder-browser.c:1247
 #, fuzzy
-msgid "VFolder on Mailing List"
+msgid "VFolder on Mailing _List"
 msgstr "жэЙЕККОР ПОУ ПЕЯИщВЕИ ЛГМЩЛАТА"
 
-#: mail/folder-browser.c:548
-msgid "Filter on Subject"
-msgstr ""
+#: mail/folder-browser.c:1253
+#, fuzzy
+msgid "Filter on Sub_ject"
+msgstr "хщЛА"
 
-#: mail/folder-browser.c:551
-msgid "Filter on Sender"
-msgstr ""
+#: mail/folder-browser.c:1256
+#, fuzzy
+msgid "Filter on Sen_der"
+msgstr "хщЛА"
 
-#: mail/folder-browser.c:554
-msgid "Filter on Recipients"
-msgstr ""
+#: mail/folder-browser.c:1259
+#, fuzzy
+msgid "Filter on Re_cipients"
+msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
-#: mail/folder-browser.c:557 mail/folder-browser.c:732
-msgid "Filter on Mailing List"
-msgstr ""
+#: mail/folder-browser.c:1262
+#, fuzzy
+msgid "Filter on _Mailing List"
+msgstr "жэЙЕККОР ПОУ ПЕЯИщВЕИ ЛГМЩЛАТА"
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:1273
 #, fuzzy
 msgid "Resend"
 msgstr "аПОСТОКч"
 
-#: mail/folder-browser.c:570
-msgid "Save As..."
-msgstr ""
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
+#, fuzzy
+msgid "_Save As..."
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: mail/folder-browser.c:577
-msgid "Reply to Sender"
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#, fuzzy
+msgid "_Print"
+msgstr "пЯОТЕЯАИЭТГТА"
+
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#, fuzzy
+msgid "_Reply to Sender"
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+msgid "Reply to _All"
 msgstr ""
 
-#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:60
-msgid "Reply to All"
+#: mail/folder-browser.c:1288
+msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:24
-msgid "Forward"
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:26
-msgid "Forward inline"
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+msgid "Mark as U_nread"
 msgstr ""
 
-#: mail/folder-browser.c:586
-msgid "Mark as Read"
+#: mail/folder-browser.c:1295
+msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:588
-msgid "Mark as Unread"
+#: mail/folder-browser.c:1297
+msgid "Mark as Unim_portant"
 msgstr ""
 
-#: mail/folder-browser.c:593
+#: mail/folder-browser.c:1302
 #, fuzzy
-msgid "Move to Folder..."
+msgid "_Move to Folder..."
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: mail/folder-browser.c:595
+#: mail/folder-browser.c:1304
 #, fuzzy
-msgid "Copy to Folder..."
+msgid "_Copy to Folder..."
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:81
-msgid "Undelete"
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+msgid "_Undelete"
 msgstr ""
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
+
+#: mail/folder-browser.c:1318
 #, fuzzy
 msgid "Apply Filters"
 msgstr "_жэЙЕККОР"
 
-#: mail/folder-browser.c:613
+#: mail/folder-browser.c:1322
 #, fuzzy
-msgid "Create Rule From Message"
+msgid "Create Ru_le From Message"
 msgstr "пЯЭВЕИЯА ЛГМЩЛАТА"
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:1479
+msgid "Filter on Mailing List"
+msgstr ""
+
+#: mail/folder-browser.c:1480
+#, fuzzy
+msgid "VFolder on Mailing List"
+msgstr "жэЙЕККОР ПОУ ПЕЯИщВЕИ ЛГМЩЛАТА"
+
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:736
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
-msgid "Evolution mail composer."
+msgid "Factory to import mbox into Evolution"
 msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Evolution mail executive summary component."
-msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#, fuzzy
-msgid "Evolution mail folder display component."
-msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#, fuzzy
-msgid "Evolution mail folder factory component."
-msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution composer."
-msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+msgid "Imports mbox files into Evolution"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the Evolution mail component."
-msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-#, fuzzy
-msgid "Factory for the Mail Summary component."
-msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+msgid "Imports Outlook Express 4 files into Evolution"
+msgstr ""
 
 #: mail/local-config.glade.h:1
 #, fuzzy
@@ -5778,40 +6708,66 @@ msgstr "еИСЕЯВЭЛЕМА"
 msgid "mh"
 msgstr ""
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+msgid "You have not filled in all of the required information."
+msgstr ""
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
+#, fuzzy
+msgid "Evolution Account Editor"
+msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
+
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
+
+#: mail/mail-account-gui.c:977
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr ""
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
-msgid "Are you sure you want to delete this news account?"
+#: mail/mail-accounts.c:268
+msgid "Don't delete"
 msgstr ""
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:536
-msgid "Evolution Account Manager"
+#: mail/mail-accounts.c:271
+msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-account-editor.c:105
-msgid "You have not filled in all of the required information."
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+msgid "Are you sure you want to delete this news account?"
 msgstr ""
 
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
-#, fuzzy
-msgid "Evolution Account Editor"
-msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
+msgid "Evolution Account Manager"
+msgstr ""
 
 #: mail/mail-autofilter.c:70
 #, c-format
@@ -5833,12 +6789,12 @@ msgstr ""
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
 #, fuzzy
 msgid "Add Filter Rule"
 msgstr "_жэЙЕККОР"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5846,103 +6802,161 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:308
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:351
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:591
+#: mail/mail-callbacks.c:653
 #, c-format
-msgid "On %s, %s wrote:\n"
+msgid "On %s, %s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:773
+#: mail/mail-callbacks.c:914
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: mail/mail-callbacks.c:876
+#: mail/mail-callbacks.c:1011
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "мщА ЛГМЩЛАТА"
 
-#: mail/mail-callbacks.c:878
+#: mail/mail-callbacks.c:1013
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "мщА ЛГМЩЛАТА"
 
-#: mail/mail-callbacks.c:1019
+#: mail/mail-callbacks.c:1374
+#, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1056
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1089 mail/mail-display.c:90
-msgid "Overwrite file?"
+#: mail/mail-callbacks.c:1442
+#, c-format
+msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1093 mail/mail-display.c:94
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
+#: mail/mail-callbacks.c:1463
+#, fuzzy
+msgid "No Message Selected"
+msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
-#: mail/mail-callbacks.c:1137
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1139
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1253
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:51
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "_жэЙЕККОР"
+
+#: mail/mail-callbacks.c:1823
 #, fuzzy
 msgid "Print Message"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/mail-callbacks.c:1349
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-config.c:1043 mail/mail-config.c:1046
+#: mail/mail-callbacks.c:1966
+#, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr ""
+
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+
+#. set window title
+#: mail/mail-config-druid.c:466
+msgid "Evolution Account Wizard"
+msgstr ""
+
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 msgid "Connecting to server..."
 msgstr ""
 
@@ -5955,37 +6969,67 @@ msgid " color"
 msgstr ""
 
 #: mail/mail-config.glade.h:3
+msgid "(SSL is not supported in this build of evolution)"
+msgstr ""
+
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "Account"
 msgstr "лИЙЯэ еИЙОМъДИА"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "Account Information"
 msgstr "еПИСЩМАЬГ"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Accounts"
 msgstr "лИЙЯэ еИЙОМъДИА"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#, fuzzy
+msgid "Attachment"
+msgstr "мЕА ЕПИСЩМАЬГ"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "мщА сУМТЭЛЕУСГ"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -5995,449 +7039,591 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Done"
 msgstr "сГЛЕъЫ_ЛА"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid "Drafts"
 msgstr "еПИЙЭККГСГ"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Drafts folder:"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "пЯОТЕЯАИЭТГТА"
+
+#: mail/mail-config.glade.h:36
 #, fuzzy
 msgid "Email Address:"
 msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+msgid "Enabled"
+msgstr ""
+
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Full Name:"
 msgstr "лЕТОМОЛАСъА оЛэДАР"
 
-#: mail/mail-config.glade.h:27
-msgid "Highlight citations with "
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:42
+msgid "HTML Signature:"
+msgstr ""
+
+#: mail/mail-config.glade.h:43
+msgid "Highlight citations with"
+msgstr ""
+
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+msgid "Inline"
+msgstr ""
+
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Kerberos "
 msgstr "аПОСТОКч"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Mail Configuration"
 msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "аПЭ"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:54
 #, fuzzy
-msgid "Mark messages as \"Read\" after:"
+msgid "Mark messages as Read after"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "мщА оЛэДА"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "News"
 msgstr "_мщО"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Optional Information"
 msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr ""
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr ""
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "сГЛЕъЫ_ЛА"
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
+
+#: mail/mail-config.glade.h:84
+msgid "Security"
+msgstr ""
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Sending Email"
 msgstr "аПОСТОКч"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Sending Mail"
 msgstr "аПОСТОКч"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 #, fuzzy
 msgid "Sent"
 msgstr "аПОСТОКч"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Server Configuration"
 msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Server Type: "
 msgstr "аПОСТОКч"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "мщА сУМТЭЛЕУСГ"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "еПИСЩМАЬГ"
+
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Sources"
 msgstr "мщА сУМТЭЛЕУСГ"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Special Folders"
 msgstr "_жэЙЕККОР"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Type"
-msgstr ""
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "Username:"
 msgstr "сГЛЕъЫ_ЛА"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
-msgid "_Edit"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config-druid.c:99
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config-druid.c:101
-msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what kind of server you use, contact your system administrator or "
-"Internet Service Provider."
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "seconds."
+msgstr "аПОСТОКч"
+
+#: mail/mail-crypto.c:60
+msgid "Could not create a PGP signature context."
 msgstr ""
 
-#: mail/mail-config-druid.c:105
-msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know which protocol you use, contact your system administrator or "
-"Internet Service Provider."
+#: mail/mail-crypto.c:86
+msgid "Could not create a PGP verification context."
 msgstr ""
 
-#: mail/mail-config-druid.c:107
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
+#: mail/mail-crypto.c:116
+msgid "Could not create a PGP encryption context."
 msgstr ""
 
-#. set window title
-#: mail/mail-config-druid.c:445
-msgid "Evolution Account Wizard"
+#: mail/mail-crypto.c:142
+msgid "Could not create a PGP decryption context."
 msgstr ""
 
-#: mail/mail-display.c:194
-#, fuzzy
-msgid "Save Attachment"
-msgstr "мщА ЕПИСЩМАЬГ..."
+#: mail/mail-crypto.c:177
+msgid "Could not create a S/MIME signature context."
+msgstr ""
 
-#: mail/mail-display.c:234
-#, c-format
-msgid "Could not create temporary directory: %s"
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-display.c:295
-msgid "Save to Disk..."
+#: mail/mail-crypto.c:240
+msgid "Could not create a S/MIME encryption context."
 msgstr ""
 
-#: mail/mail-display.c:297
-#, c-format
-msgid "Open in %s..."
+#: mail/mail-crypto.c:271
+msgid "Could not create a S/MIME envelope context."
+msgstr ""
+
+#: mail/mail-crypto.c:301
+msgid "Could not create a S/MIME decode context."
+msgstr ""
+
+#: mail/mail-display.c:221
+#, fuzzy
+msgid "Save Attachment"
+msgstr "мщА ЕПИСЩМАЬГ..."
+
+#: mail/mail-display.c:338
+msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:299
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:334
-msgid "External Viewer"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:1102
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr ""
+
+#: mail/mail-display.c:1048
+#, fuzzy
+msgid "Loading message content"
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
+
+#: mail/mail-display.c:1404
 #, fuzzy
-msgid "Open link in browser"
+msgid "Open Link in Browser"
 msgstr "╤МОИЦЛА СЕ мщО пАЯэХУЯО"
 
-#: mail/mail-display.c:1104
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "_цМЫЯИЛъА"
+
+#: mail/mail-display.c:1408
 #, fuzzy
-msgid "Save as (FIXME)"
+msgid "Save Link as (FIXME)"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: mail/mail-display.c:1106
+#: mail/mail-display.c:1410
 #, fuzzy
-msgid "Copy location (FIXME)"
-msgstr "_цМЫЯИЛъА"
+msgid "Save Image as..."
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr "аПОСТОКч"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
 
-#: mail/mail-format.c:518
+#: mail/mail-format.c:609
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "мЕА ЕПИСЩМАЬГ"
 
-#: mail/mail-format.c:560
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:742
+#: mail/mail-format.c:746
 #, fuzzy
-msgid "Loading message content"
-msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
+msgid "Date"
+msgstr "еПИЙЭККГСГ"
+
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#, fuzzy
+msgid "From"
+msgstr "аПЭ"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "еКчЖХГ"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "пЯОР"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "аМТъЦЯАЖО:"
 
-#: mail/mail-format.c:1046
+#: mail/mail-format.c:1291
+msgid "No GPG/PGP program configured."
+msgstr ""
+
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:1052
+#: mail/mail-format.c:1318
 #, fuzzy
 msgid "Encrypted message"
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: mail/mail-format.c:1053
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1137 mail/mail-format.c:1526
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1145 mail/mail-format.c:1534
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1747
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1759
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1763
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1797
+#: mail/mail-format.c:2094
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr ""
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1802
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:337
-#, fuzzy, c-format
-msgid "No such folder %s"
-msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
-
-#: mail/mail-local.c:509
+#: mail/mail-local.c:458
 #, fuzzy, c-format
 msgid "Opening '%s'"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:791
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:815
-#, fuzzy
-msgid "Reconfiguring folder"
-msgstr "_мщОР жэЙЕККОР"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:844
-msgid "Closing current folder"
-msgstr ""
-
-#: mail/mail-local.c:876
-msgid "Renaming old folder and opening"
-msgstr ""
-
-#: mail/mail-local.c:894
-#, fuzzy
-msgid "Creating new folder"
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
-
-#: mail/mail-local.c:908
-#, fuzzy
-msgid "Copying messages"
-msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
-
-#: mail/mail-local.c:925
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:964
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "тО Evolution ДЕ ЛПОЯЕъ МА ДГЛИОУЯЦчСЕИ ТОУР ТОПИЙОЩР ЖАЙщККОУР"
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "_мщОР жэЙЕККОР"
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:192
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr ""
 
-#: mail/mail-mt.c:679 mail/session.c:98
-msgid "Do you accept?"
-msgstr ""
-
-#: mail/mail-mt.c:873
-#, fuzzy
-msgid "Evolution progress"
-msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
-
-#: mail/mail-ops.c:587
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:589
-#, fuzzy
-msgid "Sending message"
-msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
-
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:698
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:717
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:811
+#: mail/mail-ops.c:805
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
@@ -6452,297 +7638,292 @@ msgstr "мщА ЛГМЩЛАТА"
 msgid "Copying messages to %s"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/mail-ops.c:900
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:904
 #, fuzzy
 msgid "Copying"
 msgstr "аМТИЦЯАЖч"
 
-#: mail/mail-ops.c:978
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1139
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#, fuzzy
+msgid "Trash"
+msgstr "еЙЙЯЕЛЭ_ТГТА"
+
+#: mail/mail-ops.c:1189
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: mail/mail-ops.c:1247
+#: mail/mail-ops.c:1297
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "_мщОР жэЙЕККОР"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1483
+#: mail/mail-ops.c:1653
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "мщА ЛГМЩЛАТА"
 
-#: mail/mail-ops.c:1550
-#, fuzzy
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/mail-ops.c:1560
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1634
-#, fuzzy
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/mail-ops.c:1713
+#: mail/mail-ops.c:1887
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: mail/mail-ops.c:1726
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1740
+#: mail/mail-ops.c:1913
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1987
 #, fuzzy
 msgid "Saving attachment"
 msgstr "мщА ЕПИСЩМАЬГ..."
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:2003
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: mail/mail-ops.c:1857
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-ops.c:2101
+#, c-format
+msgid "Disconnecting from %s"
+msgstr ""
+
+#: mail/mail-search.c:138
 #, fuzzy
-msgid "_Search"
-msgstr "гЛЕЯОКЭЦИО"
+msgid "(Untitled Message)"
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
+
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
+
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
+
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-search.c:315
+msgid "Search Forward"
+msgstr ""
+
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
+msgstr "пЯОТЕЯАИЭТГТА"
 
-#: mail/mail-send-recv.c:138
-msgid "Cancelling ..."
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "еПИЙЭККГСГ"
+
+#: mail/mail-send-recv.c:141
+msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 #, fuzzy
 msgid "Receiving"
 msgstr "еКчЖХГ"
 
-#: mail/mail-send-recv.c:285
-msgid "Updating ..."
-msgstr ""
+#: mail/mail-send-recv.c:302
+#, fuzzy
+msgid "Updating..."
+msgstr "е_МщЯЦЕИЕР"
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
-msgid "Waiting ..."
-msgstr ""
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#, fuzzy
+msgid "Waiting..."
+msgstr "е_МщЯЦЕИЕР"
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 #, fuzzy
 msgid "Sending"
 msgstr "аПОСТОКч"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr ""
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-tools.c:188
-#, fuzzy, c-format
-msgid "[%s] (forwarded message)"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
-
-#: mail/mail-tools.c:198
-msgid "Fwd: (no subject)"
-msgstr ""
-
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:241
 #, fuzzy, c-format
 msgid "Forwarded message - %s"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: mail/mail-tools.c:217
+#: mail/mail-tools.c:245
 #, fuzzy
-msgid "Forwarded message (no subject)"
+msgid "Forwarded message"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: mail/mail-tools.c:414
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 #, fuzzy
 msgid "VFolders"
 msgstr "_жэЙЕККОР"
 
-#: mail/mail-vfolder.c:427
+#: mail/mail-vfolder.c:463
 #, fuzzy
 msgid "New VFolder"
 msgstr "_мщОР жэЙЕККОР"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:59
-msgid "Reply"
-msgstr ""
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:65
-#, fuzzy
-msgid "Reply to the sender of this message"
-msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
-
-#: mail/mail-view.c:147 ui/evolution-mail.xml.h:63
-#, fuzzy
-msgid "Reply to all recipients of this message"
-msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:28
-#, fuzzy
-msgid "Forward this message"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
-
-#: mail/mail-view.c:154 ui/evolution-mail.xml.h:56
-#, fuzzy
-msgid "Print the selected message"
-msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
-
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
-#, fuzzy
-msgid "Delete this message"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
-
-#: mail/message-list.c:648
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:649
+#: mail/message-list.c:614
 #, fuzzy
 msgid "Seen"
 msgstr "аПОСТОКч"
 
-#: mail/message-list.c:650
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:651
+#: mail/message-list.c:616
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
 
-#: mail/message-list.c:652
+#: mail/message-list.c:617
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/message-list.c:656
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:657
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:661
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:662
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:912
+#: mail/message-list.c:877
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:919
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:928
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:940
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:948
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:950
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:1052
-msgid "Flagged"
-msgstr ""
-
-#: mail/message-list.c:1053
+#: mail/message-list.c:2290
 #, fuzzy
-msgid "From"
-msgstr "аПЭ"
+msgid "Updating message list"
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/message-list.c:1053
-#, fuzzy
-msgid "Date"
-msgstr "еПИЙЭККГСГ"
+#: mail/message-list.etspec.h:2
+msgid "Flagged"
+msgstr ""
 
-#: mail/message-list.c:1053
+#: mail/message-list.etspec.h:4
 #, fuzzy
 msgid "Received"
 msgstr "еКчЖХГ"
 
-#: mail/message-list.c:1054
-msgid "To"
-msgstr "пЯОР"
-
-#: mail/message-list.c:1054
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "лщЦЕХОР"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Folder"
 msgstr "_жэЙЕККОР"
@@ -6772,161 +7953,1449 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr ""
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
 #, fuzzy
-msgid "Folder name:"
-msgstr "лЕТОМОЛАСъА оЛэДАР"
+msgid "Factory for the Evolution executive summary component."
+msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: my-evolution/component-factory.c:140
 #, fuzzy
-msgid "Folder type:"
-msgstr "_жэЙЕККОР"
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
 #, fuzzy
-msgid "Specify where to create the folder:"
-msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+msgid "Appointments"
+msgstr "я_АМТЕБОЩ"
 
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "я_АМТЕБОЩ"
+
+#: my-evolution/e-summary-calendar.c:226
+msgid "%l:%M%p"
 msgstr ""
 
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
+#: my-evolution/e-summary-calendar.c:228
+msgid "%a %l:%M%p"
 msgstr ""
 
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "аПОСТОКч"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
 msgstr ""
 
-#: shell/importer/importer.c:351
-msgid "Importing"
+#: my-evolution/e-summary-preferences.c:869
+#, fuzzy
+msgid "Add a news feed"
+msgstr "мщА оЛэДА"
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
+
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
 msgstr ""
 
-#: shell/importer/importer.c:372
-#, fuzzy, c-format
-msgid "Error starting %s"
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: shell/importer/importer.c:387
-#, fuzzy, c-format
-msgid "Error loading %s"
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "еЛЖэМИСГ ЕПИСУМэ_ЬЕЫМ"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "е_МщЯЦЕИЕР"
+
+#: my-evolution/e-summary.c:145
+msgid "%A, %d %B %Y"
+msgstr ""
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "пЯОТЕЯАИЭТГТА"
+
+#: my-evolution/e-summary.c:518
+msgid "Printing of My Evolution failed"
+msgstr ""
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "гЛЕЯОКЭЦИО"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
+
+#: my-evolution/metar.c:63
+msgid "Variable"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "сГЛЕъЫ_ЛА"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "сГЛЕъЫ_ЛА"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "еПИЙЭККГСГ"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "мщА сУМТЭЛЕУСГ"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "цМЫЯИЛъЕР"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "мщА сУМТЭЛЕУСГ"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+msgid "West"
+msgstr ""
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "сГЛЕъЫ_ЛА"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Showers"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+msgid "Rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Drifting rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Freezing rain"
+msgstr ""
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "лщЦЕХОР"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Moderate snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Drifting snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "_лчМУЛА"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Shallow hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Partial hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "аПОСТОКч"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Shallow small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Showers of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+msgid "Unknown precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Unknown thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "аъ_ТГСГ сУМэМТГСГР"
+
+#. MIST
+#: my-evolution/metar.c:109
+msgid "Mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Thick mist"
+msgstr "йАТэКОЦОР ЕЙЙЯЕЛОТчТЫМ"
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "пЯОТЕЯАИЭТГТА"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Drifting mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
 msgstr ""
 
-#: shell/importer/importer.c:473
-msgid "Automatic"
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
 msgstr ""
 
-#: shell/importer/importer.c:523
+#. SMOKE
+#: my-evolution/metar.c:111
 #, fuzzy
-msgid "Filename:"
-msgstr "лЕТОМОЛАСъА оЛэДАР"
+msgid "Smoke"
+msgstr "мщА сУМТЭЛЕУСГ"
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
 #, fuzzy
-msgid "Select a file"
-msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
+msgid "Shallow smoke"
+msgstr "еЛЖэМИСГ ЕПИСУМэ_ЬЕЫМ"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
 
-#: shell/importer/importer.c:538
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
 #, fuzzy
-msgid "File type:"
-msgstr "йУЯъЫР сУМТОЛЕЩСЕИР"
+msgid "Smoke with wind"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
 msgstr ""
 
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
 msgstr ""
 
-#: shell/importer/import.glade.h:2
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
 #, fuzzy
-msgid "Evolution Import Utility"
-msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
+msgid "Sand"
+msgstr "аПОСТОКч"
 
-#: shell/importer/import.glade.h:3
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
 #, fuzzy
-msgid "Evolution Importer Utility"
-msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
+msgid "Haze"
+msgstr "аПОСТОКч"
 
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "пЯЭВЕИЯА"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+msgid "Dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
 msgstr ""
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Raging tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Thunderous tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "мщА оЛэДА"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "_жэЙЕККОР"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "е_МщЯЦЕИЕР"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#: my-evolution/my-evolution.glade.h:7
+msgid "Display stations:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:8
+msgid "Displayed feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "пЯОТЕЯАИЭТГТА"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+#, fuzzy
+msgid "News Feeds"
+msgstr "мщА сУМТЭЛЕУСГ"
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "счЛЕЯА"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "цМЫЯИЛъЕР"
+
+#: my-evolution/my-evolution.glade.h:17
+msgid "One week"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr "_жэЙЕККОР"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "еЛЖэМИСГ ЕПИСУМэ_ЬЕЫМ"
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "Show full path for folders"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "еЛЖэМИСГ ЕПИСУМэ_ЬЕЫМ"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "еЙЙЯЕЛЭ_ТГТА"
+
+#: my-evolution/my-evolution.glade.h:24
+msgid "Units: "
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "еПИЙЭККГСГ"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "еПИЙЭККГСГ"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr ""
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "еЛЖэМИСГ ЕПИСУМэ_ЬЕЫМ"
+
+#: shell/e-activity-handler.c:200
+msgid "Cancel Operation"
+msgstr ""
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "_жэЙЕККОР"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr ""
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr ""
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr ""
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6934,14 +9403,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:230
+#: shell/e-setup.c:235
 #, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6949,7 +9418,16 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6957,535 +9435,905 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: shell/e-shell-folder-commands.c:162
+msgid "Cannot copy a folder over itself."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#: shell/e-shell-folder-commands.c:313
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: shell/e-shell-folder-commands.c:363
+#, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, fuzzy, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:248
+#: shell/e-shell-folder-creation-dialog.c:275
 #, fuzzy
 msgid "Evolution - Create new folder"
 msgstr "тО Evolution ДЕ ЛПОЯЕъ МА ДГЛИОУЯЦчСЕИ ТОУР ТОПИЙОЩР ЖАЙщККОУР"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:319
+#: shell/e-shell-folder-selection-dialog.c:343
 #, fuzzy
 msgid "New..."
 msgstr "_мщО"
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr ""
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:383
+#, fuzzy, c-format
+msgid "Error starting %s"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: shell/e-shell-importer.c:402
+#, fuzzy, c-format
+msgid "Error loading %s"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr ""
+
+#: shell/e-shell-importer.c:538
+#, fuzzy
+msgid "Filename:"
+msgstr "лЕТОМОЛАСъА оЛэДАР"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a file"
+msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
+
+#: shell/e-shell-importer.c:553
+#, fuzzy
+msgid "File type:"
+msgstr "йУЯъЫР сУМТОЛЕЩСЕИР"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "_мщОР жэЙЕККОР"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:437
 #, fuzzy
 msgid "Go to folder..."
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: shell/e-shell-view.c:148
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+msgid "Work Online"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
+msgstr ""
+
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1134
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
+
+#: shell/e-shell-view.c:1411
 #, c-format
 msgid "%s - Evolution %s"
 msgstr ""
 
-#: shell/e-shell-view.c:1136
+#: shell/e-shell-view.c:1413
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr ""
 
-#: shell/e-shell.c:378
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1248
+#: shell/e-shell.c:1311
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "лЕТОМОЛАСъА сУМТЭЛЕУСГР"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
+
+#: shell/e-shortcuts-view.c:314
 #, fuzzy
 msgid "_Small Icons"
 msgstr "лИЙЯэ еИЙОМъДИА"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 #, fuzzy
 msgid "_Large Icons"
 msgstr "лЕЦэКА еИЙОМъДИА"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 #, fuzzy
 msgid "_New Group..."
 msgstr "мщА оЛэДА"
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:294
+#: shell/e-shortcuts-view.c:332
 #, fuzzy
-msgid "_Remove This Group..."
+msgid "_Remove this Group..."
 msgstr "дИАЦЯАЖч оЛэДАР"
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "дИАЦЯАЖч оЛэДАР"
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
+
+#: shell/e-shortcuts-view.c:341
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr ""
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "лЕТОМОЛАСъА сУМТЭЛЕУСГР"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "лЕТОМОЛАСъА сУМТЭЛЕУСГР"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+#, fuzzy
+msgid "Open"
+msgstr "╤МОИ_ЦЛА"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#, fuzzy
+msgid "Open in New Window"
+msgstr "╤МОИЦЛА СЕ мщО пАЯэХУЯО"
+
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "лЕТОМОЛАСъА оЛэДАР"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "лЕТОМОЛАСъА сУМТЭЛЕУСГР"
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:379
+#: shell/e-shortcuts.c:585
 #, fuzzy
 msgid "Error saving shortcuts."
 msgstr "йУЯъЫР сУМТОЛЕЩСЕИР"
 
-#: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
+#: shell/e-shortcuts.c:982
 #, fuzzy
-msgid "_View"
-msgstr "_мщО"
+msgid "Shortcuts"
+msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
 
-#: shell/e-storage-set-view.c:649
+#: shell/e-shortcuts.c:984
 #, fuzzy
-msgid "View the selected folder"
-msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
+msgid "Inbox"
+msgstr "еИСЕЯВЭЛЕМА"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "_цМЫЯИЛъА"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr ""
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr ""
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
 msgstr ""
 
-#: shell/main.c:83
+#: shell/e-task-widget.c:173
+msgid "%s (%d%% complete)"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "жэЙЕКОР ПОУ ПЕЯИщВЕИ ЕЙЙЯЕЛЭТГТЕР"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "Host"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+msgid "Folder name:"
+msgstr "лЕТОМОЛАСъА оЛэДАР"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#, fuzzy
+msgid "Folder type:"
+msgstr "_жэЙЕККОР"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Specify where to create the folder:"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+
+#: shell/importer/import.glade.h:2
+#, fuzzy
+msgid "Evolution Import Utility"
+msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
+
+#: shell/importer/import.glade.h:3
+#, fuzzy
+msgid "Evolution Importer Utility"
+msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+
+#: shell/importer/intelligent.c:191
+msgid "Importers"
+msgstr ""
+
+#: shell/importer/intelligent.c:197
+msgid "Don't import"
+msgstr ""
+
+#: shell/importer/intelligent.c:199
+#, fuzzy
+msgid "Don't ask me again"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
 #, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:108
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:139
-msgid "Cannot initialize the Evolution shell."
-msgstr ""
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
+msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 
-#: shell/main.c:185
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:186
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:219
+#: shell/main.c:255
 #, fuzzy
 msgid "Cannot initialize the Bonobo component system."
 msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "аМТИЦЯАЖч"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create new contact"
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+msgid "Copy the selection"
+msgstr "аЙЩЯЫСГ ТЕКЕУТАъАР КЕИТОУЯЦъАР"
 
 #: ui/evolution-addressbook.xml.h:4
 #, fuzzy
-msgid "Delete a contact"
-msgstr "еПИКщНТЕ ЕПИСЩМАЬГ"
+msgid "Create new contact"
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
+#: ui/evolution-addressbook.xml.h:5
 #, fuzzy
-msgid "Find"
-msgstr "пЯОТЕЯАИЭТГТА"
+msgid "Create new contact list"
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: ui/evolution-addressbook.xml.h:6
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "йОПч"
+
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:9
 #, fuzzy
-msgid "Find a contact"
-msgstr "о ЙАТэКОЦОР ЦМЫЯИЛИЧМ САР"
+msgid "Delete selected contacts"
+msgstr "еПИКщНТЕ ЕПИСЩМАЬГ"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "New contact"
 msgstr "_цМЫЯИЛъА"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:49
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
-msgid "Previews the message to be printed"
+msgid "New list"
+msgstr "_мщО"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "еПИЙЭККГСГ"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#, fuzzy
+msgid "Paste the clipboard"
+msgstr "еПИЙЭККГСГ АМТИЙЕИЛщМОУ АПО ТО ПЯЭВЕИЯО"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:17
 #, fuzzy
-msgid "Print contacts"
+msgid "Print selected contacts"
 msgstr "о ЙАТэКОЦОР ЦМЫЯИЛИЧМ САР"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:78
+#: ui/evolution-addressbook.xml.h:18
+#, fuzzy
+msgid "Select All"
+msgstr "_мщОР жэЙЕККОР"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "еПИКщНТЕ ЕПИСЩМАЬГ"
+
+#: ui/evolution-addressbook.xml.h:20
 #, fuzzy
 msgid "Stop"
 msgstr "мщА сУМТЭЛЕУСГ"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:14
-#, fuzzy
-msgid "View All"
-msgstr "_мщО"
-
-#: ui/evolution-addressbook.xml.h:15
-#, fuzzy
-msgid "View all contacts"
-msgstr "еПИКщНТЕ ЕПИСЩМАЬГ"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "_Addressbook Sources..."
 msgstr "мщА сУМТЭЛЕУСГ"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 #, fuzzy
 msgid "_Contact"
 msgstr "_цМЫЯИЛъА"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "_цМЫЯИЛъА"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 #, fuzzy
 msgid "_Print..."
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:110
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:42
+#: ui/evolution-addressbook.xml.h:29
+#, fuzzy
+msgid "_Select All"
+msgstr "_мщОР жэЙЕККОР"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "е_ЯЦАКЕъА"
 
-#: ui/evolution-calendar.xml.h:1
-#, fuzzy
-msgid "5 Days"
-msgstr "пЯЭВЕИЯА"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Create a new all day Event"
+msgid "Create a New All-Day _Event"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
 #: ui/evolution-calendar.xml.h:5
 #, fuzzy
-msgid "Create a new appointment"
+msgid "Create a _New Appointment"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
 #: ui/evolution-calendar.xml.h:6
 #, fuzzy
-msgid "Create a new calendar"
+msgid "Create a new appointment"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
 #: ui/evolution-calendar.xml.h:7
-#, fuzzy
-msgid "Day"
-msgstr "пЯЭВЕИЯА"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Go To"
 msgstr "счЛЕЯА"
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Go back in time"
-msgstr ""
-
 #: ui/evolution-calendar.xml.h:10
-msgid "Go forward in time"
+msgid "Go back in time"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:11
-msgid "Go to _Date"
+msgid "Go forward in time"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:12
-#, fuzzy
-msgid "Go to _Today"
-msgstr "счЛЕЯА"
-
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to a specific date"
+msgid "Go to _Date"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:14
-msgid "Go to present time"
+msgid "Go to a specific date"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:15
-#, fuzzy
-msgid "Month"
-msgstr "цМЫЯИЛъЕР"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
+msgid "Go to present time"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 #, fuzzy
-msgid "Open Calendar"
-msgstr "гЛЕЯОКЭЦИО"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr ""
+msgid "New Appointment"
+msgstr "я_АМТЕБОЩ"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 #, fuzzy
 msgid "Print calendar"
 msgstr "гЛЕЯОКЭЦИО"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "Print this Calendar"
 msgstr "тО ГЛЕЯОКЭЦИЭ САР"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-#, fuzzy
-msgid "Save As"
-msgstr "гЛЕЯОКЭЦИО"
+#: ui/evolution-calendar.xml.h:22
+msgid "Publish Free/Busy Information"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Show 1 day"
 msgstr "еЛЖэМИСГ ЕПИСУМэ_ЬЕЫМ"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
-#: widgets/misc/e-dateedit.c:422
-#, fuzzy
-msgid "Today"
-msgstr "счЛЕЯА"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 #, fuzzy
-msgid "_Appointment"
+msgid "_Appointment..."
 msgstr "я_АМТЕБОЩ"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "е_МщЯЦЕИЕР"
+
+#: ui/evolution-calendar.xml.h:32
 #, fuzzy
 msgid "_Day"
 msgstr "пЯЭВЕИЯА"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 #, fuzzy
 msgid "_Month"
 msgstr "цМЫЯИЛъЕР"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
-msgid "_New"
-msgstr "_мщО"
+#: ui/evolution-calendar.xml.h:37
+msgid "_Week"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-comp-editor.xml.h:3
 #, fuzzy
-msgid "_Open Calendar"
-msgstr "гЛЕЯОКЭЦИО"
+msgid "Close this appointment"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:106
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-comp-editor.xml.h:5
 #, fuzzy
-msgid "_Save As..."
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+msgid "Delete this appointment"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-calendar.xml.h:45
-msgid "_Week"
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
 msgstr ""
 
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Print Pre_view"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "пЯОТЕЯАИЭТГТА"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+#, fuzzy
+msgid "Print this item"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+#, fuzzy
+msgid "Print..."
+msgstr "пЯОТЕЯАИЭТГТА"
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+#, fuzzy
+msgid "Save and Close"
+msgstr "гЛЕЯОКЭЦИО"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:17
+msgid "Save this item to disk"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "е_МщЯЦЕИЕР"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+#, fuzzy
+msgid "_File"
+msgstr "_жэЙЕККОР"
+
 #: ui/evolution-contact-editor.xml.h:2
 #, fuzzy
 msgid "Delete this item"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr ""
 
@@ -7499,31 +10347,13 @@ msgstr "сГЛЕъЫ_ЛА"
 msgid "Print En_velope..."
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-#, fuzzy
-msgid "Print this item"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:57 ui/evolution-task-editor-dialog.xml.h:41
-#, fuzzy
-msgid "Print..."
-msgstr "пЯОТЕЯАИЭТГТА"
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 #, fuzzy
 msgid "Save _As..."
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-#, fuzzy
-msgid "Save and Close"
-msgstr "гЛЕЯОКЭЦИО"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr ""
@@ -7541,1035 +10371,1041 @@ msgstr ""
 msgid "Send _message to contact..."
 msgstr "_цМЫЯИЛъА"
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
-#, fuzzy
-msgid "_File"
-msgstr "_жэЙЕККОР"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 #, fuzzy
 msgid "_Save"
 msgstr "гЛЕЯОКЭЦИО"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr ""
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
+#: ui/evolution-contact-list-editor.xml.h:6
+msgid "Save the list and close the dialog box"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:7
 #, fuzzy
-msgid "Actio_ns"
-msgstr "е_МщЯЦЕИЕР"
-
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-#, fuzzy
-msgid "Address _Book... (FIXME)"
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+msgid "Se_nd list to other..."
+msgstr "_цМЫЯИЛъА"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
-msgid "C_lear"
-msgstr "гЛЕЯОКЭЦИО"
+msgid "Send _message to list..."
+msgstr "_цМЫЯИЛъА"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-#, fuzzy
-msgid "C_ut"
-msgstr "йОПч"
+#: ui/evolution-event-editor.xml.h:1
+msgid "Cancel Mee_ting"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-#, fuzzy
-msgid "Chec_k Names (FIXME)"
-msgstr "_лчМУЛА"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+msgid "Cancel the meeting for this item"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Clear"
+msgid "Forward as i_Calendar"
 msgstr "гЛЕЯОКЭЦИО"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-#, fuzzy
-msgid "Clear the selection"
-msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
-
-#: ui/evolution-event-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
 #, fuzzy
-msgid "Close this appointment"
+msgid "Forward this item via email"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-#, fuzzy
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
-
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "аМТИЦЯАЖч"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-#, fuzzy
-msgid "Copy the selection"
-msgstr "аЙЩЯЫСГ ТЕКЕУТАъАР КЕИТОУЯЦъАР"
+#: ui/evolution-event-editor.xml.h:6
+msgid "Re_fresh Meeting"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "йОПч"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+msgid "Schedule a meeting for this item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:18
-#, fuzzy
-msgid "Delete this appointment"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "е_МщЯЦЕИЕР"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
+#: ui/evolution-executive-summary.xml.h:1
+msgid "Customise My Evolution"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
+#: ui/evolution-mail-global.xml.h:2
 #, fuzzy
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+msgid "Cancel the current mail operation"
+msgstr "йКЕъСИЛО ЭКЫМ ТЫМ АМОИВТЧМ АМТИЙЕИЛщМЫМ"
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
+#: ui/evolution-mail-global.xml.h:3
 #, fuzzy
-msgid "For_ward (FIXME)"
-msgstr "йАТАВЧЯГСГ гЛЕЯО_КОЦъОУ"
+msgid "Compose"
+msgstr "мщА сУМТЭЛЕУСГ"
+
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr ""
+
+#: ui/evolution-mail-global.xml.h:9
 #, fuzzy
-msgid "In_complete Task (FIXME)"
-msgstr "_цМЫЯИЛъА"
+msgid "Forget _Passwords"
+msgstr "гЛЕЯОКЭЦИО"
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "еПИЙЭККГСГ"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
+#: ui/evolution-mail-global.xml.h:13
 #, fuzzy
-msgid "Paste the clipboard"
-msgstr "еПИЙЭККГСГ АМТИЙЕИЛщМОУ АПО ТО ПЯЭВЕИЯО"
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: ui/evolution-mail-global.xml.h:14
+#, fuzzy
+msgid "Send / Receive"
+msgstr "еКчЖХГ"
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
+#: ui/evolution-mail-global.xml.h:16
+#, fuzzy
+msgid "Show message preview window"
+msgstr "╦АМ ХщКЕТЕ ч ОВИ ПЯОЕПИСЙЭПИСГ ЛГМУЛэТЫМ"
+
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
+#: ui/evolution-mail-global.xml.h:18
 #, fuzzy
-msgid "Print Pre_view"
-msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
+msgid "Virtual Folder _Editor..."
+msgstr "_жэЙЕККОР"
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
+#: ui/evolution-mail-global.xml.h:19
 #, fuzzy
-msgid "Print S_etup..."
-msgstr "пЯОТЕЯАИЭТГТА"
+msgid "_Filters..."
+msgstr "_жэЙЕККОР"
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
+#: ui/evolution-mail-global.xml.h:20
 #, fuzzy
-msgid "Print Setup"
-msgstr "пЯОТЕЯАИЭТГТА"
+msgid "_Mail Message"
+msgstr "_лчМУЛА"
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
+#: ui/evolution-mail-global.xml.h:21
 #, fuzzy
-msgid "Save"
-msgstr "гЛЕЯОКЭЦИО"
+msgid "_Mail Settings..."
+msgstr "е_МщЯЦЕИЕР"
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
+#: ui/evolution-mail-global.xml.h:22
+msgid "_Preview Pane"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
+#: ui/evolution-mail-global.xml.h:23
 #, fuzzy
-msgid "Save the current file"
-msgstr "йКЕъСИЛО ЭКЫМ ТЫМ АМОИВТЧМ АМТИЙЕИЛщМЫМ"
+msgid "_Send / Receive"
+msgstr "еКчЖХГ"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr ""
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:68
-#: ui/evolution-task-editor-dialog.xml.h:57
+#: ui/evolution-mail-list.xml.h:5
 #, fuzzy
-msgid "Select All"
-msgstr "_мщОР жэЙЕККОР"
+msgid "Cut selected messages"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
+#: ui/evolution-mail-list.xml.h:6
 #, fuzzy
-msgid "Select everything"
-msgstr "_мщОР жэЙЕККОР"
+msgid "Hide S_elected Messages"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr ""
+#: ui/evolution-mail-list.xml.h:7
+#, fuzzy
+msgid "Hide _Deleted Messages"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
+#: ui/evolution-mail-list.xml.h:8
 #, fuzzy
-msgid "Task _Request (FIXME)"
-msgstr "аъТГ_СГ еЙЙЯЕЛЭТГТАР"
+msgid "Hide _Read Messages"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
-msgid "_Close"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:28
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
-msgid "_Contact (FIXME)"
-msgstr "_цМЫЯИЛъА"
+msgid "Mark all visible messages as read"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
+#: ui/evolution-mail-list.xml.h:13
 #, fuzzy
-msgid "_Copy"
-msgstr "аМТИЦЯАЖч"
-
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr ""
+msgid "Paste message in the clipboard"
+msgstr "еПИЙЭККГСГ АМТИЙЕИЛщМОУ АПО ТО ПЯЭВЕИЯО"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
+#: ui/evolution-mail-list.xml.h:14
 #, fuzzy
-msgid "_Help"
-msgstr "сГЛЕъЫ_ЛА"
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
 #, fuzzy
-msgid "_Item (FIXME)"
-msgstr "_цМЫЯИЛъА"
+msgid "Select _All"
+msgstr "_мщОР жэЙЕККОР"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
+#: ui/evolution-mail-list.xml.h:16
 #, fuzzy
-msgid "_Journal Entry (FIXME)"
-msgstr "йАТАВЧЯГСГ гЛЕЯО_КОЦъОУ"
+msgid "Select _Thread"
+msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-#, fuzzy
-msgid "_Last Item in Folder (FIXME)"
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
+#: ui/evolution-mail-list.xml.h:19
 #, fuzzy
-msgid "_Mail Message (FIXME)"
-msgstr "_лчМУЛА"
+msgid "Select all visible messages"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
+#: ui/evolution-mail-list.xml.h:20
 #, fuzzy
-msgid "_Move to Folder... (FIXME)"
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+msgid "Show _All"
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:22
 #, fuzzy
-msgid "_Note (FIXME)"
-msgstr "_цМЫЯИЛъА"
+msgid "Temporarily hide all messages that have already been read"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
+#: ui/evolution-mail-list.xml.h:23
 #, fuzzy
-msgid "_Paste"
-msgstr "еПИЙЭККГСГ"
+msgid "Temporarily hide the selected messages"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-mail-list.xml.h:24
 #, fuzzy
-msgid "_Print"
-msgstr "пЯОТЕЯАИЭТГТА"
+msgid "Threaded Message list"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:102
-#: ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_жэЙЕККОР"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:28
 #, fuzzy
 msgid "_Properties..."
 msgstr "иДИЭТГТЕР"
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-#, fuzzy
-msgid "_Select All"
-msgstr "_мщОР жэЙЕККОР"
-
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:29
 #, fuzzy
-msgid "_Task (FIXME)"
-msgstr "аъТГ_СГ еЙЙЯЕЛЭТГТАР"
+msgid "_Threaded Message List"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
+#: ui/evolution-mail-message.xml.h:1
 #, fuzzy
-msgid "_Unread Item (FIXME)"
-msgstr "_цМЫЯИЛъА"
+msgid "Apply filter rules to the selected messages"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-executive-summary.xml.h:1
+#: ui/evolution-mail-message.xml.h:2
 #, fuzzy
-msgid "Add Service"
-msgstr "мщА сУМТЭЛЕУСГ"
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:3
+#: ui/evolution-mail-message.xml.h:4
 #, fuzzy
-msgid "Create a new email"
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+msgid "Compose a reply to the sender of the selected message"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-executive-summary.xml.h:4
+#: ui/evolution-mail-message.xml.h:6
 #, fuzzy
-msgid "Executive Summary Settings..."
-msgstr "пЕЯъКГЬГ"
+msgid "Copy selected messages to another folder"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: ui/evolution-executive-summary.xml.h:5
+#: ui/evolution-mail-message.xml.h:7
 #, fuzzy
-msgid "New Mail"
-msgstr "_лчМУЛА"
+msgid "Create _Virtual Folder From Message"
+msgstr "пЯЭВЕИЯА ЛГМЩЛАТА"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:3
-msgid "Change the properties of this folder"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:4
-#, fuzzy
-msgid "Compose"
-msgstr "мщА сУМТЭЛЕУСГ"
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:5
-#, fuzzy
-msgid "Compose a new message"
-msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail-message.xml.h:12
 #, fuzzy
-msgid "Configure Folder..."
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+msgid "Create a virtual folder for these recipients"
+msgstr "пЯЭВЕИЯА ЛГМЩЛАТА"
 
-#: ui/evolution-mail.xml.h:8
+#: ui/evolution-mail-message.xml.h:13
 #, fuzzy
-msgid "Copy message to a new folder"
-msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+msgid "Create a virtual folder for this mailing list"
+msgstr "пЯЭВЕИЯА ЛГМЩЛАТА"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail-message.xml.h:14
 #, fuzzy
-msgid "Copy selected messages to another folder"
-msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+msgid "Create a virtual folder for this sender"
+msgstr "пЯЭВЕИЯА ЛГМЩЛАТА"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail-message.xml.h:15
 #, fuzzy
-msgid "Create _Virtual Folder From Message"
+msgid "Create a virtual folder for this subject"
 msgstr "пЯЭВЕИЯА ЛГМЩЛАТА"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail-message.xml.h:17
 #, fuzzy
-msgid "Delete the selected messages"
+msgid "Display the next important message"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail-message.xml.h:18
 #, fuzzy
-msgid "Edit Message"
-msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
+msgid "Display the next message"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail-message.xml.h:19
 #, fuzzy
-msgid "Edit the current message"
+msgid "Display the next unread message"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:18
-msgid "Expunge"
+#: ui/evolution-mail-message.xml.h:21
+msgid "Display the previous important message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:19
-msgid "Filter on Se_nder"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:22
+#, fuzzy
+msgid "Display the previous message"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail-message.xml.h:23
 #, fuzzy
-msgid "Filter on _Recipients"
+msgid "Display the previous unread message"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
+msgstr "жэЙЕККОР ПОУ ПЕЯИщВЕИ ЛГМЩЛАТА"
+
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
+msgstr "хщЛА"
+
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail-message.xml.h:27
 #, fuzzy
-msgid "Filter on _Subject"
+msgid "Filter on _Subject..."
 msgstr "хщЛА"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Finaly remove all mails tagged for deletion"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:23
-#, fuzzy
-msgid "Forget _Passwords"
-msgstr "гЛЕЯОКЭЦИО"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail-message.xml.h:30
 #, fuzzy
 msgid "Forward As"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Forward the selected mail to someone"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:31
+#, fuzzy
+msgid "Forward _Attached"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-mail.xml.h:29
-msgid "Forward this message in-line with your mail, so you can edit it"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:32
+#, fuzzy
+msgid "Forward _Inline"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail-message.xml.h:33
 #, fuzzy
-msgid "Full _Headers"
-msgstr "лЕТОМОЛАСъА оЛэДАР"
+msgid "Forward _Quoted"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-mail.xml.h:31
+#: ui/evolution-mail-message.xml.h:34
 #, fuzzy
-msgid "Hide Deleted Messages"
+msgid "Forward the selected message in the body of a new message"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-mail.xml.h:32
+#: ui/evolution-mail-message.xml.h:35
 #, fuzzy
-msgid "Hide S_elected Messages"
+msgid "Forward the selected message quoted like a reply"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-mail.xml.h:33
+#: ui/evolution-mail-message.xml.h:36
 #, fuzzy
-msgid "Hide _Deleted Messages"
+msgid "Forward the selected message to someone"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: ui/evolution-mail-message.xml.h:37
+#, fuzzy
+msgid "Forward the selected message to someone as an attachment"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-mail.xml.h:34
+#: ui/evolution-mail-message.xml.h:39
 #, fuzzy
-msgid "Hide _Read messages"
+msgid "Load _Images"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Invert Selection"
+#: ui/evolution-mail-message.xml.h:41
+msgid "Mark as I_mportant"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:36
-msgid "Manage _Subscriptions..."
+#: ui/evolution-mail-message.xml.h:43
+msgid "Mark as Unimp_ortant"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:37
-msgid "Mar_k as Read"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:38
-msgid "Mark All as R_ead"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:39
-msgid "Mark As Read"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:44
+#, fuzzy
+msgid "Mark the selected messages as having been read"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Mark As U_nread"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-mail.xml.h:41
-msgid "Mark as U_nread"
+#: ui/evolution-mail-message.xml.h:46
+msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail-message.xml.h:47
 #, fuzzy
-msgid "Mark the selected messages as having been read"
+msgid "Mark the selected messages as unimportant"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-mail.xml.h:43
-msgid "Mark the selected messages as not having been read"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Move"
 msgstr "_лчМУЛА"
 
-#: ui/evolution-mail.xml.h:45
-#, fuzzy
-msgid "Move message to a new folder"
-msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
-
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Move selected messages to another folder"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: ui/evolution-mail.xml.h:47
-#, fuzzy
-msgid "Open in New Window"
-msgstr "╤МОИЦЛА СЕ мщО пАЯэХУЯО"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail-message.xml.h:52
 #, fuzzy
-msgid "Open the current message in a new window"
-msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
+msgid "Next Important Message"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail-message.xml.h:53
 #, fuzzy
-msgid "Print Preview of message..."
-msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
+msgid "Next Message"
+msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
-#: ui/evolution-mail.xml.h:54
-msgid "Print message to the printer"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
-msgid "Print message..."
+msgid "Next Unread Message"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: ui/evolution-mail.xml.h:58
-msgid "Redirect (FIXME: implement me)"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Open the selected message in a new window"
+msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-mail.xml.h:61
-msgid "Reply to _All"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Open the selected message in the composer to re-send it"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
+
+#: ui/evolution-mail-message.xml.h:58
+#, fuzzy
+msgid "Previews the message to be printed"
+msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-mail.xml.h:62
-msgid "Reply to all"
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:64
+#: ui/evolution-mail-message.xml.h:60
 #, fuzzy
-msgid "Reply to sender"
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+msgid "Previous Important Message"
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: ui/evolution-mail.xml.h:66
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
-msgid "S_ource"
-msgstr "мщА сУМТЭЛЕУСГ"
+msgid "Previous Message"
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
-msgid "Save the message into a new file"
-msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+msgid "Previous Unread Message"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-mail.xml.h:69 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
-msgid "Select _All"
-msgstr "_мщОР жэЙЕККОР"
+msgid "Print Message..."
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: ui/evolution-mail.xml.h:70
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
-msgid "Select _Thread"
-msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
+msgid "Print Preview..."
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
-msgid "Send / Receive"
-msgstr "еКчЖХГ"
+msgid "Print this message"
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: ui/evolution-mail.xml.h:72
-msgid "Send a reply to the person who sent you this mail"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:73
-msgid "Send a single mail in reply to all the selected mail"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:74
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
+#: ui/evolution-mail-message.xml.h:71
+#, fuzzy
+msgid "S_earch Message"
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
+
+#: ui/evolution-mail-message.xml.h:72
+#, fuzzy
+msgid "Save the message as a text file"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:76
-msgid "Send queued mail and retrieve new mail"
+#: ui/evolution-mail-message.xml.h:74
+#, fuzzy
+msgid "Show Email _Source"
+msgstr "йУЯъЫР сУМТОЛЕЩСЕИР"
+
+#: ui/evolution-mail-message.xml.h:75
+#, fuzzy
+msgid "Show Full _Headers"
+msgstr "лЕТОМОЛАСъА оЛэДАР"
+
+#: ui/evolution-mail-message.xml.h:76
+msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
-msgid "Show _All"
-msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
+msgid "Show message with all email headers"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: ui/evolution-mail.xml.h:79
+#: ui/evolution-mail-message.xml.h:78
 #, fuzzy
-msgid "Threaded Message list"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+msgid "Show the raw email source of the message"
+msgstr "еПИСЩМАЬГ АЯВЕъОУ СТО ЛчМУЛА"
 
-#: ui/evolution-mail.xml.h:80
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-mail.xml.h:82
-msgid "VFolder on Se_nder"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:83
+#: ui/evolution-mail-message.xml.h:80
 #, fuzzy
-msgid "VFolder on _Recipients"
-msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
+msgid "VFolder on Mailing _List..."
+msgstr "жэЙЕККОР ПОУ ПЕЯИщВЕИ ЛГМЩЛАТА"
 
-#: ui/evolution-mail.xml.h:84
+#: ui/evolution-mail-message.xml.h:81
 #, fuzzy
-msgid "VFolder on _Subject"
+msgid "VFolder on Se_nder..."
 msgstr "хщЛА"
 
-#: ui/evolution-mail.xml.h:85
-msgid "View Raw Message Source"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "VFolder on _Recipients..."
+msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
-#: ui/evolution-mail.xml.h:86
+#: ui/evolution-mail-message.xml.h:83
 #, fuzzy
-msgid "Virtual Folder _Editor..."
-msgstr "_жэЙЕККОР"
+msgid "VFolder on _Subject..."
+msgstr "хщЛА"
 
-#: ui/evolution-mail.xml.h:87
+#: ui/evolution-mail-message.xml.h:84
 #, fuzzy
 msgid "_Apply Filters"
 msgstr "_жэЙЕККОР"
 
-#: ui/evolution-mail.xml.h:88
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
-msgid "_Attachment"
-msgstr "мЕА ЕПИСЩМАЬГ"
-
-#: ui/evolution-mail.xml.h:89
-#, fuzzy
-msgid "_Copy to Folder..."
+msgid "_Copy to Folder"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: ui/evolution-mail.xml.h:90
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "_Create Filter From Message"
 msgstr "пЯЭВЕИЯА ЛГМЩЛАТА"
 
-#: ui/evolution-mail.xml.h:92
-msgid "_Expunge"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:93
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
-msgid "_Filters..."
-msgstr "_жэЙЕККОР"
-
-#: ui/evolution-mail.xml.h:94 ui/evolution.xml.h:31
-msgid "_Folder"
-msgstr "_жэЙЕККОР"
-
-#: ui/evolution-mail.xml.h:95
-msgid "_Forward"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:96
-msgid "_Inline"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:97 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:98
-#, fuzzy
-msgid "_Mail Message"
-msgstr "_лчМУЛА"
+msgid "_Forward Message"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-mail.xml.h:99
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
-msgid "_Mail Settings..."
-msgstr "е_МщЯЦЕИЕР"
+msgid "_Message Display"
+msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
-#: ui/evolution-mail.xml.h:100
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
-msgid "_Move to Folder..."
+msgid "_Move to Folder"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: ui/evolution-mail.xml.h:101
-#, fuzzy
-msgid "_Open Selected Items"
-msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
-
-#: ui/evolution-mail.xml.h:103
-msgid "_Quoted"
+#: ui/evolution-mail-message.xml.h:91
+msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:104
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
-msgid "_Reply"
-msgstr "еКчЖХГ"
+msgid "_Open Message"
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: ui/evolution-mail.xml.h:105
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
-msgid "_Resend Messages"
+msgid "_Re-send Message"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: ui/evolution-mail.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 #, fuzzy
-msgid "_Save Message As..."
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+msgid "Close this window"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-mail.xml.h:108
-#, fuzzy
-msgid "_Send / Receive"
-msgstr "еКчЖХГ"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr ""
 
-#: ui/evolution-mail.xml.h:109
-msgid "_Threaded"
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:111
-msgid "_Undelete"
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr ""
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
 msgstr ""
 
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+#, fuzzy
+msgid "_View"
+msgstr "_мщО"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "еПИСЩМАЬГ"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 #, fuzzy
 msgid "Close the current file"
 msgstr "йКЕъСИЛО ЭКЫМ ТЫМ АМОИВТЧМ АМТИЙЕИЛщМЫМ"
 
 #: ui/evolution-message-composer.xml.h:5
 #, fuzzy
+msgid "Delete all but signature"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: ui/evolution-message-composer.xml.h:6
+#, fuzzy
 msgid "Encrypt this message with PGP"
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 #, fuzzy
 msgid "F_ormat"
 msgstr "аПЭ"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+msgid "Inline Text _File..."
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:11
 #, fuzzy
 msgid "Insert a file as text into the message"
 msgstr "еПИСЩМАЬГ АЯВЕъОУ СТО ЛчМУЛА"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 #, fuzzy
 msgid "Open a file"
 msgstr "╤МОИЦЛА жАЙщККОУ"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
+msgid "S/MIME Encrypt"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:18
-#, fuzzy
-msgid "Save in _folder... (FIXME)"
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+#, fuzzy
+msgid "Save"
+msgstr "гЛЕЯОКЭЦИО"
+
+#: ui/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "Save As"
+msgstr "гЛЕЯОКЭЦИО"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
 msgid "Save in folder..."
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+#, fuzzy
+msgid "Save the current file"
+msgstr "йКЕъСИЛО ЭКЫМ ТЫМ АМОИВТЧМ АМТИЙЕИЛщМЫМ"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "аПОСТОКч"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
 msgid "Send _Later"
 msgstr "аПОСТОКч"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
 msgid "Send _later"
 msgstr "аПОСТОКч"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
 msgid "Send the message later"
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-message-composer.xml.h:28
-#, fuzzy
-msgid "Send the message now"
-msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
 msgid "Send this message now"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
 msgid "Show / hide attachments"
 msgstr "еЛЖэМИСГ/АПЭЙЯУЬГ ЕПИСУМэЬЕЫМ"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
 msgid "Show _attachments"
 msgstr "еЛЖэМИСГ ЕПИСУМэ_ЬЕЫМ"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 #, fuzzy
 msgid "Show attachments"
 msgstr "еЛЖэМИСГ ЕПИСУМэ_ЬЕЫМ"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
 msgid "Sign this message with your PGP key"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 #, fuzzy
 msgid "Toggles whether the From chooser is displayed"
 msgstr "тО URI ПОУ ХА ЕЛЖАМъСЕИ О еНЕЯЕУМГТчР жАЙщККЫМ"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "мЕА ЕПИСЩМАЬГ"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:45
-msgid "_From Field"
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:47
-msgid "_Insert"
+#, fuzzy
+msgid "_Delete all"
+msgstr "_мщОР жэЙЕККОР"
+
+#: ui/evolution-message-composer.xml.h:50
+msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:48
-#, fuzzy
-msgid "_Insert text file... (FIXME)"
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
+msgid "_Insert"
+msgstr ""
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 #, fuzzy
 msgid "_Open..."
 msgstr "╤МОИ_ЦЛА"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr ""
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#, fuzzy
+msgid "_Help"
+msgstr "сГЛЕъЫ_ЛА"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 #, fuzzy
 msgid "F_older"
 msgstr "_жэЙЕККОР"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 #, fuzzy
 msgid "Subscribe"
 msgstr "мщА сУМТЭЛЕУСГ"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-#, fuzzy
-msgid "Assig_n Task (FIXME)"
-msgstr "_цМЫЯИЛъА"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-#, fuzzy
-msgid "Meeting Re_quest (FIXME)"
-msgstr "аъТГ_СГ еЙЙЯЕЛЭТГТАР"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-#, fuzzy
-msgid "Redo"
-msgstr "дИАЦЯАЖч"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-#, fuzzy
-msgid "Redo the undone action"
-msgstr "аЙЩЯЫСГ ТЕКЕУТАъАР КЕИТОУЯЦъАР"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-#, fuzzy
-msgid "Replace"
-msgstr "еКчЖХГ"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
+#: ui/evolution-task-editor.xml.h:1
 #, fuzzy
-msgid "Replace a string"
-msgstr "еКчЖХГ"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr ""
+msgid "Cancel Task"
+msgstr "еЙЙЯЕЛЭ_ТГТА"
 
-#: ui/evolution-task-editor-dialog.xml.h:48
+#: ui/evolution-task-editor.xml.h:3
 #, fuzzy
-msgid "S_end Status Report (FIXME)"
-msgstr "_цМЫЯИЛъА"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr ""
+msgid "Delegate Task"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
+#: ui/evolution-task-editor.xml.h:7
+msgid "Re_fresh Task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "аЙЩЯЫСГ"
-
-#: ui/evolution-task-editor-dialog.xml.h:62
-#, fuzzy
-msgid "Undo the last action"
-msgstr "аЙЩЯЫСГ ТЕКЕУТАъАР КЕИТОУЯЦъАР"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
+#: ui/evolution-tasks.xml.h:3
 #, fuzzy
-msgid "_Appointment (FIXME)"
-msgstr "я_АМТЕБОЩ"
+msgid "Copy selected task"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
+#: ui/evolution-tasks.xml.h:4
 #, fuzzy
-msgid "_Mark Complete (FIXME)"
-msgstr "_лчМУЛА"
+msgid "Create a new task"
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: ui/evolution-task-editor-dialog.xml.h:84
+#: ui/evolution-tasks.xml.h:5
 #, fuzzy
-msgid "_Reply (FIXME)"
-msgstr "аъТГ_СГ еЙЙЯЕЛЭТГТАР"
+msgid "Cut selected task"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
-msgid "Create a new task"
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+msgid "Delete selected tasks"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:8
 #, fuzzy
 msgid "New Task"
 msgstr "еЙЙЯЕЛЭ_ТГТА"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "еПИЙЭККГСГ АМТИЙЕИЛщМОУ АПО ТО ПЯЭВЕИЯО"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr ""
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "е_МщЯЦЕИЕР"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 #, fuzzy
 msgid "_Task"
 msgstr "еЙЙЯЕЛЭ_ТГТА"
@@ -8578,274 +11414,485 @@ msgstr "еЙЙЯЕЛЭ_ТГТА"
 msgid "About Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:2
 #, fuzzy
-msgid "Close this window"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
-msgstr ""
+msgid "Add to _Shortcut Bar"
+msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
+#: ui/evolution.xml.h:3
+msgid "Change the name of this folder"
 msgstr ""
 
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr ""
+#, fuzzy
+msgid "Copy this folder"
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
 #: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#: ui/evolution.xml.h:8
+msgid "Create a link to this folder in the shortcut bar"
+msgstr ""
+
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr ""
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr ""
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
+
+#: ui/evolution.xml.h:17
 #, fuzzy
-msgid "Evolution bar _shortcut"
+msgid "Evolution _Window"
 msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr ""
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:19
 #, fuzzy
 msgid "Getting _Started"
 msgstr "аъ_ТГСГ сУМэМТГСГР"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:13
-msgid "Main toolbar"
-msgstr ""
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Open in New _Window"
+msgstr "╤МОИЦЛА СЕ мщО пАЯэХУЯО"
+
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Open this folder in an other window"
+msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr ""
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:30
+#, fuzzy
+msgid "Toggle"
+msgstr "_лчМУЛА"
+
+#: ui/evolution.xml.h:31
 #, fuzzy
 msgid "Toggle whether to show the folder bar"
 msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Toggle whether to show the shortcut bar"
 msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "Toggle whether we are working offline."
+msgstr "тО URI ПОУ ХА ЕЛЖАМъСЕИ О еНЕЯЕУМГТчР жАЙщККЫМ"
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr ""
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:35
 #, fuzzy
 msgid "Using the _Calendar"
 msgstr "гЛЕЯОКЭЦИО"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr ""
 
-#: ui/evolution.xml.h:23
-msgid "Work Offline"
-msgstr ""
+#: ui/evolution.xml.h:37
+#, fuzzy
+msgid "View the selected folder"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:25
-msgid "_Actions"
-msgstr "е_МщЯЦЕИЕР"
+#: ui/evolution.xml.h:41
+#, fuzzy
+msgid "_Appointment (FIXME)"
+msgstr "я_АМТЕБОЩ"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:43
+#, fuzzy
+msgid "_Contact (FIXME)"
+msgstr "_цМЫЯИЛъА"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "аМТИЦЯАЖч"
+
+#: ui/evolution.xml.h:49
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_жэЙЕККОР"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Go to Folder..."
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Import file..."
 msgstr "иДИЭТГТЕР"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr ""
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:54
 #, fuzzy
 msgid "_Mail message"
 msgstr "_лчМУЛА"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "_лчМУЛА"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_мщО"
+
+#: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_New Folder"
 msgstr "_мщОР жэЙЕККОР"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "╤МОИ_ЦЛА"
+
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
+
+#: ui/evolution.xml.h:60
 #, fuzzy
 msgid "_Shortcut Bar"
 msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
 
+#: ui/evolution.xml.h:61
+#, fuzzy
+msgid "_Task (FIXME)"
+msgstr "аъТГ_СГ еЙЙЯЕЛЭТГТАР"
+
+#: ui/evolution.xml.h:64
+msgid "_Work Offline"
+msgstr ""
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "е_МщЯЦЕИЕР"
+
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "Address Cards"
+msgstr "мщА сУМТЭЛЕУСГ"
+
+#: views/addressbook/galview.xml.h:2
+#, fuzzy
+msgid "By Company"
+msgstr "аМТИЦЯАЖч"
+
+#: views/addressbook/galview.xml.h:3
+msgid "Phone List"
+msgstr ""
+
+#: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "By Sender"
+msgstr "аПОСТОКч"
+
+#: views/mail/galview.xml.h:2
+#, fuzzy
+msgid "By Status"
+msgstr "йАТэСТАСГ СЩМДЕСГР"
+
+#: views/mail/galview.xml.h:3
+#, fuzzy
+msgid "By Subject"
+msgstr "хщЛА"
+
+#: views/mail/galview.xml.h:4
+#, fuzzy
+msgid "Messages"
+msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
+
+#: views/tasks/galview.xml.h:2
+msgid "With Category"
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 msgid "%A, %B %d, %Y"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
-msgid "Tentative"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 #, fuzzy
 msgid "_Options"
 msgstr "е_МщЯЦЕИЕР"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 #, fuzzy
 msgid "Meeting _start time:"
 msgstr "аъ_ТГСГ сУМэМТГСГР"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 #, fuzzy
 msgid "Meeting _end time:"
 msgstr "аъ_ТГСГ сУМэМТГСГР"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:177
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:196
+#: widgets/menus/gal-view-menus.c:259
 msgid "Define Views"
 msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr ""
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr ""
-
-#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 #, fuzzy
 msgid "Now"
 msgstr "_мщО"
 
-#: widgets/misc/e-cell-date-edit.c:242
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#, fuzzy
+msgid "Today"
+msgstr "счЛЕЯА"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:723
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+msgid "Greek"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "еЙЙЯЕЛЭ_ТГТА"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "е_МщЯЦЕИЕР"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "_мщО"
+
+#: widgets/misc/e-charset-picker.c:160
+#, c-format
+msgid "Unknown character set: %s"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "╤МОИ_ЦЛА"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
+#: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "_цМЫЯИЛъА"
+
+#: widgets/misc/e-filter-bar.c:173
 #, fuzzy
 msgid "Save Search"
 msgstr "тО ГЛЕЯОКЭЦИЭ САР"
 
-#: widgets/misc/e-filter-bar.c:237
+#: widgets/misc/e-filter-bar.c:241
 #, fuzzy
 msgid "Advanced Search"
 msgstr "аМАФчТГСГ ЦИА пЯОВЫЯГЛщМОУР"
 
-#: widgets/misc/e-filter-bar.c:317
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr ""
+
+#: widgets/misc/e-filter-bar.h:104
 #, fuzzy
-msgid "Advanced ..."
+msgid "Advanced..."
 msgstr "аМАФчТГСГ ЦИА пЯОВЫЯГЛщМОУР"
 
 #: widgets/misc/e-messagebox.c:152
@@ -8856,6 +11903,10 @@ msgstr ""
 msgid "Warning"
 msgstr ""
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr ""
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr ""
@@ -8871,47 +11922,10 @@ msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 msgid "Don't show this message again."
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: widgets/misc/e-search-bar.c:148
+#: widgets/misc/e-search-bar.c:155
 msgid "Sear_ch"
 msgstr ""
 
-#: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
-msgstr ""
-
-#: views/addressbook/galview.xml.h:2
-#, fuzzy
-msgid "By Company"
-msgstr "аМТИЦЯАЖч"
-
-#: views/addressbook/galview.xml.h:3
-msgid "Phone List"
-msgstr ""
-
-#: views/mail/galview.xml.h:1
-#, fuzzy
-msgid "By Sender"
-msgstr "аПОСТОКч"
-
-#: views/mail/galview.xml.h:2
-#, fuzzy
-msgid "By Status"
-msgstr "йАТэСТАСГ СЩМДЕСГР"
-
-#: views/mail/galview.xml.h:3
-#, fuzzy
-msgid "By Subject"
-msgstr "хщЛА"
-
-#: views/mail/galview.xml.h:4
-#, fuzzy
-msgid "Messages"
-msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
-
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
-msgstr ""
-
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 #, fuzzy
 msgid "The Personal Addressbook Server"
@@ -8937,16 +11951,349 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 
 #, fuzzy
-#~ msgid "New"
-#~ msgstr "_мщО"
+#~ msgid "TasksPreferences"
+#~ msgstr "гЛЕЯОКЭЦИО"
 
 #, fuzzy
-#~ msgid "Cannot initialize Evolution's notes component."
+#~ msgid "C_ontacts..."
+#~ msgstr "_цМЫЯИЛъА"
+
+#, fuzzy
+#~ msgid "_Company:"
+#~ msgstr "аМТИЦЯАЖч"
+
+#, fuzzy
+#~ msgid "Find..."
+#~ msgstr "пЯОТЕЯАИЭТГТА"
+
+#, fuzzy
+#~ msgid "Open calendar"
+#~ msgstr "тО ГЛЕЯОКЭЦИЭ САР"
+
+#, fuzzy
+#~ msgid "Save calendar"
+#~ msgstr "тО ГЛЕЯОКЭЦИЭ САР"
+
+#, fuzzy
+#~ msgid "TaskPad"
+#~ msgstr "еЙЙЯЕЛЭ_ТГТА"
+
+#, fuzzy
+#~ msgid "Visual Alarms"
+#~ msgstr "_жэЙЕККОР"
+
+#, fuzzy
+#~ msgid "Edit the task"
+#~ msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#, fuzzy
+#~ msgid "Go to Today"
+#~ msgstr "счЛЕЯА"
+
+#, fuzzy
+#~ msgid "I don't recognize this type of calendar component."
 #~ msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 
 #, fuzzy
-#~ msgid "Notes Component: Could not initialize bonobo"
-#~ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
+#~ msgid "Add to Calendar"
+#~ msgstr "тО ГЛЕЯОКЭЦИЭ САР"
+
+#, fuzzy
+#~ msgid "Update Calendar"
+#~ msgstr "гЛЕЯОКЭЦИО"
+
+#, fuzzy
+#~ msgid "Appointment Basics"
+#~ msgstr "я_АМТЕБОЩ"
+
+#, fuzzy
+#~ msgid "_Starting date:"
+#~ msgstr "аъ_ТГСГ сУМэМТГСГР"
+
+#, fuzzy
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#, fuzzy
+#~ msgid "%s is not a selectable folder"
+#~ msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
+
+#, fuzzy
+#~ msgid "Inline attachment"
+#~ msgstr "мЕА ЕПИСЩМАЬГ"
+
+#, fuzzy
+#~ msgid "Send as:"
+#~ msgstr "е_МщЯЦЕИЕР"
+
+#, fuzzy
+#~ msgid "Send an email to %s"
+#~ msgstr "аПОСТОКч"
+
+#, fuzzy
+#~ msgid "Move %s to the left"
+#~ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "аПОСТОКч"
+
+#, fuzzy
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+
+#, fuzzy
+#~ msgid "Factory for the test component."
+#~ msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+
+#, fuzzy
+#~ msgid "Forward to Address"
+#~ msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#, fuzzy
+#~ msgid "Is Not"
+#~ msgstr "сГЛЕъЫ_ЛА"
+
+#, fuzzy
+#~ msgid "Move to Folder..."
+#~ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#, fuzzy
+#~ msgid "Copy to Folder..."
+#~ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#, fuzzy
+#~ msgid "Copying messages"
+#~ msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
+
+#, fuzzy
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#, fuzzy
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#, fuzzy
+#~ msgid "Print the selected message"
+#~ msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
+
+#, fuzzy
+#~ msgid "Delete this message"
+#~ msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#, fuzzy
+#~ msgid "Find a contact"
+#~ msgstr "о ЙАТэКОЦОР ЦМЫЯИЛИЧМ САР"
+
+#, fuzzy
+#~ msgid "View All"
+#~ msgstr "_мщО"
+
+#, fuzzy
+#~ msgid "View all contacts"
+#~ msgstr "еПИКщНТЕ ЕПИСЩМАЬГ"
+
+#, fuzzy
+#~ msgid "5 Days"
+#~ msgstr "пЯЭВЕИЯА"
+
+#, fuzzy
+#~ msgid "Create a new calendar"
+#~ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#, fuzzy
+#~ msgid "Day"
+#~ msgstr "пЯЭВЕИЯА"
+
+#, fuzzy
+#~ msgid "Open Calendar"
+#~ msgstr "гЛЕЯОКЭЦИО"
+
+#, fuzzy
+#~ msgid "_Open Calendar"
+#~ msgstr "гЛЕЯОКЭЦИО"
+
+#, fuzzy
+#~ msgid "Actio_ns"
+#~ msgstr "е_МщЯЦЕИЕР"
+
+#, fuzzy
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#, fuzzy
+#~ msgid "C_lear"
+#~ msgstr "гЛЕЯОКЭЦИО"
+
+#, fuzzy
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "_лчМУЛА"
+
+#, fuzzy
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#, fuzzy
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#, fuzzy
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "йАТАВЧЯГСГ гЛЕЯО_КОЦъОУ"
+
+#, fuzzy
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "_цМЫЯИЛъА"
+
+#, fuzzy
+#~ msgid "Print S_etup..."
+#~ msgstr "пЯОТЕЯАИЭТГТА"
+
+#, fuzzy
+#~ msgid "Select everything"
+#~ msgstr "_мщОР жэЙЕККОР"
+
+#, fuzzy
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "аъТГ_СГ еЙЙЯЕЛЭТГТАР"
+
+#, fuzzy
+#~ msgid "_Item (FIXME)"
+#~ msgstr "_цМЫЯИЛъА"
+
+#, fuzzy
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "йАТАВЧЯГСГ гЛЕЯО_КОЦъОУ"
+
+#, fuzzy
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#, fuzzy
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "_лчМУЛА"
+
+#, fuzzy
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#, fuzzy
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_цМЫЯИЛъА"
+
+#, fuzzy
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "_цМЫЯИЛъА"
+
+#, fuzzy
+#~ msgid "Add Service"
+#~ msgstr "мщА сУМТЭЛЕУСГ"
+
+#, fuzzy
+#~ msgid "Create a new email"
+#~ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#, fuzzy
+#~ msgid "Executive Summary Settings..."
+#~ msgstr "пЕЯъКГЬГ"
+
+#, fuzzy
+#~ msgid "New Mail"
+#~ msgstr "_лчМУЛА"
+
+#, fuzzy
+#~ msgid "Configure Folder..."
+#~ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#, fuzzy
+#~ msgid "Copy message to a new folder"
+#~ msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#, fuzzy
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
+
+#, fuzzy
+#~ msgid "Move message to a new folder"
+#~ msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#, fuzzy
+#~ msgid "Print Preview of message..."
+#~ msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
+
+#, fuzzy
+#~ msgid "S_ource"
+#~ msgstr "мщА сУМТЭЛЕУСГ"
+
+#, fuzzy
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#, fuzzy
+#~ msgid "Send the message now"
+#~ msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
+
+#, fuzzy
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#, fuzzy
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "_цМЫЯИЛъА"
+
+#, fuzzy
+#~ msgid "Meeting Re_quest (FIXME)"
+#~ msgstr "аъТГ_СГ еЙЙЯЕЛЭТГТАР"
+
+#, fuzzy
+#~ msgid "Redo"
+#~ msgstr "дИАЦЯАЖч"
+
+#, fuzzy
+#~ msgid "Redo the undone action"
+#~ msgstr "аЙЩЯЫСГ ТЕКЕУТАъАР КЕИТОУЯЦъАР"
+
+#, fuzzy
+#~ msgid "Replace"
+#~ msgstr "еКчЖХГ"
+
+#, fuzzy
+#~ msgid "Replace a string"
+#~ msgstr "еКчЖХГ"
+
+#, fuzzy
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "_цМЫЯИЛъА"
+
+#~ msgid "Undo"
+#~ msgstr "аЙЩЯЫСГ"
+
+#, fuzzy
+#~ msgid "Undo the last action"
+#~ msgstr "аЙЩЯЫСГ ТЕКЕУТАъАР КЕИТОУЯЦъАР"
+
+#, fuzzy
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "аъТГ_СГ еЙЙЯЕЛЭТГТАР"
+
+#, fuzzy
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
+
+#, fuzzy
+#~ msgid "Advanced ..."
+#~ msgstr "аМАФчТГСГ ЦИА пЯОВЫЯГЛщМОУР"
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's notes component."
+#~ msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 
 #, fuzzy
 #~ msgid ""
@@ -8965,10 +12312,6 @@ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 #~ msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
 
 #, fuzzy
-#~ msgid "Open..."
-#~ msgstr "╤МОИ_ЦЛА"
-
-#, fuzzy
 #~ msgid "Enter the identity you wish to send this message from"
 #~ msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
@@ -8976,10 +12319,6 @@ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 #~ msgstr "еИСэЦЕТЕ ТО ХщЛА ТОУ ЛГМЩЛАТОР"
 
 #, fuzzy
-#~ msgid "Saving changes to message..."
-#~ msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
-
-#, fuzzy
 #~ msgid "Save changes to message..."
 #~ msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
@@ -8988,18 +12327,10 @@ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 #~ msgstr "_жэЙЕККОР"
 
 #, fuzzy
-#~ msgid "Remove action"
-#~ msgstr "дИАЦЯАЖч оЛэДАР"
-
-#, fuzzy
 #~ msgid "Remove criterion"
 #~ msgstr "дИАЦЯАЖч оЛэДАР"
 
 #, fuzzy
-#~ msgid "Add Rule"
-#~ msgstr "мщА сУМТЭЛЕУСГ"
-
-#, fuzzy
 #~ msgid "Edit VFolder Rule"
 #~ msgstr "_жэЙЕККОР"
 
@@ -9088,30 +12419,10 @@ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 #~ msgstr "_цМЫЯИЛъА"
 
 #, fuzzy
-#~ msgid "_Mail"
-#~ msgstr "_лчМУЛА"
-
-#, fuzzy
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "хщЛА"
-
-#, fuzzy
-#~ msgid "Optional"
-#~ msgstr "е_МщЯЦЕИЕР"
-
-#, fuzzy
-#~ msgid "Add News Server"
-#~ msgstr "мщА оЛэДА"
-
-#, fuzzy
 #~ msgid "Mail Sources"
 #~ msgstr "йУЯъЫР сУМТОЛЕЩСЕИР"
 
 #, fuzzy
-#~ msgid "News Sources"
-#~ msgstr "мщА сУМТЭЛЕУСГ"
-
-#, fuzzy
 #~ msgid "_Print Contacts..."
 #~ msgstr "о ЙАТэКОЦОР ЦМЫЯИЛИЧМ САР"
 
@@ -9172,10 +12483,6 @@ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 #~ msgstr "еСТэКГ"
 
 #, fuzzy
-#~ msgid "Mail Source"
-#~ msgstr "йУЯъЫР сУМТОЛЕЩСЕИР"
-
-#, fuzzy
 #~ msgid "Forward message \"%s\""
 #~ msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
@@ -9207,10 +12514,6 @@ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 #~ msgid "Second"
 #~ msgstr "аПОСТОКч"
 
-#, fuzzy
-#~ msgid "Alarm Properties"
-#~ msgstr "еПИСЩМАЬГ"
-
 #~ msgid "Cut selected item into clipboard"
 #~ msgstr "йОПч ЕПИКЕЦЛщМОУ АМТИЙЕИЛщМОУ СТО ПЯЭВЕИЯО"
 
@@ -9232,10 +12535,6 @@ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 #~ msgid "Bcc: >>"
 #~ msgstr "йЯУЖЭ АМТъЦЯАЖО:"
 
-#, fuzzy
-#~ msgid "Discard this message?"
-#~ msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
-
 #~ msgid "Cut selected region into the clipboard"
 #~ msgstr "йОПч ЕПИКЕЦЛщМГР ПЕЯИОВчР СТО ПЯЭВЕИЯО"
 
@@ -9245,9 +12544,6 @@ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 #~ msgid "Paste selected region into the clipboard"
 #~ msgstr "еПИЙЭККГСГ ЕПИКЕЦЛщМГР ПЕЯИОВчР АПЭ ТО ПЯЭВЕИЯО"
 
-#~ msgid "Evolution can not create its local folders"
-#~ msgstr "тО Evolution ДЕ ЛПОЯЕъ МА ДГЛИОУЯЦчСЕИ ТОУР ТОПИЙОЩР ЖАЙщККОУР"
-
 #~ msgid "Composes a new mail message"
 #~ msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
 
@@ -9263,9 +12559,6 @@ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 #~ msgstr ""
 #~ "лАР СУЦВЬЯЕъТЕ, Г АЯВИЙОПОъГСГ ТОУ ЕНЕЯЕУМГТч ЖАЙщККЫМ ТОУ Evolution АПщТУВЕ."
 
-#~ msgid "Whether a message preview should be shown"
-#~ msgstr "╦АМ ХщКЕТЕ ч ОВИ ПЯОЕПИСЙЭПИСГ ЛГМУЛэТЫМ"
-
 #~ msgid "Clos_e All Items"
 #~ msgstr "йК_ЕъСИЛО ╪КЫМ"
 
@@ -9313,12 +12606,6 @@ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 #~ msgid "A service containing tasks"
 #~ msgstr "уПГЯЕСъА ПОУ ПЕЯИщВЕИ ЕЙЙЯЕЛЭТГТЕР"
 
-#~ msgid "Rename Shortcut"
-#~ msgstr "лЕТОМОЛАСъА сУМТЭЛЕУСГР"
-
-#~ msgid "Tasks list"
-#~ msgstr "йАТэКОЦОР ЕЙЙЯЕЛОТчТЫМ"
-
 #~ msgid "Enables some debugging functions"
 #~ msgstr "еМЕЯЦОПОъГСГ ЛЕЯИЙЧМ КЕИТОУЯЦИЧМ АПОСЖАКЛэТЫСГР"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index bb5c3d412b..a31ce1a565 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2001-04-14 08:51-0400\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Robert Brady <rwb197@zepler.org>\n"
 "Language-Team: \n"
@@ -13,197 +13,205 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -219,24 +227,25 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
+#: addressbook/backend/ebook/e-card.c:4037
+msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
+#: addressbook/backend/ebook/e-card.c:4045
+#, c-format
+msgid "VCard for %s"
 msgstr ""
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
@@ -244,10 +253,10 @@ msgstr ""
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:43
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
@@ -260,14 +269,14 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr ""
 
@@ -276,716 +285,828 @@ msgstr ""
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
-msgid "Anni_versary:"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
-msgid "B_usiness"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
-msgid "Business _Fax"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
-msgid "Ca_tegories..."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
-msgid "Contact Editor"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Details"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
-msgid "File As:"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution addressbook component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
-msgid "General"
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
-msgid "New phone type"
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
-msgid "No_tes:"
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
-msgid "Phone Types"
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:15
-msgid "Wants to receive _HTML mail"
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
-msgid "Web page address:"
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:18
-msgid "_Address..."
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
-msgid "_Assistant's name:"
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
-msgid "_Birthday:"
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
-msgid "_Business"
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:91 ui/evolution-task-editor-dialog.xml.h:69
-msgid "_Delete"
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
-msgid "_Department:"
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
-msgid "_Full Name..."
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
-msgid "_Home"
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
-msgid "_Job title:"
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
-msgid "_Manager's Name:"
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
-msgid "_Mobile"
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
-msgid "_Nickname:"
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
-msgid "_Office:"
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
-msgid "_Profession:"
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
-msgid "_Spouse:"
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
-msgid "_This is the mailing address"
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:603
-msgid "This contact belongs to these categories:"
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
-msgid "Assistant"
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
-msgid "Business"
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
-msgid "Business 2"
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
-msgid "Business Fax"
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
-msgid "Callback"
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
-msgid "Car"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "Addressbook Sources"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
-msgid "Company"
+#: addressbook/gui/component/addressbook-config.glade.h:2
+msgid "De_lete"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
-msgid "Home"
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
-msgid "Home 2"
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
-msgid "Home Fax"
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
-msgid "ISDN"
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
-msgid "Mobile"
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
-msgid "Other"
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
-msgid "Other Fax"
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
-msgid "Pager"
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
-msgid "Primary"
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
-msgid "Radio"
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
-msgid "Telex"
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
-msgid "TTY/TDD"
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:557
+msgid "Category contains"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
 msgid "Email 2"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
 msgid "Email 3"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:223
-msgid "Contact Quick-Add"
+#: addressbook/gui/component/e-address-popup.c:579
+msgid "Select an Action"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:225
-msgid "Edit Full"
+#: addressbook/gui/component/e-address-popup.c:585
+#, c-format
+msgid "Create a new contact \"%s\""
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:262
-#: addressbook/gui/widgets/e-addressbook-view.c:643
-msgid "Full Name"
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:268
-msgid "E-mail"
+#: addressbook/gui/component/e-address-popup.c:859
+msgid "Querying Addressbook..."
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
-msgid "Canada"
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
-msgid "Check Address"
+#: addressbook/gui/component/e-address-popup.c:989
+msgid "Merge E-Mail Address"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
-msgid "Countr_y:"
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
-msgid "Finland"
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "USA"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "_Address:"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "_City:"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "_PO Box:"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "_State/Province:"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+msgid "Send HTML Mail?"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "_ZIP Code:"
-msgstr "_Post Code:"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+msgid "Unnamed Contact"
+msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:1
-msgid "Check Full Name"
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:2
-msgid "Dr."
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:3
-msgid "Esq."
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:4
-msgid "I"
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+msgid "Select name from _folder:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:5
-msgid "II"
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "_Category:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:6
-msgid "III"
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:7
-msgid "Jr."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+msgid "Anni_versary:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:8
-msgid "Miss"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+msgid "B_usiness"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:9
-msgid "Mr."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+msgid "Business _Fax"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:10
-msgid "Mrs."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
+msgid "Ca_tegories..."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:11
-msgid "Ms."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+msgid "Contact Editor"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:12
-msgid "Sr."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
+msgid "Details"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:13
-msgid "_First:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+msgid "File As:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:14
-msgid "_Last:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+msgid "General"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:15
-msgid "_Middle:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+msgid "New phone type"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:16
-msgid "_Suffix:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+msgid "No_tes:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:17
-msgid "_Title:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Organisation:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+msgid "Phone Types"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:241
-msgid "As _Minicards"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:247
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+msgid "Web page address:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:399
-#, c-format
-msgid "Enter password for %s"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+msgid "_Address..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:427
-msgid "Unable to open addressbook"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+msgid "_Assistant's name:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:432
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+msgid "_Birthday:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:555
-msgid "Show All"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+msgid "_Business"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:557
-msgid "Advanced..."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:587
-msgid "Any field contains"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
+msgid "_Delete"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:588
-msgid "Name contains"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+msgid "_Department:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:589
-msgid "Email contains"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+msgid "_Full Name..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:732
-msgid "The URI that the Folder Browser will display"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+msgid "_Home"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+msgid "_Job title:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+msgid "_Mobile"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+msgid "_Nickname:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+msgid "_Office:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
-msgid "Password"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+msgid "_Profession:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+msgid "_Spouse:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:170
-msgid "Unknown auth type"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+msgid "_This is the mailing address"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "Base"
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "One"
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
+msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:183
-msgid "Subtree"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
+msgid "Assistant"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Unknown scope type"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
+msgid "Business"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:353
-msgid "Bind DN:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
+msgid "Business 2"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:354
-msgid "FIXME Bind DN Help text here"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
+msgid "Business Fax"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
+msgid "Callback"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
-msgid "Host:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+msgid "Car"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Host help text here."
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+msgid "Company"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Port:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+msgid "Home"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+msgid "Home 2"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+msgid "Home Fax"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+msgid "ISDN"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:435
-msgid "Search Scope:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
+msgid "Mobile"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:489
-msgid "Authentication:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
+msgid "Other"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
-msgid "Path:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
+msgid "Other Fax"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "FIXME Path Help text here"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
+msgid "Pager"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:513
-msgid "Create path if it doesn't exist."
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
+msgid "Primary"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:647
-msgid "Edit Addressbook"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
+msgid "Radio"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:649
-msgid "Add Addressbook"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
+msgid "Telex"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:665
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
-msgid "Name:"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:672
-msgid "FIXME Name help text here"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+msgid "Edit Full"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:674
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
+msgid "Full Name"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:675
-msgid "FIXME Description help text here"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+msgid "E-mail"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:8 mail/folder-browser.c:597
-#: mail/mail-config.glade.h:19 mail/mail-view.c:156
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Canada"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Check Address"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Countr_y:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "Finland"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "USA"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "_Address:"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "_City:"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
-msgid "Add to Contacts"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+msgid "_PO Box:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "_State/Province:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+msgid "_ZIP Code:"
+msgstr "_Post Code:"
+
+#: addressbook/gui/contact-editor/fullname.glade.h:1
+msgid "Check Full Name"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
+#: addressbook/gui/contact-editor/fullname.glade.h:2
+msgid "Dr."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
+#: addressbook/gui/contact-editor/fullname.glade.h:3
+msgid "Esq."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+msgid "I"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
+#: addressbook/gui/contact-editor/fullname.glade.h:5
+msgid "II"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Cannot initialise Evolution's mail component."
+#: addressbook/gui/contact-editor/fullname.glade.h:6
+msgid "III"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
+#: addressbook/gui/contact-editor/fullname.glade.h:7
+msgid "Jr."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
+#: addressbook/gui/contact-editor/fullname.glade.h:8
+msgid "Miss"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-#, fuzzy
-msgid "Factory for the Evolution addressbook component."
-msgstr "Cannot initialise Evolution's mail component."
+#: addressbook/gui/contact-editor/fullname.glade.h:9
+msgid "Mr."
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
+#: addressbook/gui/contact-editor/fullname.glade.h:10
+msgid "Mrs."
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
+#: addressbook/gui/contact-editor/fullname.glade.h:11
+msgid "Ms."
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
+#: addressbook/gui/contact-editor/fullname.glade.h:12
+msgid "Sr."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:402
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
+#: addressbook/gui/contact-editor/fullname.glade.h:13
+msgid "_First:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
-msgid "Remove All"
+#: addressbook/gui/contact-editor/fullname.glade.h:14
+msgid "_Last:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
+#: addressbook/gui/contact-editor/fullname.glade.h:15
+msgid "_Middle:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
+#: addressbook/gui/contact-editor/fullname.glade.h:16
+msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
+#: addressbook/gui/contact-editor/fullname.glade.h:17
+msgid "_Title:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+msgid "List _name:"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+msgid "Members"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+msgid "_Remove"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+msgid "contact-list-editor"
+msgstr ""
+
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+msgid "Contact List Editor"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+msgid "New Contact:"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+msgid "Original Contact:"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
+msgid ""
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
 msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr ""
 
@@ -1097,157 +1218,238 @@ msgstr ""
 msgid "z"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Send message to contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/folder-browser.c:572
-#: mail/mail-view.c:154 ui/evolution-addressbook.xml.h:9
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:50
-#: ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+msgid "Error modifying card"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+msgid "Success"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+msgid "Repository offline"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+msgid "Card not found"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+msgid "Protocol not supported"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+msgid "Canceled"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+msgid "Other error"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+msgid "Error adding list"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+msgid "Error adding card"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+msgid "Error modifying list"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+msgid "Error removing list"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+msgid "Error removing card"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+msgid "Done."
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+msgid "Removing cards..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1285,7 +1487,7 @@ msgid "Dimensions:"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+msgid "F_ont..."
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1345,7 +1547,6 @@ msgid "Margins"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr ""
 
@@ -1426,140 +1627,317 @@ msgstr ""
 msgid "Width:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+msgid "_Font..."
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#, fuzzy
+msgid "Evolution calendar executive summary component."
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#, fuzzy
+msgid "Factory for the Calendar Summary component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the calendar iTip view control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the sample Calendar control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+msgid "Notification about your appointment"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, c-format
+msgid "Notification about your task starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, c-format
+msgid "Notification about your task ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+msgid "Notification about your task"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Colours"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+msgid "Snoo_ze"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+msgid "_Edit appointment"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+msgid "No description available."
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr ""
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:58
+#, c-format
+msgid ""
+"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+"know."
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "Could not initialise Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Could not initialise Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
+msgid "Could not create the alarm notify service factory"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:402
+msgid "%A %d %B %Y"
+msgstr ""
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+msgid "%a %d %b %Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:468
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1592
-#: calendar/gui/event-editor.c:1619
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:660
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
-#: calendar/gui/calendar-model.c:1569
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:659
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:658
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:635 calendar/gui/calendar-model.c:1173
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1175
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1177
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1179
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
-#: camel/camel-service.c:586
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:799
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1567,160 +1945,294 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:879
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:893 calendar/gui/calendar-model.c:1117
-#: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1129
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:430
-#: widgets/misc/e-dateedit.c:1339 widgets/misc/e-dateedit.c:1454
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:967
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1007
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1048
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1061
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1102
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1571
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1573
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:196
-msgid "%A, %e %B %Y"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+msgid "Day View"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
-msgid "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+msgid "Work Week View"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:437
-msgid "<b>Error loading calendar</b>"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+msgid "Week View"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:449
-msgid "<b>Error loading calendar:<br>Method not supported"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+msgid "Month View"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:616
-msgid "Display"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:621
-msgid "Show appointments"
+#: calendar/gui/dialogs/alarm-options.c:354
+msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:629
-msgid "Show tasks"
+#: calendar/gui/dialogs/alarm-options.c:363
+msgid "Message Alarm Options"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
+#: calendar/gui/dialogs/alarm-options.c:372
+msgid "Mail Alarm Options"
 msgstr ""
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
 msgstr ""
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+msgid "Message to Display"
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+msgid "Play sound:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:52
-#, fuzzy
-msgid "Could not initialize GNOME"
-msgstr "Could not initialise Bonobo"
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:77
-msgid "Could not create the alarm notify service factory"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+msgid "Run program:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+msgid "extra times every"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-#, fuzzy
-msgid "Close"
-msgstr "Colours"
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
+#: calendar/gui/dialogs/alarm-page.c:284
+#, c-format
+msgid "%d days"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:286
+msgid "1 day"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, c-format
+msgid "%d weeks"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:291
+msgid "1 week"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, c-format
+msgid "%d hours"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:296
+msgid "1 hour"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, c-format
+msgid "%d minutes"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:301
+msgid "1 minute"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, c-format
+msgid "%d seconds"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:306
+msgid "1 second"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+msgid "Display a message"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an email"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:361
+msgid "before start of appointment"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:364
+msgid "after start of appointment"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:374
+msgid "before end of appointment"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:377
+msgid "after end of appointment"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+msgid "Basics"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+msgid "Date/Time:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+msgid "_Options..."
+msgstr ""
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+msgid "minute(s)"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
@@ -1752,36 +2264,38 @@ msgid "60 minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
+msgid "Beep when alarm windows appear."
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
+msgid "Calendar"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
+msgid "Calendar Preferences"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
-msgid "Calendar"
+msgid "Color for overdue tasks"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
-msgstr ""
+#, fuzzy
+msgid "Color for tasks due today"
+msgstr "Colours for display"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Colours"
+#, fuzzy
+msgid "Colors for Tasks"
+msgstr "Colours for display"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+msgid "Compress weekends in month view"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+msgid "Date Navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1789,1013 +2303,1099 @@ msgid "Defaults"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
+#: mail/mail-config.glade.h:30
+msgid "Display"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
+msgid "End of day:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
+msgid "First day of week:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "End of day:"
+msgid "Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "First day of week:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Fri"
+#: calendar/gui/dialogs/recurrence-page.c:969
+msgid "Friday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:481
-msgid "Friday"
+msgid "Mon"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
+msgid "Notification Options"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
+msgid "Overdue tasks"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
+msgid "Remind me of all appointments"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Mon"
+msgid "Sat"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:477
-msgid "Monday"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
+msgid "Show appointment end times in week and month views"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
+msgid "Show week numbers"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
-msgstr "Pick a colour"
+msgid "Start of day:"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
+msgid "Sun"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "Remind me of all appointments"
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
+msgid "Task List"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Sat"
+msgid "Tasks due today"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:482
-msgid "Saturday"
+msgid "Thu"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+msgid "Time"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show week numbers"
+msgid "Time divisions:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Start of day:"
+msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "Sun"
+msgid "Time zone:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:483
-msgid "Sunday"
+msgid "Tue"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
+#: calendar/gui/dialogs/recurrence-page.c:966
+msgid "Tuesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Thu"
+msgid "Wed"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:480
-msgid "Thursday"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
+msgid "Work Week"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "Time divisions:"
+msgid "minutes before they occur."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time format:"
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-msgid "Tue"
+#: calendar/gui/dialogs/cancel-comp.c:58
+msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:478
-msgid "Tuesday"
+#: calendar/gui/dialogs/cancel-comp.c:63
+msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
+#: calendar/gui/dialogs/cancel-comp.c:68
+msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Wed"
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:479
-msgid "Wednesday"
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "minutes before they occur."
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
-msgid "seconds."
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:70
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:73
-msgid "Are you sure you want to delete this untitled appointment?"
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:79
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:82
-msgid "Are you sure you want to delete this untitled task?"
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
+msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:91
-msgid "Are you sure want to delete this untitled journal entry?"
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Classification"
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "Date & Time"
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Pri_vate"
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Pu_blic"
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Su_mmary:"
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Confidential"
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
+#: calendar/gui/dialogs/delete-comp.c:84
+#, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
+#: calendar/gui/dialogs/delete-comp.c:87
+msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
+#: calendar/gui/dialogs/delete-comp.c:93
+#, c-format
+msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
+#: calendar/gui/dialogs/delete-comp.c:96
+msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:697
-msgid "Edit Task"
+#: calendar/gui/dialogs/delete-comp.c:102
+#, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
-msgid "No summary"
+#: calendar/gui/dialogs/delete-comp.c:105
+msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
+#: calendar/gui/dialogs/delete-comp.c:120
 #, c-format
-msgid "Appointment - %s"
+msgid "Are you sure you want to delete %d appointments?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
+#: calendar/gui/dialogs/delete-comp.c:125
 #, c-format
-msgid "Task - %s"
+msgid "Are you sure you want to delete %d tasks?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
+#: calendar/gui/dialogs/delete-comp.c:130
 #, c-format
-msgid "Journal entry - %s"
+msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+msgid "Select a Time Zone"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Completion Date"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+msgid "Selection:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "End Date"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+msgid "Time Zones"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Start Date"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:164
-msgid "Percent complete"
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Summary"
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+msgid "Meeting"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
+msgid "Classification"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:170
-msgid "Click here to add a task"
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
+msgid "Date & Time"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:374
-#, c-format
-msgid "0%"
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
+msgid "Pri_vate"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:375
-#, c-format
-msgid "10%"
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
+msgid "Pu_blic"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:376
-#, c-format
-msgid "20%"
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
+msgid "Su_mmary:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:377
-#, c-format
-msgid "30%"
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
+msgid "_Confidential"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:378
-#, c-format
-msgid "40%"
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:379
-#, c-format
-msgid "50%"
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:380
-#, c-format
-msgid "60%"
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:381
-#, c-format
-msgid "70%"
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+msgid "Group"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:382
-#, c-format
-msgid "80%"
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+msgid "Resource"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:383
-#, c-format
-msgid "90%"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:384
-#, c-format
-msgid "100%"
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit this task..."
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+msgid "Needs Action"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
 msgstr ""
 
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
-msgid "%A %d %B"
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+msgid "Delegated"
 msgstr ""
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+msgid "In Process"
 msgstr ""
 
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
-#: calendar/gui/e-week-view-main-item.c:348
-msgid "%d %b"
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
 msgstr ""
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Chair Persons"
 msgstr ""
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
-msgid "New All Day Event"
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Non-Participants"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
-msgid "Go to Today"
+#: calendar/gui/dialogs/meeting-page.c:891
+msgid "Sent By:"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
-msgid "Go to Date..."
+#: calendar/gui/dialogs/meeting-page.c:1442
+msgid "_Delegate To..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: mail/folder-browser.c:566 ui/evolution-calendar.xml.h:19
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
-msgid "Delete this Appointment"
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+msgid "Common Name"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+msgid "Delegated From"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
-msgid "Make this Occurrence Movable"
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+msgid "Delegated To"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
-msgid "Delete this Occurrence"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+msgid "Language"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3179
-msgid "Delete all Occurrences"
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+msgid "Member"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
-msgid "Component successfully updated."
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+#, fuzzy
+msgid "Organizer:"
+msgstr "Organisation:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Organisation:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+msgid "_Invite Others"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Organisation:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:499
-msgid "I couldn't update your calendar store."
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Component successfully deleted."
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-#, fuzzy
-msgid "I don't recognize this type of calendar component."
-msgstr "Cannot initialise Evolution's mail component."
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
-msgid " Accept "
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:815
-msgid " Decline "
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Tentative "
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:2
-#, no-c-format
-msgid "%P %%"
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:3
-msgid "--to--"
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:4
-msgid "Calendar Message"
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+msgid "_Modify"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
-msgid "Date:"
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:8
-msgid "Loading calendar..."
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:9
-#, fuzzy
-msgid "Organizer:"
-msgstr "Organisation:"
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:10
-msgid "Server Message:"
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+msgid "Delegated From:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+msgid "Delegated To:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+msgid "No one"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:13
-#, fuzzy
-msgid "Organizer: "
-msgstr "Organisation:"
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Required Participant"
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid "Role"
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:22
-msgid ""
-"Schedule\n"
-"Time"
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:33
-#: mail/message-list.c:1052
-msgid "Status"
+#: calendar/gui/e-calendar-table.c:351
+#, c-format
+msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
-msgid "All"
+#: calendar/gui/e-calendar-table.c:352
+#, c-format
+msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:155
-msgid "Category:"
+#: calendar/gui/e-calendar-table.c:353
+#, c-format
+msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
-msgid "Could not load the tasks in `%s'"
+msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
-msgid "The method required to load `%s' is not supported"
+msgid "40%"
 msgstr ""
 
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
-msgid "%d %B"
+#: calendar/gui/e-calendar-table.c:356
+#, c-format
+msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-msgid "New Appointment..."
+#: calendar/gui/e-calendar-table.c:357
+#, c-format
+msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3314
-msgid "Delete All Occurrences"
+#: calendar/gui/e-calendar-table.c:358
+#, c-format
+msgid "70%"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
+#: calendar/gui/e-calendar-table.c:359
+#, c-format
+msgid "80%"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
+#: calendar/gui/e-calendar-table.c:360
+#, c-format
+msgid "90%"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
+#: calendar/gui/e-calendar-table.c:361
+#, c-format
+msgid "100%"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
+#: calendar/gui/e-calendar-table.c:861
+msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1579
-msgid "Play a sound"
+#: calendar/gui/e-calendar-table.c:863
+msgid "_Delete this Task"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
+#: calendar/gui/e-calendar-table.c:866
+msgid "_Mark Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
+#: calendar/gui/e-calendar-table.c:868
+msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1588
-msgid "Run a program"
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1585
-msgid "Send an email"
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1582
-msgid "Show a dialog"
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:36
-msgid "after"
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
-msgid "before"
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
+#: calendar/gui/e-calendar-table.etspec.h:15
+msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
+msgid "%A %d %B"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
-msgid "minute(s)"
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
+#: calendar/gui/e-week-view-main-item.c:348
+msgid "%d %b"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "start of appointment"
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "until"
+#: calendar/gui/e-day-view.c:3306
+msgid "New _Appointment"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "week(s)"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "year(s)"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/event-editor.c:373
-msgid "Edit Appointment"
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/event-editor.c:451
-msgid "on"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+msgid "_Delete this Appointment"
 msgstr ""
 
-#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
-msgid "day"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/event-editor.c:603
-msgid "on the"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/event-editor.c:610
-msgid "th"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:756
-msgid "occurrences"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/event-editor.c:873
-msgid "This appointment contains recurrences that Evolution cannot edit."
+#: calendar/gui/e-itip-control.c:697
+msgid "This is a meeting request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1534
-#, c-format
-msgid " %d days"
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1536
-msgid " 1 day"
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1539
-#, c-format
-msgid " %d weeks"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1541
-msgid " 1 week"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1544
-#, c-format
-msgid " %d hours"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+msgid "The message is not understandable."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1546
-msgid " 1 hour"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1549
-#, c-format
-msgid " %d minutes"
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1551
-msgid " 1 minute"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1554
-#, c-format
-msgid " %d seconds"
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1556
-msgid " 1 second"
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1603
-msgid " before start of appointment"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1605
-msgid " after start of appointment"
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1613
-msgid " before end of appointment"
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1615
-msgid " after end of appointment"
+#: calendar/gui/e-itip-control.c:834
+msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/event-editor.c:3123 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-#, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr "Cannot initialise Evolution's mail summary component."
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
+#: calendar/gui/e-itip-control.c:1015
+msgid "I couldn't remove the item from your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
+#: calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-#, fuzzy
-msgid "Factory for the Calendar Summary component."
-msgstr "Cannot initialise Evolution's mail component."
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
+msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr "Cannot initialise Evolution's mail component."
+#: calendar/gui/e-itip-control.glade.h:4
+msgid "Calendar Message"
+msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the calendar iTip view control"
-msgstr "Cannot initialise Evolution's mail component."
+#: calendar/gui/e-itip-control.glade.h:5
+msgid "Date:"
+msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-#, fuzzy
-msgid "Factory for the sample Calendar control"
-msgstr "Cannot initialise Evolution's mail component."
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:8
+msgid "Loading calendar..."
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:10
+msgid "Server Message:"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
+msgid "All"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:252
+msgid "Category:"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:403
+#, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:415
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr ""
 
-#: calendar/gui/gnome-cal.c:700
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
+msgid "%d %B"
+msgstr ""
+
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+msgid "New _Appointment..."
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:711
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -2821,236 +3421,251 @@ msgid "Go To Date"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
+msgid "January"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:7
-msgid "January"
+msgid "July"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:8
-msgid "July"
+msgid "June"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:9
-msgid "June"
+msgid "March"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:10
-msgid "March"
+msgid "May"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:11
-msgid "May"
+msgid "November"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:12
-msgid "November"
+msgid "October"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:13
-msgid "October"
+msgid "September"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:14
-msgid "September"
+msgid "_Go To Today"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr ""
 
-#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr ""
 
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1104
+#: calendar/gui/print.c:1846
 #, c-format
-msgid "Current week (%s - %s)"
+msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1342
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:52
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+msgid "Print Item"
+msgstr ""
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr ""
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
@@ -3086,82 +3701,102 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:207
+#: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:245
+#: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:326
+#: camel/camel-cipher-context.c:336
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 #, fuzzy
 msgid "Syncing folders"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, c-format
-msgid "Failed message %d"
+msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-msgid "Complete"
-msgstr ""
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -3193,14 +3828,33 @@ msgstr ""
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
+#: camel/camel-lock-client.c:110
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:123
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, c-format
+msgid "Could not lock '%s'"
+msgstr ""
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3215,113 +3869,108 @@ msgstr ""
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:199
+#: camel/camel-movemail.c:159
 #, c-format
-msgid "Could not test lock file for %s: %s"
+msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:245
+#: camel/camel-movemail.c:189
 #, c-format
-msgid "Error reading mail file: %s"
+msgid "Could not create pipe: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:256
+#: camel/camel-movemail.c:201
 #, c-format
-msgid "Error writing mail temp file: %s"
+msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:239
 #, c-format
-msgid "Failed to store mail in temp file %s: %s"
+msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:306
-#, c-format
-msgid "Could not create pipe: %s"
+#: camel/camel-movemail.c:240
+msgid "(Unknown error)"
 msgstr ""
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:263
 #, c-format
-msgid "Could not fork: %s"
+msgid "Error reading mail file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:274
 #, c-format
-msgid "Movemail program failed: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:357
-msgid "(Unknown error)"
+msgid "Error writing mail temp file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:186
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:189
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:509
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
-#: camel/camel-pgp-context.c:1021 camel/camel-pgp-context.c:1235
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr ""
 
-#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
-#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1028
-#: camel/camel-pgp-context.c:1242
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:681
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:871
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr ""
 
-#: camel/camel-pgp-context.c:888
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1011
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr ""
 
-#: camel/camel-pgp-context.c:1037
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1227
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -3340,37 +3989,37 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:264
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr ""
 
@@ -3467,78 +4116,147 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:417
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
+msgstr ""
+
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
 msgstr ""
 
-#: camel/camel-search-private.c:110
+#: camel/camel-sasl-login.c:127
+msgid "Unknown authentication state."
+msgstr ""
+
+#: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:152
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:168
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:554
+#: camel/camel-service.c:548
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:581
+#: camel/camel-service.c:575
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:606
+#: camel/camel-service.c:600
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:608
+#: camel/camel-service.c:602
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:57
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:59
+#: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:274 camel/camel-session.c:364
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:462
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
 
-#. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:994 mail/mail-ops.c:1001
-#: mail/mail-ops.c:1019 mail/mail-ops.c:1020
-msgid "Trash"
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr ""
+
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr ""
+
+#: camel/camel-smime-context.c:249
+#, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr ""
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr ""
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
+msgid "Failed to decode message."
+msgstr ""
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
+#, c-format
+msgid ""
+"Issuer: %s\n"
+"Subject: %s"
+msgstr ""
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
 msgstr ""
 
 #: camel/camel-url.c:289
@@ -3546,65 +4264,87 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:545
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:209
+#: camel/camel-vtrash-folder.c:109
+msgid "You cannot copy messages from this trash folder."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:217
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:272
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:456
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:490
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:172
+#: camel/providers/imap/camel-imap-folder.c:192
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:351
-#, fuzzy
-msgid "Scanning IMAP folder"
-msgstr "Synchronising \"%s\""
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
+msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:986
-#: camel/providers/imap/camel-imap-folder.c:1197
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+msgid "Scanning for changed messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1016
-#: camel/providers/imap/camel-imap-folder.c:1231
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+msgid "Scanning for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr ""
 
@@ -3612,7 +4352,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:484
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr ""
 
@@ -3644,28 +4384,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:440
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:450
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:475
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:490
-#: camel/providers/smtp/camel-smtp-transport.c:403
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3673,116 +4413,125 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:865
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
-msgid "%s is not a selectable folder"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:879
-#, c-format
-msgid "Could not create directory %s: %s"
+msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1382
-msgid "You must be working online to complete this operation"
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-provider.c:70
+msgid "Unix mbox spool-format mail files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:71
+msgid "For storing local mail in standard Unix spool directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:136
+#: camel/providers/local/camel-local-store.c:134
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:144
-#: camel/providers/local/camel-local-store.c:160
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:175
+#: camel/providers/local/camel-local-store.c:173
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:241
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:283
+#: camel/providers/local/camel-local-store.c:279
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:293
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
+msgid "Unable to add message to summary: unknown reason"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -3790,14 +4539,14 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -3805,28 +4554,41 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr ""
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
+#, c-format
+msgid "Cannot open maildir directory path: %s: %s"
+msgstr ""
+
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
@@ -3836,20 +4598,25 @@ msgstr ""
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -3888,83 +4655,100 @@ msgstr ""
 
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 #, fuzzy
 msgid "Summarising folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:501
-#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:506
-#: camel/providers/local/camel-mbox-summary.c:707
+#: camel/providers/local/camel-mbox-summary.c:507
+#: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:523
+#: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:556
-#: camel/providers/local/camel-mbox-summary.c:745
-#: camel/providers/local/camel-mbox-summary.c:753
+#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:557
+#: camel/providers/local/camel-mbox-summary.c:746
+#: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:616
+#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:634
-#: camel/providers/local/camel-mbox-summary.c:803
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:643
+#: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:654
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
@@ -3974,39 +4758,97 @@ msgstr ""
 msgid "`%s' is not a directory."
 msgstr ""
 
+#: camel/providers/local/camel-mh-summary.c:218
+#, c-format
+msgid "Cannot open MH directory path: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-folder.c:465
+#, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:132
+#, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:159
+#, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:176
+msgid "Spool stores do not have an inbox"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:186
+#, c-format
+msgid "Spool mail file %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -4019,24 +4861,24 @@ msgstr ""
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:226
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:288
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:295
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
@@ -4045,21 +4887,31 @@ msgstr ""
 msgid "Retrieving POP summary"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:192
+#: camel/providers/pop3/camel-pop3-folder.c:155
+#, c-format
+msgid "Could not check POP server for new messages: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:199
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:292
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:289
+#: camel/providers/pop3/camel-pop3-folder.c:296
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:307
+#: camel/providers/pop3/camel-pop3-folder.c:303
+#, c-format
+msgid "Could not fetch message: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:320
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
@@ -4077,7 +4929,7 @@ msgstr ""
 msgid "Delete after %s day(s)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr ""
 
@@ -4105,53 +4957,58 @@ msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:207
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:319
+#: camel/providers/pop3/camel-pop3-store.c:215
+#, c-format
+msgid "Could not connect to server: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:358
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:377
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:380
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:407
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:483
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr ""
 
@@ -4203,7 +5060,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr ""
 
@@ -4211,122 +5068,122 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4334,318 +5191,356 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:527
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:575
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:721
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:736
 #: camel/providers/smtp/camel-smtp-transport.c:748
+msgid "SMTP Authentication"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:782
+msgid "AUTH request failed."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:824
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:843
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:887
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:952
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
-msgid "Attachment"
-msgstr ""
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr ""
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:321
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr ""
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr ""
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:384
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
 
-#: composer/e-msg-composer.c:528
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr ""
+
+#: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:716
+#: composer/e-msg-composer.c:683
+#, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr ""
+
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:727
+#: composer/e-msg-composer.c:882
+msgid "Warning!"
+msgstr ""
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:819
+#: composer/e-msg-composer.c:997
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: composer/e-msg-composer.c:877 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
+#: composer/e-msg-composer.c:1047
+#, c-format
+msgid "Error accessing file: %s"
+msgstr ""
+
+#: composer/e-msg-composer.c:1055
+msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:883
+#: composer/e-msg-composer.c:1061
+#, c-format
 msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
+"Unable to seek on file: %s\n"
+"%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:908
-msgid "Open file"
+#: composer/e-msg-composer.c:1067
+#, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1034
-msgid "That file does not exist."
+#: composer/e-msg-composer.c:1076
+#, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1044
-msgid "That is not a regular file."
+#: composer/e-msg-composer.c:1173
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1054
-msgid "That file exists but is not readable."
+#: composer/e-msg-composer.c:1321
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1064
-msgid "That file appeared accesible but open(2) failed."
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
 msgstr ""
 
-#: composer/e-msg-composer.c:1086
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
+#: composer/e-msg-composer.c:1351
+msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:1107
-msgid "An error occurred while reading the file."
+#: composer/e-msg-composer.c:1500
+msgid "Insert File"
 msgstr ""
 
-#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1829
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:355
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:370
+#: composer/evolution-composer.c:374
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "Cannot initialise Evolution's mail component."
@@ -4663,310 +5558,133 @@ msgid "calendar information"
 msgstr ""
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr ""
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+msgid "%I:%M:%S %p"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+msgid "%H:%M:%S"
 msgstr ""
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr ""
+
+#: e-util/e-time-utils.c:240
+msgid "%d/%m/%Y"
+msgstr ""
+
+#: e-util/e-time-utils.c:241
+msgid "%Y/%m/%d"
+msgstr ""
+
+#: e-util/e-time-utils.c:242
+#, c-format
+msgid "%x"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
 msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr ""
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1257
-#: widgets/misc/e-dateedit.c:1316 widgets/misc/e-dateedit.c:1495
-msgid "%H:%M"
-msgstr ""
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-msgid "%H:%M:%S"
-msgstr ""
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1260
-#: widgets/misc/e-dateedit.c:1319 widgets/misc/e-dateedit.c:1498
-msgid "%I:%M %p"
-msgstr ""
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-msgid "%I:%M:%S %p"
-msgstr ""
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-#, fuzzy
-msgid "Evolution component for the executive summary."
-msgstr "Cannot initialise Evolution's mail summary component."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the Evolution executive summary component."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:75
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Colours"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:924
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:938
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:956
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr ""
-
-#: executive-summary/component/main.c:62
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-#, fuzzy
-msgid "Factory for the test bonobo component."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the test component."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:768
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:778
-msgid "Update now"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:788
-msgid "Update every "
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:796
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr ""
-
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr ""
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr ""
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr ""
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr ""
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr ""
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr ""
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr ""
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr ""
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr ""
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr ""
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr ""
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr ""
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
 
-#: filter/filter-datespec.c:298
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:338
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -4974,28 +5692,36 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr ""
 
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr ""
 
 #. The label
-#: filter/filter-datespec.c:432
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr ""
 
-#: filter/filter-datespec.c:706
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr ""
 
@@ -5004,11 +5730,11 @@ msgid "Filter Rules"
 msgstr ""
 
 #. and now for the action area
-#: filter/filter-filter.c:453
+#: filter/filter-filter.c:452
 msgid "Then"
 msgstr ""
 
-#: filter/filter-filter.c:467
+#: filter/filter-filter.c:466
 msgid "Add action"
 msgstr ""
 
@@ -5018,27 +5744,27 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-folder.c:247
+#: filter/filter-folder.c:250
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:293
+#: filter/filter-folder.c:296
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-input.c:194
+#: filter/filter-input.c:193
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-part.c:475
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr ""
 
@@ -5050,26 +5776,45 @@ msgstr ""
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr ""
 
+#: filter/filter-rule.c:771
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:771
+msgid "outgoing"
+msgstr ""
+
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr ""
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr ""
+
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr ""
@@ -5110,370 +5855,488 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr ""
-
 #: filter/libfilter-i18n.h:3
-msgid "Assign Score"
+msgid "Assign Color"
 msgstr ""
 
 #: filter/libfilter-i18n.h:4
-msgid "Attachments"
+msgid "Assign Score"
 msgstr ""
 
 #: filter/libfilter-i18n.h:5
-msgid "Copy to Folder"
+msgid "Attachments"
 msgstr ""
 
-#: filter/libfilter-i18n.h:6
-msgid "Date received"
+#: filter/libfilter-i18n.h:7
+msgid "contains"
 msgstr ""
 
-#: filter/libfilter-i18n.h:7
-msgid "Date sent"
+#: filter/libfilter-i18n.h:8
+msgid "Copy to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:9
-msgid "Deleted"
+msgid "Date received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:10
-msgid "Do Not Exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:11
-msgid "Draft"
+msgid "Date sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:12
-msgid "Exist"
+msgid "Deleted"
 msgstr ""
 
 #: filter/libfilter-i18n.h:13
-msgid "Expression"
+msgid "does not contain"
 msgstr ""
 
 #: filter/libfilter-i18n.h:14
-msgid "Forward to Address"
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "Important"
+msgid "does not exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "Is Not"
+msgid "does not sound like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:17
-msgid "Is"
+msgid "does not start with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:18
-msgid "Mailing list"
+msgid "Do Not Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:19
-msgid "Message Body"
+msgid "Draft"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "Message Header"
+msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "Message was received"
+msgid "Exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "Message was sent"
+msgid "exists"
 msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "Move to Folder"
+msgid "Expression"
 msgstr ""
 
 #: filter/libfilter-i18n.h:24
-msgid "Read"
+msgid "Important"
 msgstr ""
 
 #: filter/libfilter-i18n.h:25
-msgid "Recipients"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:26
-msgid "Regex Match"
+msgid "is greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "Replied to"
+msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28 filter/score-rule.c:203 filter/score-rule.c:205
-#: mail/message-list.c:1052
-msgid "Score"
+#: filter/libfilter-i18n.h:28
+msgid "is not"
 msgstr ""
 
 #: filter/libfilter-i18n.h:29
-msgid "Sender"
+msgid "Mailing list"
 msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "Set Status"
+msgid "Message Body"
 msgstr ""
 
 #: filter/libfilter-i18n.h:31
-msgid "Source Account"
+msgid "Message Header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "Specific header"
+msgid "Message was received"
+msgstr ""
+
+#: filter/libfilter-i18n.h:33
+msgid "Message was sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "Stop Processing"
+msgid "Move to Folder"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
-msgid "Subject"
+#: filter/libfilter-i18n.h:35
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:36
+msgid "on or before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
+msgid "Read"
 msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "contains"
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "does not contain"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "does not end with"
+msgid "Replied to"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
-msgid "does not exist"
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
+msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42
-msgid "does not sound like"
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
+msgid "Sender"
 msgstr ""
 
 #: filter/libfilter-i18n.h:43
-msgid "does not start with"
+msgid "Set Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:44
-msgid "ends with"
+msgid "Size (kB)"
 msgstr ""
 
 #: filter/libfilter-i18n.h:45
-msgid "exists"
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:46
-msgid "is greater than"
+msgid "Source Account"
 msgstr ""
 
 #: filter/libfilter-i18n.h:47
-msgid "is less than"
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:48
-msgid "is not"
-msgstr ""
-
-#: filter/libfilter-i18n.h:49
-msgid "is"
+msgid "starts with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:50
-msgid "on or after"
+msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
-msgid "on or before"
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
+msgid "Subject"
 msgstr ""
 
 #: filter/libfilter-i18n.h:52
-msgid "sounds like"
+msgid "was after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:53
-msgid "starts with"
+msgid "was before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:54
-msgid "was after"
+#: filter/rule-editor.c:147
+msgid "Rules"
 msgstr ""
 
-#: filter/libfilter-i18n.h:55
-msgid "was before"
+#: filter/rule-editor.c:240
+msgid "Add Rule"
+msgstr ""
+
+#: filter/rule-editor.c:299
+msgid "Edit Rule"
 msgstr ""
 
 #: filter/score-editor.c:130
 msgid "Score Rules"
 msgstr ""
 
-#: mail/component-factory.c:329
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
+msgstr ""
+
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+msgid "Mail"
+msgstr ""
+
+#: importers/elm-importer.c:498
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: importers/elm-importer.c:527
+msgid "Elm mail"
+msgstr ""
+
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+msgid "Addressbook"
+msgstr ""
+
+#: importers/evolution-gnomecard-importer.c:253
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: importers/netscape-importer.c:824
+msgid "Settings"
+msgstr ""
+
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: importers/pine-importer.c:691
+msgid "Pine mail"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Evolution mail composer."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Evolution mail executive summary component."
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Evolution mail folder display component."
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Evolution mail folder factory component."
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution composer."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution mail component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Mail Summary component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+msgid "Mail configuration interface"
+msgstr ""
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+msgid "Properties..."
+msgstr ""
+
+#: mail/component-factory.c:337
+msgid "Change this folder's properties"
+msgstr ""
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-factory.c:209
+#: mail/folder-browser-ui.c:254
 #, c-format
 msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser-factory.c:211 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
+#: mail/folder-browser-ui.c:256
 msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:225
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr ""
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr ""
 
-#: mail/folder-browser.c:533
-msgid "VFolder on Subject"
+#: mail/folder-browser.c:1238
+msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:536
-msgid "VFolder on Sender"
+#: mail/folder-browser.c:1241
+msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:539
-msgid "VFolder on Recipients"
+#: mail/folder-browser.c:1244
+msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:542 mail/folder-browser.c:733
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1247
+msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:548
-msgid "Filter on Subject"
+#: mail/folder-browser.c:1253
+msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:551
-msgid "Filter on Sender"
+#: mail/folder-browser.c:1256
+msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:554
-msgid "Filter on Recipients"
+#: mail/folder-browser.c:1259
+msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:557 mail/folder-browser.c:732
-msgid "Filter on Mailing List"
+#: mail/folder-browser.c:1262
+msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr ""
 
-#: mail/folder-browser.c:570
-msgid "Save As..."
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
+msgid "_Save As..."
 msgstr ""
 
-#: mail/folder-browser.c:577
-msgid "Reply to Sender"
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+msgid "_Print"
 msgstr ""
 
-#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:60
-msgid "Reply to All"
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:24
-msgid "Forward"
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+msgid "Reply to _List"
 msgstr ""
 
-#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:26
-msgid "Forward inline"
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+msgid "Reply to _All"
 msgstr ""
 
-#: mail/folder-browser.c:586
-msgid "Mark as Read"
+#: mail/folder-browser.c:1288
+msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:588
-msgid "Mark as Unread"
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:593
-msgid "Move to Folder..."
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+msgid "Mark as U_nread"
 msgstr ""
 
-#: mail/folder-browser.c:595
-msgid "Copy to Folder..."
+#: mail/folder-browser.c:1295
+msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:81
-msgid "Undelete"
+#: mail/folder-browser.c:1297
+msgid "Mark as Unim_portant"
 msgstr ""
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
-msgid "Apply Filters"
+#: mail/folder-browser.c:1302
+msgid "_Move to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:613
-msgid "Create Rule From Message"
+#: mail/folder-browser.c:1304
+msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:735
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+msgid "_Undelete"
 msgstr ""
 
-#: mail/folder-browser.c:736
-#, c-format
-msgid "VFolder on Mailing List (%s)"
+#: mail/folder-browser.c:1313
+msgid "Add Sender to Address Book"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
+#: mail/folder-browser.c:1318
+msgid "Apply Filters"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
-msgid "Evolution mail composer."
-msgstr "Cannot initialise Evolution's mail component."
+#: mail/folder-browser.c:1322
+msgid "Create Ru_le From Message"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Evolution mail executive summary component."
-msgstr "Cannot initialise Evolution's mail summary component."
+#: mail/folder-browser.c:1479
+msgid "Filter on Mailing List"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#, fuzzy
-msgid "Evolution mail folder display component."
-msgstr "Cannot initialise Evolution's mail summary component."
+#: mail/folder-browser.c:1480
+msgid "VFolder on Mailing List"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#, fuzzy
-msgid "Evolution mail folder factory component."
-msgstr "Cannot initialise Evolution's mail summary component."
+#: mail/folder-browser.c:1482
+#, c-format
+msgid "Filter on Mailing List (%s)"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution composer."
-msgstr "Cannot initialise Evolution's mail component."
+#: mail/folder-browser.c:1483
+#, c-format
+msgid "VFolder on Mailing List (%s)"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
-msgid "Factory for the Evolution mail component."
+msgid "Factory to import mbox into Evolution"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-#, fuzzy
-msgid "Factory for the Mail Summary component."
-msgstr "Cannot initialise Evolution's mail component."
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+msgid "Imports mbox files into Evolution"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+msgid "Imports Outlook Express 4 files into Evolution"
+msgstr ""
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -5506,38 +6369,62 @@ msgstr ""
 msgid "mh"
 msgstr ""
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+msgid "You have not filled in all of the required information."
+msgstr ""
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor-news.c:160
+msgid "Evolution News Editor"
+msgstr ""
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
+msgid "Evolution Account Editor"
+msgstr ""
+
+#: mail/mail-account-gui.c:971
+msgid "Save signature"
+msgstr ""
+
+#: mail/mail-account-gui.c:977
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr ""
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
-msgid "Are you sure you want to delete this news account?"
+#: mail/mail-accounts.c:268
+msgid "Don't delete"
 msgstr ""
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:536
-msgid "Evolution Account Manager"
+#: mail/mail-accounts.c:271
+msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-account-editor.c:105
-msgid "You have not filled in all of the required information."
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+msgid "Are you sure you want to delete this news account?"
 msgstr ""
 
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
-msgid "Evolution Account Editor"
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
+msgid "Evolution Account Manager"
 msgstr ""
 
 #: mail/mail-autofilter.c:70
@@ -5560,11 +6447,11 @@ msgstr ""
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5572,99 +6459,155 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:308
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:351
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:591
+#: mail/mail-callbacks.c:653
 #, c-format
-msgid "On %s, %s wrote:\n"
+msgid "On %s, %s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:773
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:876
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:878
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1019
+#: mail/mail-callbacks.c:1374
+#, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1056
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1089 mail/mail-display.c:90
-msgid "Overwrite file?"
+#: mail/mail-callbacks.c:1442
+#, c-format
+msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1093 mail/mail-display.c:94
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
+#: mail/mail-callbacks.c:1463
+msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:1137
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1139
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1253
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:51
+#: mail/mail-callbacks.c:1776
+msgid "Filters"
+msgstr ""
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:1349
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-config.c:1043 mail/mail-config.c:1046
+#: mail/mail-callbacks.c:1966
+#, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr ""
+
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+
+#. set window title
+#: mail/mail-config-druid.c:466
+msgid "Evolution Account Wizard"
+msgstr ""
+
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 msgid "Connecting to server..."
 msgstr ""
 
@@ -5678,34 +6621,63 @@ msgid " color"
 msgstr "Colours"
 
 #: mail/mail-config.glade.h:3
-msgid "Account"
+msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
 #: mail/mail-config.glade.h:4
-msgid "Account Information"
+msgid "Account"
 msgstr ""
 
 #: mail/mail-config.glade.h:5
-msgid "Account Management"
+msgid "Account Information"
 msgstr ""
 
 #: mail/mail-config.glade.h:6
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr ""
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "Colours"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -5715,418 +6687,551 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr ""
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+msgid "Enabled"
+msgstr ""
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
-msgid "Highlight citations with "
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:42
+msgid "HTML Signature:"
+msgstr ""
+
+#: mail/mail-config.glade.h:43
+msgid "Highlight citations with"
+msgstr ""
+
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+msgid "Inline"
+msgstr ""
+
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+msgid "Mailbox location"
+msgstr ""
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+msgid "Mark messages as Read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+msgid "NNTP Server:"
+msgstr ""
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "Pick a colour"
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr ""
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+msgid "Quoted"
+msgstr ""
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
+
+#: mail/mail-config.glade.h:84
+msgid "Security"
+msgstr ""
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+msgid "Source"
+msgstr ""
+
+#: mail/mail-config.glade.h:98
+msgid "Source Information"
+msgstr ""
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Type"
-msgstr ""
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
-msgid "_Edit"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config-druid.c:99
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config-druid.c:101
-msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what kind of server you use, contact your system administrator or "
-"Internet Service Provider."
+#: mail/mail-config.glade.h:114
+msgid "seconds."
 msgstr ""
 
-#: mail/mail-config-druid.c:105
-msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know which protocol you use, contact your system administrator or "
-"Internet Service Provider."
+#: mail/mail-crypto.c:60
+msgid "Could not create a PGP signature context."
 msgstr ""
 
-#: mail/mail-config-druid.c:107
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
+#: mail/mail-crypto.c:86
+msgid "Could not create a PGP verification context."
 msgstr ""
 
-#. set window title
-#: mail/mail-config-druid.c:445
-msgid "Evolution Account Wizard"
+#: mail/mail-crypto.c:116
+msgid "Could not create a PGP encryption context."
 msgstr ""
 
-#: mail/mail-display.c:194
-msgid "Save Attachment"
+#: mail/mail-crypto.c:142
+msgid "Could not create a PGP decryption context."
 msgstr ""
 
-#: mail/mail-display.c:234
-#, c-format
-msgid "Could not create temporary directory: %s"
+#: mail/mail-crypto.c:177
+msgid "Could not create a S/MIME signature context."
+msgstr ""
+
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
+msgstr ""
+
+#: mail/mail-crypto.c:240
+msgid "Could not create a S/MIME encryption context."
+msgstr ""
+
+#: mail/mail-crypto.c:271
+msgid "Could not create a S/MIME envelope context."
+msgstr ""
+
+#: mail/mail-crypto.c:301
+msgid "Could not create a S/MIME decode context."
+msgstr ""
+
+#: mail/mail-display.c:221
+msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:295
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:297
+#: mail/mail-display.c:340
+msgid "View Inline"
+msgstr ""
+
+#: mail/mail-display.c:342
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:299
-msgid "View Inline"
+#: mail/mail-display.c:399
+#, c-format
+msgid "View Inline (via %s)"
+msgstr ""
+
+#: mail/mail-display.c:403
+msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:334
+#: mail/mail-display.c:424
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:1048
+msgid "Loading message content"
+msgstr ""
+
+#: mail/mail-display.c:1404
+msgid "Open Link in Browser"
+msgstr ""
+
+#: mail/mail-display.c:1406
+msgid "Copy Link Location"
+msgstr ""
+
+#: mail/mail-display.c:1408
+msgid "Save Link as (FIXME)"
+msgstr ""
+
+#: mail/mail-display.c:1410
+msgid "Save Image as..."
+msgstr ""
+
+#: mail/mail-folder-cache.c:170
 #, c-format
-msgid "View Inline (via %s)"
+msgid "%d new"
 msgstr ""
 
-#: mail/mail-display.c:361
-msgid "Hide"
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
 msgstr ""
 
-#: mail/mail-display.c:1102
-msgid "Open link in browser"
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-display.c:1104
-msgid "Save as (FIXME)"
+#: mail/mail-folder-cache.c:186
+#, c-format
+msgid "%d unsent"
 msgstr ""
 
-#: mail/mail-display.c:1106
-msgid "Copy location (FIXME)"
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
 msgstr ""
 
-#: mail/mail-format.c:518
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:560
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:742
-msgid "Loading message content"
+#: mail/mail-format.c:746
+msgid "Date"
+msgstr ""
+
+#: mail/mail-format.c:842
+msgid "Bad Address"
+msgstr ""
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr ""
+
+#: mail/mail-format.c:867
+msgid "Reply-To"
+msgstr ""
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr ""
+
+#: mail/mail-format.c:873
+msgid "Cc"
 msgstr ""
 
-#: mail/mail-format.c:1046
+#: mail/mail-format.c:1291
+msgid "No GPG/PGP program configured."
+msgstr ""
+
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:1052
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr ""
 
-#: mail/mail-format.c:1053
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1137 mail/mail-format.c:1526
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1145 mail/mail-format.c:1534
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1747
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1759
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1763
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1797
+#: mail/mail-format.c:2094
 #, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
+msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1802
-msgid "Malformed external-body part."
+#: mail/mail-format.c:2102
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-local.c:337
-#, c-format
-msgid "No such folder %s"
+#: mail/mail-format.c:2107
+msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:509
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr ""
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:791
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:815
-msgid "Reconfiguring folder"
-msgstr ""
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:844
-msgid "Closing current folder"
-msgstr ""
-
-#: mail/mail-local.c:876
-msgid "Renaming old folder and opening"
-msgstr ""
-
-#: mail/mail-local.c:894
-msgid "Creating new folder"
-msgstr ""
-
-#: mail/mail-local.c:908
-msgid "Copying messages"
-msgstr ""
-
-#: mail/mail-local.c:925
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:964
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+msgid "You cannot change the format of a non-local folder."
+msgstr ""
+
+#: mail/mail-local.c:1011
+#, c-format
+msgid "Reconfigure %s"
+msgstr ""
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:192
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr ""
 
-#: mail/mail-mt.c:679 mail/session.c:98
-msgid "Do you accept?"
-msgstr ""
-
-#: mail/mail-mt.c:873
-msgid "Evolution progress"
-msgstr ""
-
-#: mail/mail-ops.c:587
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:589
-msgid "Sending message"
-msgstr ""
-
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:811
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr ""
 
@@ -6140,275 +7245,269 @@ msgstr ""
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:900
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr ""
 
-#: mail/mail-ops.c:978
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1139
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr ""
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1247
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1483
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1550
-msgid "Retrieving messages"
-msgstr ""
-
-#: mail/mail-ops.c:1560
+#: mail/mail-ops.c:1722
 #, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
+msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1634
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, c-format
+msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1713
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1726
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1740
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1857
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
+#: mail/mail-ops.c:2101
+#, c-format
+msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:138
-msgid "Cancelling ..."
+#: mail/mail-search.c:138
+msgid "(Untitled Message)"
 msgstr ""
 
-#: mail/mail-send-recv.c:233
-msgid "Send & Receive mail"
+#: mail/mail-search.c:235
+msgid "Untitled Message"
 msgstr ""
 
-#: mail/mail-send-recv.c:236
-msgid "Receiving"
+#: mail/mail-search.c:239
+msgid "Empty Message"
 msgstr ""
 
-#: mail/mail-send-recv.c:285
-msgid "Updating ..."
+#: mail/mail-search.c:284
+msgid "Find in Message"
 msgstr ""
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
-msgid "Waiting ..."
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-send-recv.c:306
-msgid "Sending"
+#: mail/mail-search.c:315
+msgid "Search Forward"
 msgstr ""
 
-#: mail/mail-send-recv.c:471
-msgid "Cancelled."
+#: mail/mail-search.c:332
+msgid "Find:"
 msgstr ""
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
+#: mail/mail-search.c:335
+msgid "Matches:"
 msgstr ""
 
-#: mail/mail-tools.c:141
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
+#: mail/mail-send-recv.c:141
+msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-tools.c:188
-#, c-format
-msgid "[%s] (forwarded message)"
+#: mail/mail-send-recv.c:250
+msgid "Send & Receive mail"
 msgstr ""
 
-#: mail/mail-tools.c:198
-msgid "Fwd: (no subject)"
+#: mail/mail-send-recv.c:253
+msgid "Receiving"
 msgstr ""
 
-#: mail/mail-tools.c:215
-#, c-format
-msgid "Forwarded message - %s"
+#: mail/mail-send-recv.c:302
+msgid "Updating..."
 msgstr ""
 
-#: mail/mail-tools.c:217
-msgid "Forwarded message (no subject)"
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-tools.c:414
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
+#: mail/mail-send-recv.c:323
+msgid "Sending"
 msgstr ""
 
-#: mail/mail-vfolder.c:249
-msgid "VFolders"
+#: mail/mail-send-recv.c:488
+msgid "Cancelled."
 msgstr ""
 
-#: mail/mail-vfolder.c:427
-msgid "New VFolder"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
 msgstr ""
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:59
-msgid "Reply"
+#: mail/mail-tools.c:173
+#, c-format
+msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:65
-msgid "Reply to the sender of this message"
+#: mail/mail-tools.c:241
+#, c-format
+msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-view.c:147 ui/evolution-mail.xml.h:63
-msgid "Reply to all recipients of this message"
+#: mail/mail-tools.c:245
+msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:28
-msgid "Forward this message"
+#: mail/mail-tools.c:469
+msgid "Forwarded Message"
 msgstr ""
 
-#: mail/mail-view.c:154 ui/evolution-mail.xml.h:56
-msgid "Print the selected message"
+#: mail/mail-vfolder.c:270
+msgid "VFolders"
 msgstr ""
 
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
-msgid "Delete this message"
+#: mail/mail-vfolder.c:463
+msgid "New VFolder"
 msgstr ""
 
-#: mail/message-list.c:648
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:649
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:650
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:651
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:652
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:656
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:657
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:661
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:662
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:912
+#: mail/message-list.c:877
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:919
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:928
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:940
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:948
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:950
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:1052
-msgid "Flagged"
-msgstr ""
-
-#: mail/message-list.c:1053
-msgid "From"
+#: mail/message-list.c:2290
+msgid "Updating message list"
 msgstr ""
 
-#: mail/message-list.c:1053
-msgid "Date"
+#: mail/message-list.etspec.h:2
+msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1053
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr ""
 
-#: mail/message-list.c:1054
-msgid "To"
-msgstr ""
-
-#: mail/message-list.c:1054
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr ""
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr ""
 
@@ -6436,153 +7535,1404 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#, fuzzy
+msgid "Evolution component for the executive summary."
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the Evolution executive summary component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: my-evolution/component-factory.c:140
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+msgid "Appointments"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
+#: my-evolution/e-summary-calendar.c:177
+msgid "No appointments"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
+#: my-evolution/e-summary-calendar.c:226
+msgid "%l:%M%p"
 msgstr ""
 
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+#: my-evolution/e-summary-calendar.c:228
+msgid "%a %l:%M%p"
 msgstr ""
 
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
+#: my-evolution/e-summary-mail.c:104
+msgid "Mail summary"
 msgstr ""
 
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
 msgstr ""
 
-#: shell/importer/importer.c:351
-msgid "Importing"
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
 msgstr ""
 
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: shell/importer/importer.c:372
-#, c-format
-msgid "Error starting %s"
+#: my-evolution/e-summary-preferences.c:1408
+msgid "My Evolution Settings"
 msgstr ""
 
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
 msgstr ""
 
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+msgid "<b>Error downloading RDF</b>"
 msgstr ""
 
-#: shell/importer/importer.c:473
-msgid "Automatic"
+#: my-evolution/e-summary-tasks.c:206
+msgid "No tasks"
 msgstr ""
 
-#: shell/importer/importer.c:523
-msgid "Filename:"
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
 msgstr ""
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: shell/importer/importer.c:538
-msgid "File type:"
+#: my-evolution/e-summary-weather.c:643
+msgid "Regions"
 msgstr ""
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
+#: my-evolution/e-summary.c:145
+msgid "%A, %d %B %Y"
 msgstr ""
 
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+msgid "Print My Evolution"
 msgstr ""
 
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
+#: my-evolution/e-summary.c:518
+msgid "Printing of My Evolution failed"
 msgstr ""
 
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "Could not initialise Bonobo"
+
+#: my-evolution/metar.c:44
+msgid "Clear sky"
 msgstr ""
 
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
+
+#: my-evolution/metar.c:63
+msgid "Variable"
+msgstr ""
+
+#: my-evolution/metar.c:64
+msgid "North"
+msgstr ""
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+msgid "Northeast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+msgid "East"
+msgstr ""
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+msgid "Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+msgid "South"
+msgstr ""
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+msgid "Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+msgid "West"
+msgstr ""
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+msgid "Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Showers"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+msgid "Rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Drifting rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Freezing rain"
+msgstr ""
+
+#. SNOW
+#: my-evolution/metar.c:102
+msgid "Snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Moderate snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Drifting snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+msgid "Hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Shallow hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Partial hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Freezing hail"
+msgstr ""
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Shallow small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Showers of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+msgid "Unknown precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Unknown thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Freezing precipitation"
+msgstr ""
+
+#. MIST
+#: my-evolution/metar.c:109
+msgid "Mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Partial mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Drifting mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog with wind"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+msgid "Smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Shallow smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke with wind"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+msgid "Sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+msgid "Haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+msgid "Sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+msgid "Dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Raging tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Thunderous tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+msgid "Add new feed"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:2
+msgid "All folders:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+msgid "All stations:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:6
+msgid "Display folders:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:7
+msgid "Display stations:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:8
+msgid "Displayed feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:9
+msgid "Five days"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+msgid "One day"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:16
+msgid "One month"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:17
+msgid "One week"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+msgid "Schedule"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:20
+msgid "Show all tasks"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "Show full path for folders"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:22
+msgid "Show today's tasks"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:23
+msgid "Tasks "
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:24
+msgid "Units: "
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:25
+msgid "Weather"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:26
+msgid "Weather settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:27
+msgid "imperial"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#, fuzzy
+msgid "The Evolution shell."
+msgstr "Cannot initialise the Evolution shell."
+
+#: shell/e-activity-handler.c:198
+msgid "Show Details"
+msgstr ""
+
+#: shell/e-activity-handler.c:200
+msgid "Cancel Operation"
+msgstr ""
+
+#: shell/e-local-storage.c:554
+msgid "Local Folders"
 msgstr ""
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr ""
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr ""
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr ""
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6590,14 +8940,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:230
+#: shell/e-setup.c:235
 #, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6605,7 +8955,16 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6613,482 +8972,819 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:160
+msgid "Cannot move a folder over itself."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:162
+msgid "Cannot copy a folder over itself."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "Synchronising \"%s\""
+
+#: shell/e-shell-folder-commands.c:313
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:318
+msgid "Move folder"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:354
+#, c-format
+msgid "Delete folder '%s'"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:363
+#, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:422
+#, c-format
+msgid "Rename folder '%s'"
+msgstr ""
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:248
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:319
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr ""
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr ""
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:383
+#, c-format
+msgid "Error starting %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:402
+#, c-format
+msgid "Error loading %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr ""
+
+#: shell/e-shell-importer.c:538
+msgid "Filename:"
+msgstr ""
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr ""
+
+#: shell/e-shell-importer.c:553
+msgid "File type:"
+msgstr ""
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "Synchronising \"%s\""
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view.c:148
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+msgid "Create a new shortcut"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+msgid "Work Online"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
+msgstr ""
+
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1134
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Cannot initialise the Evolution shell."
+
+#: shell/e-shell-view.c:1411
 #, c-format
 msgid "%s - Evolution %s"
 msgstr ""
 
-#: shell/e-shell-view.c:1136
+#: shell/e-shell-view.c:1413
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr ""
 
-#: shell/e-shell.c:378
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1248
+#: shell/e-shell.c:1311
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+msgid "Rename Shortcut Group"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:301
+msgid "Rename selected shortcut group to:"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+msgid "_Remove this Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+msgid "Re_name this Group..."
+msgstr ""
+
+#: shell/e-shortcuts-view.c:336
+msgid "Rename this shortcut group"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
+#: shell/e-shortcuts-view.c:461
+msgid "Rename shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
+#: shell/e-shortcuts-view.c:462
+msgid "Rename selected shortcut to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:479
+msgid "Rename"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:479
+msgid "Rename this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:379
+#: shell/e-shortcuts.c:585
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
-msgid "_View"
+#: shell/e-shortcuts.c:982
+msgid "Shortcuts"
 msgstr ""
 
-#: shell/e-storage-set-view.c:649
-msgid "View the selected folder"
+#: shell/e-shortcuts.c:984
+msgid "Inbox"
+msgstr ""
+
+#: shell/e-shortcuts.c:987
+msgid "Contacts"
 msgstr ""
 
-#: shell/e-storage.c:178
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr ""
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr ""
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-#, fuzzy
-msgid "The Evolution shell."
-msgstr "Cannot initialise the Evolution shell."
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
+
+#: shell/e-task-widget.c:173
+msgid "%s (%d%% complete)"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+msgid "Active connections"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "Host"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder type:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Specify where to create the folder:"
+msgstr ""
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
 
-#: shell/main.c:83
+#: shell/importer/import.glade.h:2
+msgid "Evolution Import Utility"
+msgstr ""
+
+#: shell/importer/import.glade.h:3
+msgid "Evolution Importer Utility"
+msgstr ""
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+
+#: shell/importer/intelligent.c:191
+msgid "Importers"
+msgstr ""
+
+#: shell/importer/intelligent.c:197
+msgid "Don't import"
+msgstr ""
+
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr ""
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
 #, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:108
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:139
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/main.c:185
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:186
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:219
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Cannot initialise the Bonobo component system."
 
-#: ui/evolution-addressbook.xml.h:2
-msgid "Create new contact"
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
+msgid "Create new contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
+#: ui/evolution-addressbook.xml.h:5
+msgid "Create new contact list"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:7
-msgid "New contact"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:49
-msgid "Previews the message to be printed"
+#: ui/evolution-addressbook.xml.h:9
+msgid "Delete selected contacts"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:10
+msgid "New contact"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+msgid "New list"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:78
-msgid "Stop"
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:13
-msgid "Stop Loading"
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:14
-msgid "View All"
+msgid "Previews the contacts to be printed"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:17
+msgid "Print selected contacts"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:19
+msgid "Select all contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
+#: ui/evolution-addressbook.xml.h:20
+msgid "Stop"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:21
+msgid "Stop Loading"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+msgid "_Contact Group"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:110
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:42
-msgid "_Tools"
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
+msgid "_Tools"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a new all day Event"
+msgid "Create a New All-Day _Event"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+msgid "Create a _New Appointment"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
+msgid "Create a new appointment"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
+msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Go back in time"
-msgstr ""
-
 #: ui/evolution-calendar.xml.h:10
-msgid "Go forward in time"
+msgid "Go back in time"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:11
-msgid "Go to _Date"
+msgid "Go forward in time"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to a specific date"
+msgid "Go to _Date"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:14
-msgid "Go to present time"
+msgid "Go to a specific date"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:15
-msgid "Month"
+msgid "Go to present time"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
+#: ui/evolution-calendar.xml.h:18
+msgid "Previews the calendar to be printed"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
+msgid "Print calendar"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:21
-msgid "Prev"
+msgid "Print this Calendar"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:22
-msgid "Previews the calendar to be printed"
+msgid "Publish Free/Busy Information"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:24
+msgid "Show 1 day"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:25
-msgid "Print calendar"
+msgid "Show 1 month"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:26
-msgid "Print this Calendar"
+msgid "Show 1 week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
+#: ui/evolution-calendar.xml.h:27
+msgid "Show the working week"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
+msgid "W_ork Week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
-msgid "Show 1 day"
+#: ui/evolution-calendar.xml.h:29
+msgid "_Appointment..."
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:31
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:30
+msgid "_Calendar Settings..."
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:32
-msgid "Show 1 week"
+msgid "_Day"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:33
-msgid "Show the working week"
+msgid "_Month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
-#: widgets/misc/e-dateedit.c:422
-msgid "Today"
+#: ui/evolution-calendar.xml.h:37
+msgid "_Week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:35
-msgid "W_ork Week"
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+#, fuzzy
+msgid "Close"
+msgstr "Colours"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:38
-msgid "_Day"
+#: ui/evolution-comp-editor.xml.h:7
+msgid "Preview the printed item"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:39
-msgid "_Month"
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
-msgid "_New"
+#: ui/evolution-comp-editor.xml.h:11
+msgid "Print S_etup"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:106
-#: ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:45
-msgid "_Week"
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:17
+msgid "Save this item to disk"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:19
+msgid "_Action"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
 msgstr ""
 
 #: ui/evolution-contact-editor.xml.h:2
@@ -7096,6 +9792,7 @@ msgid "Delete this item"
 msgstr ""
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr ""
 
@@ -7107,27 +9804,12 @@ msgstr ""
 msgid "Print En_velope..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:57 ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr ""
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr ""
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr ""
@@ -7144,1221 +9826,1373 @@ msgstr ""
 msgid "Send _message to contact..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
-msgid "_File"
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
+msgid "_Save"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
-msgid "_Save"
+#: ui/evolution-contact-list-editor.xml.h:2
+msgid "Delete this list"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
+#: ui/evolution-contact-list-editor.xml.h:6
+msgid "Save the list and close the dialog box"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
+#: ui/evolution-contact-list-editor.xml.h:7
+msgid "Se_nd list to other..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
+#: ui/evolution-contact-list-editor.xml.h:8
+msgid "Send _message to list..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
+#: ui/evolution-event-editor.xml.h:1
+msgid "Cancel Mee_ting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+msgid "Cancel the meeting for this item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+msgid "Forward as i_Calendar"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+msgid "Forward this item via email"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
+#: ui/evolution-event-editor.xml.h:6
+msgid "Re_fresh Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+msgid "Schedule a meeting for this item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
+#: ui/evolution-executive-summary.xml.h:1
+msgid "Customise My Evolution"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
+#: ui/evolution-mail-global.xml.h:2
+msgid "Cancel the current mail operation"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
+#: ui/evolution-mail-global.xml.h:3
+#, fuzzy
+msgid "Compose"
+msgstr "Colours"
+
+#: ui/evolution-mail-global.xml.h:4
+msgid "Compose _New Message"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
+#: ui/evolution-mail-global.xml.h:13
+msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send / Receive"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
-msgid "Save"
+#: ui/evolution-mail-global.xml.h:22
+msgid "_Preview Pane"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
+#: ui/evolution-mail-list.xml.h:3
+msgid "Copy selected messages"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
+#: ui/evolution-mail-list.xml.h:5
+msgid "Cut selected messages"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:68
-#: ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
+#: ui/evolution-mail-list.xml.h:8
+msgid "Hide _Read Messages"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
-#, fuzzy
-msgid "_Close"
-msgstr "Colours"
+#: ui/evolution-mail-list.xml.h:11
+msgid "Mark all visible messages as read"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:28
-msgid "_Contact (FIXME)"
+#: ui/evolution-mail-list.xml.h:13
+msgid "Paste message in the clipboard"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
+#: ui/evolution-mail-list.xml.h:14
+msgid "Permanently remove all deleted messages from this folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
-msgid "_Help"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
+#: ui/evolution-mail-list.xml.h:19
+msgid "Select all visible messages"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
+#: ui/evolution-mail-list.xml.h:22
+msgid "Temporarily hide all messages that have already been read"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
+#: ui/evolution-mail-list.xml.h:23
+msgid "Temporarily hide the selected messages"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:102
-#: ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:41
-msgid "_Task (FIXME)"
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
+#: ui/evolution-mail-list.xml.h:28
+msgid "_Properties..."
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
+#: ui/evolution-mail-list.xml.h:29
+msgid "_Threaded Message List"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
+#: ui/evolution-mail-message.xml.h:1
+msgid "Apply filter rules to the selected messages"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
+#: ui/evolution-mail-message.xml.h:2
+msgid "Compose a reply to all of the recipients of the selected message"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
+#: ui/evolution-mail-message.xml.h:4
+msgid "Compose a reply to the sender of the selected message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
+#: ui/evolution-mail-message.xml.h:6
+msgid "Copy selected messages to another folder"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:3
-msgid "Change the properties of this folder"
+#: ui/evolution-mail-message.xml.h:7
+msgid "Create _Virtual Folder From Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:4
-#, fuzzy
-msgid "Compose"
-msgstr "Colours"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:6
-msgid "Configure Folder..."
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:9
-msgid "Copy selected messages to another folder"
+#: ui/evolution-mail-message.xml.h:12
+msgid "Create a virtual folder for these recipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:10
-msgid "Create _Virtual Folder From Message"
+#: ui/evolution-mail-message.xml.h:13
+msgid "Create a virtual folder for this mailing list"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:12
-msgid "Delete the selected messages"
+#: ui/evolution-mail-message.xml.h:14
+msgid "Create a virtual folder for this sender"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
+#: ui/evolution-mail-message.xml.h:15
+msgid "Create a virtual folder for this subject"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:15
-msgid "Edit Message"
+#: ui/evolution-mail-message.xml.h:17
+msgid "Display the next important message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:16
-msgid "Edit the current message"
+#: ui/evolution-mail-message.xml.h:18
+msgid "Display the next message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
+#: ui/evolution-mail-message.xml.h:19
+msgid "Display the next unread message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:18
-msgid "Expunge"
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:19
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:21
+msgid "Display the previous important message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:20
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:22
+msgid "Display the previous message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:21
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:23
+msgid "Display the previous unread message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:22
-msgid "Finaly remove all mails tagged for deletion"
+#: ui/evolution-mail-message.xml.h:24
+msgid "Filter on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:23
-msgid "Forget _Passwords"
+#: ui/evolution-mail-message.xml.h:25
+msgid "Filter on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:25
-msgid "Forward As"
+#: ui/evolution-mail-message.xml.h:26
+msgid "Filter on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:27
-msgid "Forward the selected mail to someone"
+#: ui/evolution-mail-message.xml.h:27
+msgid "Filter on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:29
-msgid "Forward this message in-line with your mail, so you can edit it"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:30
-msgid "Full _Headers"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:31
-msgid "Hide Deleted Messages"
+#: ui/evolution-mail-message.xml.h:30
+msgid "Forward As"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:32
-msgid "Hide S_elected Messages"
+#: ui/evolution-mail-message.xml.h:31
+msgid "Forward _Attached"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:33
-msgid "Hide _Deleted Messages"
+#: ui/evolution-mail-message.xml.h:32
+msgid "Forward _Inline"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:34
-msgid "Hide _Read messages"
+#: ui/evolution-mail-message.xml.h:33
+msgid "Forward _Quoted"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:35
-msgid "Invert Selection"
+#: ui/evolution-mail-message.xml.h:34
+msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:36
-msgid "Manage _Subscriptions..."
+#: ui/evolution-mail-message.xml.h:35
+msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:37
-msgid "Mar_k as Read"
+#: ui/evolution-mail-message.xml.h:36
+msgid "Forward the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:38
-msgid "Mark All as R_ead"
+#: ui/evolution-mail-message.xml.h:37
+msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:39
-msgid "Mark As Read"
+#: ui/evolution-mail-message.xml.h:39
+msgid "Load _Images"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:40
-msgid "Mark As U_nread"
+#: ui/evolution-mail-message.xml.h:41
+msgid "Mark as I_mportant"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:41
-msgid "Mark as U_nread"
+#: ui/evolution-mail-message.xml.h:43
+msgid "Mark as Unimp_ortant"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:43
-msgid "Mark the selected messages as not having been read"
+#: ui/evolution-mail-message.xml.h:45
+msgid "Mark the selected messages as important"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:44
-msgid "Move"
+#: ui/evolution-mail-message.xml.h:46
+msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:45
-msgid "Move message to a new folder"
+#: ui/evolution-mail-message.xml.h:47
+msgid "Mark the selected messages as unimportant"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:46
-msgid "Move selected messages to another folder"
+#: ui/evolution-mail-message.xml.h:48
+msgid "Mark the selected messages for deletion"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:47
-msgid "Open in New Window"
+#: ui/evolution-mail-message.xml.h:49
+msgid "Move"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:48
-msgid "Open the current message in a new window"
+#: ui/evolution-mail-message.xml.h:50
+msgid "Move selected messages to another folder"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:53
-msgid "Print Preview of message..."
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:54
-msgid "Print message to the printer"
+#: ui/evolution-mail-message.xml.h:52
+msgid "Next Important Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:55
-msgid "Print message..."
+#: ui/evolution-mail-message.xml.h:53
+msgid "Next Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:58
-msgid "Redirect (FIXME: implement me)"
+#: ui/evolution-mail-message.xml.h:54
+msgid "Next Thread"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:61
-msgid "Reply to _All"
+#: ui/evolution-mail-message.xml.h:55
+msgid "Next Unread Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:62
-msgid "Reply to all"
+#: ui/evolution-mail-message.xml.h:56
+msgid "Open the selected message in a new window"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:64
-msgid "Reply to sender"
+#: ui/evolution-mail-message.xml.h:57
+msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:66
-msgid "S_ource"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:67
-msgid "Save the message into a new file"
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:69 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
+#: ui/evolution-mail-message.xml.h:60
+msgid "Previous Important Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:70
-msgid "Select _Thread"
+#: ui/evolution-mail-message.xml.h:61
+msgid "Previous Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:71
-msgid "Send / Receive"
+#: ui/evolution-mail-message.xml.h:62
+msgid "Previous Unread Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:72
-msgid "Send a reply to the person who sent you this mail"
+#: ui/evolution-mail-message.xml.h:64
+msgid "Print Message..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:73
-msgid "Send a single mail in reply to all the selected mail"
+#: ui/evolution-mail-message.xml.h:65
+msgid "Print Preview..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:74
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
+#: ui/evolution-mail-message.xml.h:66
+msgid "Print this message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:76
-msgid "Send queued mail and retrieve new mail"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:77
-msgid "Show _All"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:79
-msgid "Threaded Message list"
+#: ui/evolution-mail-message.xml.h:71
+msgid "S_earch Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:80
-msgid "Un-delete the selected messages"
+#: ui/evolution-mail-message.xml.h:72
+msgid "Save the message as a text file"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:82
-msgid "VFolder on Se_nder"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:83
-msgid "VFolder on _Recipients"
+#: ui/evolution-mail-message.xml.h:74
+msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:84
-msgid "VFolder on _Subject"
+#: ui/evolution-mail-message.xml.h:75
+msgid "Show Full _Headers"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:85
-msgid "View Raw Message Source"
+#: ui/evolution-mail-message.xml.h:76
+msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:86
-msgid "Virtual Folder _Editor..."
+#: ui/evolution-mail-message.xml.h:77
+msgid "Show message with all email headers"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:87
-msgid "_Apply Filters"
+#: ui/evolution-mail-message.xml.h:78
+msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:88
-msgid "_Attachment"
+#: ui/evolution-mail-message.xml.h:79
+msgid "Un-delete the selected messages"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:89
-msgid "_Copy to Folder..."
+#: ui/evolution-mail-message.xml.h:80
+msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:90
-msgid "_Create Filter From Message"
+#: ui/evolution-mail-message.xml.h:81
+msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:92
-msgid "_Expunge"
+#: ui/evolution-mail-message.xml.h:82
+msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:93
-msgid "_Filters..."
+#: ui/evolution-mail-message.xml.h:83
+msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:94 ui/evolution.xml.h:31
-msgid "_Folder"
+#: ui/evolution-mail-message.xml.h:84
+msgid "_Apply Filters"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:95
-msgid "_Forward"
+#: ui/evolution-mail-message.xml.h:85
+msgid "_Copy to Folder"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:96
-msgid "_Inline"
+#: ui/evolution-mail-message.xml.h:86
+msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:97 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
+#: ui/evolution-mail-message.xml.h:88
+msgid "_Forward Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:98
-msgid "_Mail Message"
+#: ui/evolution-mail-message.xml.h:89
+msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:99
-msgid "_Mail Settings..."
+#: ui/evolution-mail-message.xml.h:90
+msgid "_Move to Folder"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:100
-msgid "_Move to Folder..."
+#: ui/evolution-mail-message.xml.h:91
+msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:101
-msgid "_Open Selected Items"
+#: ui/evolution-mail-message.xml.h:92
+msgid "_Open Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:103
-msgid "_Quoted"
+#: ui/evolution-mail-message.xml.h:93
+msgid "_Re-send Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:104
-msgid "_Reply"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:105
-msgid "_Resend Messages"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:107
-msgid "_Save Message As..."
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:108
-msgid "_Send / Receive"
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:109
-msgid "_Threaded"
-msgstr ""
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+#, fuzzy
+msgid "_Close"
+msgstr "Colours"
 
-#: ui/evolution-mail.xml.h:111
-msgid "_Undelete"
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:5
-msgid "Encrypt this message with PGP"
+msgid "Delete all but signature"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:6
-msgid "F_ormat"
+msgid "Encrypt this message with PGP"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:7
-msgid "HTML"
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:8
-msgid "Insert a file as text into the message"
+msgid "F_ormat"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:9
-msgid "Insert text file..."
+msgid "HTML"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:10
+msgid "Inline Text _File..."
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:11
-msgid "Open a file"
+msgid "Insert a file as text into the message"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:12
+msgid "Insert text file..."
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:14
+msgid "Open a file"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
+msgid "S/MIME Encrypt"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
+msgid "S/MIME Sign"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
-msgid "Save in folder..."
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save the current file with a different name"
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:22
-msgid "Save the message in a specified folder"
+msgid "Save _Draft"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:23
-msgid "Send"
+msgid "Save in folder..."
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:24
-msgid "Send _Later"
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:25
-msgid "Send _later"
+msgid "Save the current file with a different name"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:26
-msgid "Send the mail in HTML format"
+msgid "Save the message in a specified folder"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:27
-msgid "Send the message later"
+msgid "Send"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
+msgid "Send _Later"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:29
-msgid "Send this message now"
+msgid "Send _later"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:30
-msgid "Show / hide attachments"
+msgid "Send the mail in HTML format"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:31
-msgid "Show _attachments"
+msgid "Send the message later"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:32
-msgid "Show attachments"
+msgid "Send this message now"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:33
-msgid "Sign this message with your PGP key"
+msgid "Show / hide attachments"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:34
-msgid "Toggles whether the BCC field is displayed"
+msgid "Show _attachments"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:35
-msgid "Toggles whether the CC field is displayed"
+msgid "Show attachments"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:36
-msgid "Toggles whether the From chooser is displayed"
+msgid "Sign this message with your PGP key"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:37
-msgid "Toggles whether the Reply-To field is displayed"
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:38
+msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:39
-msgid "_Bcc Field"
+msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:40
+msgid "Toggles whether the From chooser is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:41
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:42
+msgid "_Attachment..."
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:43
+msgid "_Bcc Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:45
-msgid "_From Field"
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:47
-msgid "_Insert"
+msgid "_Delete all"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
+#: ui/evolution-message-composer.xml.h:50
+msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
+msgid "_Insert"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr ""
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr ""
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
+#: ui/evolution-task-editor.xml.h:1
+msgid "Cancel Task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
+#: ui/evolution-task-editor.xml.h:3
+msgid "Delegate Task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
+#: ui/evolution-task-editor.xml.h:7
+msgid "Re_fresh Task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
+#: ui/evolution-tasks.xml.h:3
+msgid "Copy selected task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
+#: ui/evolution-tasks.xml.h:4
+msgid "Create a new task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
+#: ui/evolution-tasks.xml.h:5
+msgid "Cut selected task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
+#: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
+#: ui/evolution-tasks.xml.h:8
+msgid "New Task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
+#: ui/evolution-tasks.xml.h:9
+msgid "Paste task from the clipboard"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
+#: ui/evolution-tasks.xml.h:12
+msgid "Save task as something else"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
-msgid "_Appointment (FIXME)"
+#: ui/evolution-tasks.xml.h:13
+msgid "Tasks Settings"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
+#: ui/evolution-tasks.xml.h:19
+msgid "_Task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
+#: ui/evolution.xml.h:1
+msgid "About Evolution..."
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Create a new task"
+#: ui/evolution.xml.h:2
+msgid "Add to _Shortcut Bar"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:3
-msgid "New Task"
+#: ui/evolution.xml.h:3
+msgid "Change the name of this folder"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:5
-msgid "Save task as something else"
-msgstr ""
+#: ui/evolution.xml.h:6
+#, fuzzy
+msgid "Copy this folder"
+msgstr "Synchronising \"%s\""
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
+#: ui/evolution.xml.h:7
+msgid "Create _New Folder..."
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:9
-msgid "_Task"
+#: ui/evolution.xml.h:8
+msgid "Create a link to this folder in the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:1
-msgid "About Evolution..."
+#: ui/evolution.xml.h:9
+msgid "Create a new folder"
 msgstr ""
 
-#: ui/evolution.xml.h:3
-msgid "Close this window"
+#: ui/evolution.xml.h:13
+msgid "Delete this folder"
 msgstr ""
 
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
+#: ui/evolution.xml.h:14
+msgid "Display a different folder"
 msgstr ""
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
+#: ui/evolution.xml.h:15
+msgid "E_xit"
 msgstr ""
 
-#: ui/evolution.xml.h:6
-msgid "Customize toolbars"
+#: ui/evolution.xml.h:16
+msgid "Evolution _FAQ"
 msgstr ""
 
-#: ui/evolution.xml.h:7
-msgid "Display a different folder"
+#: ui/evolution.xml.h:17
+msgid "Evolution _Window"
 msgstr ""
 
-#: ui/evolution.xml.h:8
-msgid "E_xit"
+#: ui/evolution.xml.h:18
+msgid "Exit the program"
 msgstr ""
 
-#: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
+#: ui/evolution.xml.h:19
+msgid "Getting _Started"
 msgstr ""
 
-#: ui/evolution.xml.h:10
-msgid "Exit the program"
+#: ui/evolution.xml.h:20
+msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:11
-msgid "Getting _Started"
+#: ui/evolution.xml.h:22
+msgid "Move this folder to another place"
 msgstr ""
 
-#: ui/evolution.xml.h:12
-msgid "Import an external file format"
+#: ui/evolution.xml.h:24
+msgid "Open in New _Window"
 msgstr ""
 
-#: ui/evolution.xml.h:13
-msgid "Main toolbar"
+#: ui/evolution.xml.h:25
+msgid "Open this folder in an other window"
 msgstr ""
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr ""
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:30
+msgid "Toggle"
+msgstr ""
+
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:33
+msgid "Toggle whether we are working offline."
+msgstr ""
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr ""
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr ""
 
-#: ui/evolution.xml.h:23
-msgid "Work Offline"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:25
-msgid "_Actions"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
 msgstr ""
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr ""
+
+#: ui/evolution.xml.h:44
+msgid "_Copy..."
+msgstr ""
+
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr ""
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr ""
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr ""
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr ""
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:55
+msgid "_Move..."
+msgstr ""
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr ""
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr ""
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:58
+msgid "_Rename..."
+msgstr ""
+
+#: ui/evolution.xml.h:59
+msgid "_Shortcut"
+msgstr ""
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr ""
 
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr ""
+
+#: ui/evolution.xml.h:64
+msgid "_Work Offline"
+msgstr ""
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+msgid "_My Evolution Settings..."
+msgstr ""
+
+#: views/addressbook/galview.xml.h:1
+msgid "Address Cards"
+msgstr ""
+
+#: views/addressbook/galview.xml.h:2
+msgid "By Company"
+msgstr ""
+
+#: views/addressbook/galview.xml.h:3
+msgid "Phone List"
+msgstr ""
+
+#: views/mail/galview.xml.h:1
+msgid "By Sender"
+msgstr ""
+
+#: views/mail/galview.xml.h:2
+msgid "By Status"
+msgstr ""
+
+#: views/mail/galview.xml.h:3
+msgid "By Subject"
+msgstr ""
+
+#: views/mail/galview.xml.h:4
+msgid "Messages"
+msgstr ""
+
+#: views/tasks/galview.xml.h:2
+msgid "With Category"
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 msgid "%A, %B %d, %Y"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
-msgid "Tentative"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 msgid "_Options"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 msgid "Meeting _start time:"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 msgid "Meeting _end time:"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:177
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:196
+#: widgets/menus/gal-view-menus.c:259
 msgid "Define Views"
 msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr ""
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+msgid "Now"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
-msgid "Now"
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:242
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:723
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:166
-msgid "Save Search"
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:237
-msgid "Advanced Search"
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:317
-msgid "Advanced ..."
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:152
-msgid "Information"
+#: widgets/misc/e-charset-picker.c:63
+msgid "Greek"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:173
-msgid "Question"
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:180
-msgid "Message"
+#: widgets/misc/e-charset-picker.c:66
+msgid "Turkish"
 msgstr ""
 
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
-msgid "Don't show this message again."
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:148
-msgid "Sear_ch"
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
 msgstr ""
 
-#: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "Organisation"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
 msgstr ""
 
-#: views/addressbook/galview.xml.h:2
-msgid "By Company"
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
 msgstr ""
 
-#: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#: widgets/misc/e-charset-picker.c:102
+msgid "New"
 msgstr ""
 
-#: views/mail/galview.xml.h:1
-msgid "By Sender"
+#: widgets/misc/e-charset-picker.c:160
+#, c-format
+msgid "Unknown character set: %s"
 msgstr ""
 
-#: views/mail/galview.xml.h:2
-msgid "By Status"
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
 msgstr ""
 
-#: views/mail/galview.xml.h:3
-msgid "By Subject"
+#: widgets/misc/e-charset-picker.c:277
+msgid "Other..."
 msgstr ""
 
-#: views/mail/galview.xml.h:4
-msgid "Messages"
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
 msgstr ""
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: widgets/misc/e-clipped-label.c:112
+msgid "..."
+msgstr ""
+
+#: widgets/misc/e-filter-bar.c:157
+msgid "Search Editor"
+msgstr ""
+
+#: widgets/misc/e-filter-bar.c:173
+msgid "Save Search"
+msgstr ""
+
+#: widgets/misc/e-filter-bar.c:241
+msgid "Advanced Search"
+msgstr ""
+
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr ""
+
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:152
+msgid "Information"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:173
+msgid "Question"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:180
+msgid "Message"
+msgstr ""
+
+#. Add the "Don't show this message again." checkbox
+#: widgets/misc/e-messagebox.c:224
+msgid "Don't show this message again."
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:155
+msgid "Sear_ch"
 msgstr ""
 
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
@@ -8384,13 +11218,36 @@ msgstr "Could not initialise Bonobo"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
+#~ msgid "Colors"
+#~ msgstr "Colours"
+
 #, fuzzy
-#~ msgid "Cannot initialize Evolution's notes component."
+#~ msgid "I don't recognize this type of calendar component."
 #~ msgstr "Cannot initialise Evolution's mail component."
 
 #, fuzzy
-#~ msgid "Notes Component: Could not initialize bonobo"
-#~ msgstr "Could not initialise Bonobo"
+#~ msgid "Organizer: "
+#~ msgstr "Organisation:"
+
+#, fuzzy
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Synchronising \"%s\""
+
+#, fuzzy
+#~ msgid "Close %s"
+#~ msgstr "Colours"
+
+#, fuzzy
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Factory for the test component."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's notes component."
+#~ msgstr "Cannot initialise Evolution's mail component."
 
 #~ msgid "Synchronize"
 #~ msgstr "Synchronise"
@@ -8434,8 +11291,5 @@ msgstr "Could not initialise Bonobo"
 #~ msgid "Synchronize \"%s\""
 #~ msgstr "Synchronise \"%s\""
 
-#~ msgid "Colors for display"
-#~ msgstr "Colours for display"
-
 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr "Cannot initialise Evolution's mail storage hash."
diff --git a/po/es.po b/po/es.po
index cb0a3d5fd1..ee8731f798 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.7.0\n"
-"POT-Creation-Date: 2001-07-10 20:31+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-01-23 16:58-04:00\n"
 "Last-Translator: HИctor GarcМa аlvarez <hector@scouts-es.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -22,11 +22,11 @@ msgstr "FactorМa para importar archivos VCard a Evolution."
 msgid "Imports VCard files into Evolution."
 msgstr "Importa archivos VCard a Evolution."
 
-#: addressbook/backend/ebook/e-card.c:3606
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Tarjeta: "
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -34,7 +34,7 @@ msgstr ""
 "\n"
 "Nombre:"
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -42,7 +42,7 @@ msgstr ""
 "\n"
 "  Prefijo:    "
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -50,7 +50,7 @@ msgstr ""
 "\n"
 "  Dado:       "
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -58,7 +58,7 @@ msgstr ""
 "\n"
 "  Adicional:  "
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -66,7 +66,7 @@ msgstr ""
 "\n"
 "  Familia:    "
 
-#: addressbook/backend/ebook/e-card.c:3613
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -74,7 +74,7 @@ msgstr ""
 "\n"
 "  Sufijo:     "
 
-#: addressbook/backend/ebook/e-card.c:3627
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -82,7 +82,7 @@ msgstr ""
 "\n"
 "Fecha de nacimiento: "
 
-#: addressbook/backend/ebook/e-card.c:3638
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -90,7 +90,7 @@ msgstr ""
 "\n"
 "DirecciСn:"
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -98,7 +98,7 @@ msgstr ""
 "\n"
 "  DirecciСn postal: "
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -106,7 +106,7 @@ msgstr ""
 "\n"
 "  Ext:         "
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -114,7 +114,7 @@ msgstr ""
 "\n"
 "  Calle:       "
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -122,7 +122,7 @@ msgstr ""
 "\n"
 "  Ciudad:      "
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -130,7 +130,7 @@ msgstr ""
 "\n"
 "  RegiСn:      "
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -138,7 +138,7 @@ msgstr ""
 "\n"
 "  CСdigo postal: "
 
-#: addressbook/backend/ebook/e-card.c:3646
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -146,7 +146,7 @@ msgstr ""
 "\n"
 "  PaМs:        "
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
@@ -154,7 +154,7 @@ msgstr ""
 "\n"
 "Etiqueta de envМo: "
 
-#: addressbook/backend/ebook/e-card.c:3671
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -162,7 +162,7 @@ msgstr ""
 "\n"
 "TelИfonos:\n"
 
-#: addressbook/backend/ebook/e-card.c:3674
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -170,7 +170,7 @@ msgstr ""
 "\n"
 "TelИfono:"
 
-#: addressbook/backend/ebook/e-card.c:3698
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -178,7 +178,7 @@ msgstr ""
 "\n"
 "Correo electrСnico:\n"
 
-#: addressbook/backend/ebook/e-card.c:3701
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -186,7 +186,7 @@ msgstr ""
 "\n"
 "Correo electrСnico:"
 
-#: addressbook/backend/ebook/e-card.c:3720
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -194,7 +194,7 @@ msgstr ""
 "\n"
 "Programa de correo: "
 
-#: addressbook/backend/ebook/e-card.c:3726
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -202,7 +202,7 @@ msgstr ""
 "\n"
 "Zona horaria: "
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -210,7 +210,7 @@ msgstr ""
 "\n"
 "LocalizaciСn geogrАfica: "
 
-#: addressbook/backend/ebook/e-card.c:3738
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -218,7 +218,7 @@ msgstr ""
 "\n"
 "Cargo: "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -226,7 +226,7 @@ msgstr ""
 "\n"
 "OrganizaciСn: "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -234,7 +234,7 @@ msgstr ""
 "\n"
 "  Nombre: "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -242,7 +242,7 @@ msgstr ""
 "\n"
 "  Unidad: "
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -250,7 +250,7 @@ msgstr ""
 "\n"
 "  Unidad2: "
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -258,7 +258,7 @@ msgstr ""
 "\n"
 "  Unidad3: "
 
-#: addressbook/backend/ebook/e-card.c:3755
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -266,7 +266,7 @@ msgstr ""
 "\n"
 "  Unidad4: "
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -274,7 +274,7 @@ msgstr ""
 "\n"
 "categorМas: "
 
-#: addressbook/backend/ebook/e-card.c:3760
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -292,7 +292,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3773
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -300,7 +300,7 @@ msgstr ""
 "\n"
 "Cadena Зnica: "
 
-#: addressbook/backend/ebook/e-card.c:3776
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -308,11 +308,11 @@ msgstr ""
 "\n"
 "Llave pЗblica: "
 
-#: addressbook/backend/ebook/e-card.c:4038
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr "VCards MЗltiples"
 
-#: addressbook/backend/ebook/e-card.c:4046
+#: addressbook/backend/ebook/e-card.c:4045
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
@@ -322,9 +322,9 @@ msgstr "VCard para %s"
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "No se puede inicializar Bonobo"
@@ -338,14 +338,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook no esta cargado\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "No se ha podido iniciar el servidor wombat"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "No se puede inicializar wombat"
 
@@ -417,7 +417,7 @@ msgstr "Ninguno (modo anСnimo)"
 #: addressbook/gui/component/addressbook-config.c:165
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:63
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
 msgid "Password"
 msgstr "Clave"
 
@@ -449,13 +449,14 @@ msgstr "Asociar DN:"
 msgid "FIXME Bind DN Help text here"
 msgstr "FIXME Bind DN Help text here"
 
+#. Remember the password?
 #: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
 msgid "Remember this password"
 msgstr "Recuerda esta contraseЯa"
 
 #: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 msgid "Host:"
 msgstr "Servidor:"
 
@@ -492,7 +493,7 @@ msgid "Advanced LDAP Options"
 msgstr "Opciones avanzadas de LDAP"
 
 #: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:69
 msgid "Path:"
 msgstr "Ruta:"
 
@@ -504,15 +505,15 @@ msgstr "FIXME Path Help text here"
 msgid "Create path if it doesn't exist."
 msgstr "Crear ruta si no existe."
 
-#: addressbook/gui/component/addressbook-config.c:662
+#: addressbook/gui/component/addressbook-config.c:663
 msgid "Edit Addressbook"
 msgstr "Editar agenda de direcciones"
 
-#: addressbook/gui/component/addressbook-config.c:664
+#: addressbook/gui/component/addressbook-config.c:665
 msgid "Add Addressbook"
 msgstr "AЯadir agenda de direcciones"
 
-#: addressbook/gui/component/addressbook-config.c:682
+#: addressbook/gui/component/addressbook-config.c:683
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
@@ -520,62 +521,60 @@ msgstr ""
 "Seleccione el tipo de agenda de direcciones que tiene, e introduzca la "
 "informaciСn relevante acerca de ella."
 
-#: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:53 my-evolution/e-summary-preferences.c:887
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr "Nombre:"
 
-#: addressbook/gui/component/addressbook-config.c:689
+#: addressbook/gui/component/addressbook-config.c:692
 msgid "FIXME Name help text here"
 msgstr "FIXME Name help text here"
 
-#: addressbook/gui/component/addressbook-config.c:691
+#: addressbook/gui/component/addressbook-config.c:694
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2
 msgid "Description:"
 msgstr "DescripciСn:"
 
-#: addressbook/gui/component/addressbook-config.c:692
+#: addressbook/gui/component/addressbook-config.c:695
 msgid "FIXME Description help text here"
 msgstr "FIXME Description help text here"
 
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "AЯadir"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
 msgid "Addressbook Sources"
 msgstr "Fuentes de la agenda de direcciones"
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:606
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-#: calendar/gui/dialogs/recurrence-page.glade.h:5 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:8 mail/mail-config.glade.h:27
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-mail-message.xml.h:16 ui/evolution-tasks.xml.h:5
-msgid "Delete"
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
 msgstr "Borrar"
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: filter/filter.glade.h:3 mail/mail-config.glade.h:33
-msgid "Edit"
-msgstr "Editar"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/component/addressbook-config.glade.h:3
 msgid "Name"
 msgstr "Nombre"
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
+#: addressbook/gui/component/addressbook-config.glade.h:4
 msgid "URI"
 msgstr "URI"
 
-#: addressbook/gui/component/addressbook-storage.c:99
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "_AЯadir"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "_Editar"
+
+#: addressbook/gui/component/addressbook-storage.c:118
 msgid "Other Contacts"
 msgstr "Otros contactos"
 
@@ -618,7 +617,7 @@ msgstr ""
 "No pudimos abrir esta agenda de direcciones.  Por favor compruebe\n"
 "que existe la ruta y que tiene permisos para acceder a ella."
 
-#: addressbook/gui/component/addressbook.c:554 calendar/gui/gnome-cal.c:218
+#: addressbook/gui/component/addressbook.c:554
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
@@ -638,30 +637,21 @@ msgstr "La categrМa contiene"
 msgid "The URI that the Folder Browser will display"
 msgstr "La URI que mostrarА el visor de carpetas"
 
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * card.
-#.
-#: addressbook/gui/component/e-address-popup.c:178
-msgid "(none)"
-msgstr "(nada)"
-
 #: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
-#: addressbook/gui/contact-editor/e-contact-editor.c:1476
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
 msgid "Primary Email"
 msgstr "Correo electrСnico principal"
 
 #: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1477
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
 msgid "Email 2"
 msgstr "Correo electrСnico 2"
 
 #: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1478
-#: addressbook/gui/widgets/e-addressbook-view.c:728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
 msgid "Email 3"
 msgstr "Correo electrСnico 3"
 
@@ -691,7 +681,7 @@ msgstr "Editar informaciСn de contacto"
 
 #: addressbook/gui/component/e-address-popup.c:946
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:339
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
 msgid "Add to Contacts"
 msgstr "AЯadir a Contactos"
 
@@ -716,10 +706,13 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "FactorМa para la interfaz de selecciСn de nombre de la Agenda"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:156
-#: addressbook/gui/component/select-names/e-select-names.c:613
+#: addressbook/gui/component/select-names/e-select-names.c:630
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
 #: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:272 shell/e-shortcuts-view.c:475
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
 msgid "Remove"
 msgstr "Quitar"
 
@@ -731,6 +724,15 @@ msgstr "Quitar Todas"
 msgid "Send HTML Mail?"
 msgstr "©Enviar correo en HTML?"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Contactos Modificados:"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Message Recipients"
 msgstr "Lista de destinatarios"
@@ -752,140 +754,139 @@ msgstr "_CategorМa:"
 msgid "_Search"
 msgstr "_Buscar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "Ani_versario:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "T_rabajo"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "_Fax del trabajo"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "C_ontactos..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 #: calendar/gui/dialogs/event-page.glade.h:2
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ca_tegorМas..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
 #: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Detalles"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Archivar como:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "General"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Nuevo tipo de telИfono"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "No_tas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "OrganizaciСn:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Tipos de telИfono"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "Prefiere recibir el correo como _HTML"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "DirecciСn de la pАgina web:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: mail/mail-config.glade.h:102
-msgid "_Add"
-msgstr "_AЯadir"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Address..."
 msgstr "_DirecciСn..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "Nombre del _asistente:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "Fecha de _nacimiento:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Trabajo"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_CompaЯМa:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "_Contactos..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:1293 mail/mail-config.glade.h:103
-#: ui/evolution-mail-message.xml.h:78 ui/evolution-tasks.xml.h:15
-#: ui/evolution.xml.h:45
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "_Departamento:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "_Nombre completo..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_Casa"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "_Puesto:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "Nombre del _manager:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_MСvil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "Nick:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "_Oficina:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_ProfesiСn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "_CСnyuge:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "Es_tА es la direcciСn de correo"
 
@@ -893,95 +894,95 @@ msgstr "Es_tА es la direcciСn de correo"
 msgid "Delete Contact?"
 msgstr "©Borrar contacto?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto estА en estas categorМas:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1434
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Asistente"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1435
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Trabajo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1436
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Trabajo 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1437
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Fax del trabajo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1438
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Rellamada"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1439
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Coche"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1440
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "CompaЯМa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1441
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Casa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Casa 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1443
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Fax de casa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1444
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "RDSI"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1445
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "MСvil"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1446
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: mail/mail-config.glade.h:59
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Otro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1447
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Otro fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1448
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Papel"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1449
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1450
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1451
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1452
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
@@ -994,7 +995,7 @@ msgid "Edit Full"
 msgstr "Editar Todo"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Nombre Completo"
 
@@ -1148,7 +1149,7 @@ msgid "Add Anyway"
 msgstr "AЯadir de todos modos"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Duplicate Contact Detected"
 msgstr "Detectado un Contacto Duplicado"
 
@@ -1169,18 +1170,14 @@ msgstr ""
 "en esta carpeta.  ©Quiere aЯadirlo de todos modos?"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
-msgid "Change Anyway"
-msgstr "Cambiar de todos modos"
-
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Changed Contact:"
 msgstr "Contactos Modificados:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Conflicting Contact:"
 msgstr "Contactos Conflictivos:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -1188,8 +1185,13 @@ msgstr ""
 "La direcciСn o el nombre modificados de este contacto\n"
 "ya existen en esta carpeta.  ©Quiere aЯadirlo de todos modos?"
 
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+#, fuzzy
+msgid "_Change Anyway"
+msgstr "Cambiar de todos modos"
+
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:242
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Buscar"
 
@@ -1321,9 +1323,9 @@ msgstr "Enviar un mensaje al contacto"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
 #: addressbook/gui/widgets/e-addressbook-view.c:604
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-mail-message.xml.h:53
-#: ui/evolution-tasks.xml.h:9 ui/my-evolution.xml.h:2
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Imprimir"
 
@@ -1332,6 +1334,15 @@ msgstr "Imprimir"
 msgid "Print Envelope"
 msgstr "Imprimir cabecera"
 
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Borrar"
+
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
 #: addressbook/gui/widgets/e-addressbook-util.c:68
 #: addressbook/gui/widgets/e-minicard.c:451
@@ -1343,7 +1354,7 @@ msgid "Success"
 msgstr "Exito"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -1351,7 +1362,7 @@ msgstr "Error desconocido"
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:475
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
@@ -1392,131 +1403,131 @@ msgid "Error removing list"
 msgstr "Error eliminando lista"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
 msgid "Error removing card"
 msgstr "Error eliminando tarjeta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:700
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* Pulse aquМ para aЯadir un contacto *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr "Archivar como"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "Correo electrСnico"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "TelИfono Principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr "TelИfono del Asistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "TelИfono del Trabajo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr "TelИfono para rellamadas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "TelИfono de la compaЯМa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "TelИfono de casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "OrganizaciСn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "DirecciСn del trabajo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "DirecciСn de su casa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "TelИfono mСvil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "TelИfono del coche"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "TelИfono del trabajo 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "TelИfono de casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "Otro telИfono"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "Otra direcciСn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:729
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Sitio Web"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "Departamento"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Oficina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "TМtulo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "ProfesiСn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Encargado"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Nick"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "CСnyuge"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr "URL de disponibilidad"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 msgid "Done."
 msgstr "Hecho."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1114
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
 msgid "Removing cards..."
 msgstr "Eliminando tarjetas..."
 
@@ -1567,7 +1578,8 @@ msgid "Dimensions:"
 msgstr "Dimensiones:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Fuente..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1706,18 +1718,23 @@ msgstr "Tipo:"
 msgid "Width:"
 msgstr "Ancho:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Fuente..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Error mientras me comunicaba con el servidor de calendario"
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "No pude leer informaciСn de la aplicaciСn de calendario del pilot"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "No pude leer los datos de la aplicaciСn ToDo de la pilot"
 
@@ -1753,6 +1770,11 @@ msgstr "FactorМa para el control de vista de calendario iTip"
 msgid "Factory for the sample Calendar control"
 msgstr "FactorМa para el control del Calendario de ejemplo"
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "FactorМa para el componente de calendario de Evolution."
+
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
 msgstr "Servicio de notificaciСn de alarmas"
@@ -1761,103 +1783,85 @@ msgstr "Servicio de notificaciСn de alarmas"
 msgid "Factory for the alarm notification service"
 msgstr "Factoria para la alarma del servicio denotificaciСn"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:153
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
 #, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr "NotificaciСn sobre su cita que comienza a las %s y acaba a las %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:157
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
 #, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr "NotificaciСn sobre su cita que comienza a las %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:162
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
 #, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr "NotificaciСn sobre su cita que finaliza a las %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:166
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
 msgid "Notification about your appointment"
 msgstr "NotificaciСn sobre su cita"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:173
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
 #, c-format
 msgid "Notification about your task starting on %s and ending on %s"
 msgstr "NotificaciСn sobre su tarea que comienza a las %s y acaba a las %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:177
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
 #, c-format
 msgid "Notification about your task starting on %s"
 msgstr "NotificaciСn sobre su tarea que comienza a las %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:182
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
 #, c-format
 msgid "Notification about your task ending on %s"
 msgstr "NotificaciСn sobre su tarea que finaliza a las %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:186
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
 msgid "Notification about your task"
 msgstr "NotificaciСn sobre su tarea"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:193
-#, fuzzy, c-format
-msgid "Notification about your journal entry starting on %s and ending on %s"
-msgstr "NotificaciСn sobre su cita en %A %b %d %Y %H:%M"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:197
-#, fuzzy, c-format
-msgid "Notification about your journal entry starting on %s"
-msgstr "NotificaciСn sobre su cita en %A %b %d %Y %H:%M"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:202
-#, fuzzy, c-format
-msgid "Notification about your journal entry ending on %s"
-msgstr "NotificaciСn sobre su cita en %A %b %d %Y %H:%M"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:206
-#, fuzzy
-msgid "Notification about your journal entry"
-msgstr "NotificaciСn sobre su cita en %A %b %d %Y %H:%M"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:285
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarma en %A %b %d %Y %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:301
-msgid "No summary available."
-msgstr "No hay un sumario disponible."
-
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
-msgid "Close"
-msgstr "Cerrar"
+#: ui/evolution-comp-editor.xml.h:1
+msgid "C_lose"
+msgstr "_Cerrar"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Editas una cita"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: calendar/gui/alarm-notify/alarm-queue.c:914
-msgid "Snooze"
+#, fuzzy
+msgid "Snoo_ze"
 msgstr "Recordatorio"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
 msgid "Snooze time (minutes)"
 msgstr "Tiempo de recordatorio (minutos)"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:623
-#: calendar/gui/alarm-notify/alarm-queue.c:922
-#: calendar/gui/alarm-notify/alarm-queue.c:978
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "Editas una cita"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "No hay un sumario disponible."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
 msgid "Reminder of your appointment at "
 msgstr "Recordatorio de su cita a las "
 
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "Recordatorio"
+
 #. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:927
-#: calendar/gui/alarm-notify/alarm-queue.c:982
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
 msgid "Ok"
 msgstr "Ok"
 
@@ -1882,126 +1886,149 @@ msgstr "No se puede inicializar gnome-vfs"
 msgid "Could not create the alarm notify service factory"
 msgstr "No pude crear la factorМa del servicio de la alarma de notificaciСn"
 
-#: calendar/gui/calendar-commands.c:278
-msgid "File not found"
-msgstr "Archivo no encontrado"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A %d de %B"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a, %d de %b de %Y"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a, %d de %b de %Y"
 
-#: calendar/gui/calendar-commands.c:302
-msgid "Open calendar"
-msgstr "Abrir calendario"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:344
-msgid "Save calendar"
-msgstr "Guardar calendario"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: calendar/gui/calendar-commands.c:596
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "No pude mostrar el calendario.  Por favor compruebe su ORBit y su OAF."
 
-#: calendar/gui/calendar-model.c:379 calendar/gui/calendar-model.c:974
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "PЗblico"
 
-#: calendar/gui/calendar-model.c:382 calendar/gui/calendar-model.c:976
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:978
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:388 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
 #: calendar/gui/dialogs/alarm-page.c:385
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: calendar/gui/calendar-model.c:479
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:479
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:481
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:481
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:519 calendar/gui/calendar-model.c:1150
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
 #: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:448 mail/message-list.c:625
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Alta"
 
-#: calendar/gui/calendar-model.c:521 calendar/gui/calendar-model.c:1152
-#: calendar/gui/calendar-model.c:1675
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:449 mail/message-list.c:624
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:523 calendar/gui/calendar-model.c:1154
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:450 mail/message-list.c:623
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Baja"
 
-#: calendar/gui/calendar-model.c:559 calendar/gui/calendar-model.c:1206
-#: calendar/gui/e-calendar-table.c:502
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Transparente"
 
-#: calendar/gui/calendar-model.c:562 calendar/gui/calendar-model.c:1208
-#: calendar/gui/e-calendar-table.c:501
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Opaco"
 
-#: calendar/gui/calendar-model.c:711 calendar/gui/calendar-model.c:1260
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
 #: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:522
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Sin comenzando"
 
-#: calendar/gui/calendar-model.c:714 calendar/gui/calendar-model.c:1262
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
 #: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:523
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "En proceso"
 
-#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1264
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:524
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "Completado"
 
-#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1266
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
 #: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:525 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Cancelar"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:870 e-util/e-time-utils.c:267
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:873 e-util/e-time-utils.c:276
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:878
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2012,27 +2039,28 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:958
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 "La clasificaciСn debe ser 'PЗblica', 'Privada', 'Confidencial' o 'Ninguna'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:972 calendar/gui/calendar-model.c:1204
-#: calendar/gui/calendar-model.c:1258
-#: calendar/gui/dialogs/e-timezone-dialog.c:197
-#: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:425 calendar/gui/e-calendar-table.c:500
-#: mail/mail-account-gui.c:1360 mail/mail-accounts.c:129
-#: mail/mail-accounts.c:380 mail/mail-config.glade.h:56
-#: shell/e-shell-view.c:1402 widgets/misc/e-cell-date-edit.c:240
-#: widgets/misc/e-dateedit.c:439 widgets/misc/e-dateedit.c:1369
-#: widgets/misc/e-dateedit.c:1484
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Ninguno"
 
-#: calendar/gui/calendar-model.c:1054
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2042,38 +2070,42 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1094
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "El valor del porcentaje debe estar entre 0 y 100"
 
-#: calendar/gui/calendar-model.c:1135
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "La prioridad debe ser 'Alta', 'Normal', 'Baja' o 'Indefinida'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1148
+#: calendar/gui/calendar-model.c:1181
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:451
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Sin definir"
 
-#: calendar/gui/calendar-model.c:1189
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "La transparencia debe ser 'Transparente', 'Opaca' o 'Ninguna'."
 
-#: calendar/gui/calendar-model.c:1677
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "Recurriendo"
 
-#: calendar/gui/calendar-model.c:1679
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Asignado"
 
-#: calendar/gui/calendar-model.c:1685
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Si"
 
-#: calendar/gui/calendar-model.c:1685
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "No"
 
@@ -2145,7 +2177,7 @@ msgstr "Ejecutar programa:"
 msgid "With these arguments:"
 msgstr "Con estos argumentos:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:81
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
 msgid "days"
 msgstr "dМas"
 
@@ -2153,11 +2185,11 @@ msgstr "dМas"
 msgid "extra times every"
 msgstr "extra tiempo cada"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:82
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
 msgid "hours"
 msgstr "horas"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
 msgid "minutes"
 msgstr "minutos"
 
@@ -2207,78 +2239,81 @@ msgid "1 second"
 msgstr "1 segundo"
 
 #: calendar/gui/dialogs/alarm-page.c:331
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Tocar un sonido"
 
 #: calendar/gui/dialogs/alarm-page.c:335
-msgid "Show a dialog"
-msgstr "Mostrar un diАlogo"
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+msgid "Display a message"
+msgstr "Mostrar un mensaje"
 
 #: calendar/gui/dialogs/alarm-page.c:339
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
 msgstr "Enviar un correo"
 
 #: calendar/gui/dialogs/alarm-page.c:343
-#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Ejecutar un programa"
 
 #: calendar/gui/dialogs/alarm-page.c:361
-msgid " before start of appointment"
+#, fuzzy
+msgid "before start of appointment"
 msgstr "antes del inicio de la cita"
 
 #: calendar/gui/dialogs/alarm-page.c:364
-msgid " after start of appointment"
+#, fuzzy
+msgid "after start of appointment"
 msgstr "tras el inicio de la cita"
 
 #: calendar/gui/dialogs/alarm-page.c:374
-msgid " before end of appointment"
+#, fuzzy
+msgid "before end of appointment"
 msgstr "antes del fin de la cita"
 
 #: calendar/gui/dialogs/alarm-page.c:377
-msgid " after end of appointment"
+#, fuzzy
+msgid "after end of appointment"
 msgstr "tras el fin de la cita"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #: calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "Basics"
 msgstr "Bases"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-itip-control.c:293
+#: calendar/gui/e-itip-control.c:298
 msgid "Date/Time:"
 msgstr "Fecha/Hora:"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:5
-msgid "Display a message"
-msgstr "Mostrar un mensaje"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Options..."
-msgstr "OpciСnes..."
-
-#: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Reminders"
 msgstr "Recordatorios"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-itip-control.c:282 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumen:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "OpciСnes..."
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
 msgid "after"
 msgstr "despuИs de"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:36
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
 msgid "before"
 msgstr "antes"
 
@@ -2295,7 +2330,7 @@ msgstr "fin de la cita"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:105
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -2336,8 +2371,7 @@ msgid "Beep when alarm windows appear."
 msgstr "Pitar cuando aparezca la ventana de la alarma."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: my-evolution/my-evolution.glade.h:6 shell/e-shortcuts.c:1014
-#: ui/evolution-calendar.xml.h:4
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Calendario"
 
@@ -2370,7 +2404,7 @@ msgid "Defaults"
 msgstr "Valores predeterminados"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:30
 msgid "Display"
 msgstr "Mostrar"
 
@@ -2387,7 +2421,7 @@ msgid "Fri"
 msgstr "Vier"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:985
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Viernes"
 
@@ -2396,7 +2430,7 @@ msgid "Mon"
 msgstr "Lun"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:981
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Lunes"
 
@@ -2417,7 +2451,7 @@ msgid "Sat"
 msgstr "Sab"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:986
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "SАbado"
 
@@ -2439,7 +2473,7 @@ msgid "Sun"
 msgstr "Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:987
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -2456,7 +2490,7 @@ msgid "Thu"
 msgstr "Jue"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:984
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Jueves"
 
@@ -2481,7 +2515,7 @@ msgid "Tue"
 msgstr "Mar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:982
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Martes"
 
@@ -2490,7 +2524,7 @@ msgid "Wed"
 msgstr "Mier"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:983
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "MiИrcoles"
 
@@ -2564,60 +2598,60 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  No ha realizado cambios, ©actualizar el editor?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:155
-#: calendar/gui/e-itip-control.c:546 calendar/gui/print.c:2237
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
 msgid " to "
 msgstr " a "
 
-#: calendar/gui/dialogs/comp-editor-util.c:159
-#: calendar/gui/e-itip-control.c:550 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
 msgid " (Completed "
 msgstr "(Completado "
 
-#: calendar/gui/dialogs/comp-editor-util.c:161
-#: calendar/gui/e-itip-control.c:552 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
 msgid "Completed "
 msgstr "Completado "
 
-#: calendar/gui/dialogs/comp-editor-util.c:166
-#: calendar/gui/e-itip-control.c:557 calendar/gui/print.c:2248
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
 msgid " (Due "
 msgstr " (Falta "
 
-#: calendar/gui/dialogs/comp-editor-util.c:168
-#: calendar/gui/e-itip-control.c:559 calendar/gui/print.c:2250
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
 msgid "Due "
 msgstr "Falta "
 
-#: calendar/gui/dialogs/comp-editor.c:448
+#: calendar/gui/dialogs/comp-editor.c:449
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/dialogs/comp-editor.c:453
+#: calendar/gui/dialogs/comp-editor.c:454
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:456
+#: calendar/gui/dialogs/comp-editor.c:457
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:459
+#: calendar/gui/dialogs/comp-editor.c:460
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada del diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:473
+#: calendar/gui/dialogs/comp-editor.c:474
 msgid "No summary"
 msgstr "Sin resumen"
 
-#: calendar/gui/dialogs/comp-editor.c:805 mail/mail-callbacks.c:1462
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
 #: mail/mail-display.c:98
 msgid "Overwrite file?"
 msgstr "©Sobreescribir archivo?"
 
-#: calendar/gui/dialogs/comp-editor.c:809 mail/mail-callbacks.c:1466
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
 #: mail/mail-display.c:102
 msgid ""
 "A file by that name already exists.\n"
@@ -2626,12 +2660,12 @@ msgstr ""
 "Ya existe una archivo con ese nombre.\n"
 "©Sobreescribirlo?"
 
-#: calendar/gui/dialogs/comp-editor.c:872 ui/evolution-comp-editor.xml.h:14
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1025
+#: calendar/gui/dialogs/comp-editor.c:1026
 msgid "Unable to obtain current version!"
 msgstr "║Imposible obtener versiСn actual!"
 
@@ -2695,8 +2729,8 @@ msgid ""
 "zone.\n"
 " Use the right mouse button to zoom out."
 msgstr ""
-"Use el botСn izquierdo del ratСn para hacer zoom en un area del mapa y"
-"seleccionar una zona horaria.\n"
+"Use el botСn izquierdo del ratСn para hacer zoom en un area del mapa "
+"yseleccionar una zona horaria.\n"
 " Use el botСn derecho del ratСn para salir del zoom."
 
 #: calendar/gui/dialogs/event-editor.c:154
@@ -2722,7 +2756,7 @@ msgstr "Evento para todo e_l dМa"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:248
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "ClasificaciСn"
 
@@ -2751,11 +2785,6 @@ msgstr "Resu_men:"
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:20
-msgid "_Contacts..."
-msgstr "_Contactos..."
-
 #: calendar/gui/dialogs/event-page.glade.h:10
 msgid "_End time:"
 msgstr "Hora de _fin:"
@@ -2764,89 +2793,273 @@ msgstr "Hora de _fin:"
 msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Nombre del grupo:"
+
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Fuente"
+
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+#, fuzzy
+msgid "Chair"
+msgstr "Coche"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+#, fuzzy
+msgid "Required Participant"
+msgstr "InformaciСn Requerida"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+#, fuzzy
+msgid "Optional Participant"
+msgstr "InformaciСn Opcional"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Elija un archivo"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Accepted"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr "Borrado"
+
 #: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Tentativa"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Borrado"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "En proceso"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "TelИfono del coche"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "InformaciСn Requerida"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "InformaciСn Opcional"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Non-Participants"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:891
 msgid "Sent By:"
 msgstr "Enviado Por:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:1
-msgid "Change Organizer"
-msgstr "Cambiar Organizador"
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "Delegado A:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Invite Others"
-msgstr "Invitar a Otros"
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#, fuzzy
+msgid "Attendee"
+msgstr "Todos los participantes"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
+msgstr "Fecha de vencimiento"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "Delegado Por:"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "Delegado A:"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "Encargado"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "Miembros"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#, fuzzy
+msgid "Role"
+msgstr "Reglas"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Estado"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Tipo"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizador:"
 
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Cambiar Organizador"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "Invitar a Otros"
+
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "Other Organizer"
+#, fuzzy
+msgid "_Other Organizer"
 msgstr "Otro Organizador"
 
-#: calendar/gui/dialogs/recurrence-page.c:434 calendar/gui/print.c:1978
-#: calendar/gui/print.c:1980 calendar/gui/print.c:1981
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/dialogs/recurrence-page.c:582
+#: calendar/gui/dialogs/recurrence-page.c:584
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita tiene recurrencias que no pueden ser editadas por Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:938
 msgid "on"
 msgstr "en"
 
-#: calendar/gui/dialogs/recurrence-page.c:980 filter/filter-datespec.c:81
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
 msgid "day"
 msgstr "dМa"
 
-#: calendar/gui/dialogs/recurrence-page.c:1110
+#: calendar/gui/dialogs/recurrence-page.c:1094
 msgid "on the"
 msgstr "en el"
 
-#: calendar/gui/dialogs/recurrence-page.c:1118
+#: calendar/gui/dialogs/recurrence-page.c:1102
 msgid "th"
 msgstr "╨"
 
-#: calendar/gui/dialogs/recurrence-page.c:1288
+#: calendar/gui/dialogs/recurrence-page.c:1274
 msgid "occurrences"
 msgstr "ocurrencias"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Custom recurrence"
 msgstr "Recurrencia personalizada"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Cada"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Exceptions"
 msgstr "Excepciones"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "Modify"
-msgstr "Modificar"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "No recurrence"
 msgstr "Sin recurrencia"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Preview"
 msgstr "Vista previa"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "Recurrence Rule"
 msgstr "Regla de recurrencia"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "Simple recurrence"
 msgstr "Recurrencia simple"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "Modificar"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "para"
@@ -2904,7 +3117,7 @@ msgid "No one"
 msgstr "Ninguno"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:895
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
@@ -2937,155 +3150,168 @@ msgstr "_Prioridad:"
 msgid "_Status:"
 msgstr "E_stado:"
 
-#: calendar/gui/e-calendar-table.c:247
-msgid "Categories"
-msgstr "CategorМas"
-
-#: calendar/gui/e-calendar-table.c:249
-msgid "Completion Date"
-msgstr "Fecha de vencimiento"
-
-#: calendar/gui/e-calendar-table.c:250
-msgid "End Date"
-msgstr "Fecha fin"
-
-#: calendar/gui/e-calendar-table.c:251
-msgid "Start Date"
-msgstr "Fecha de Inicio"
-
-#: calendar/gui/e-calendar-table.c:252
-msgid "Due Date"
-msgstr "Fecha de plazo"
-
-#: calendar/gui/e-calendar-table.c:253
-msgid "Geographical Position"
-msgstr "PosiciСn geogrАfica"
-
-#: calendar/gui/e-calendar-table.c:254
-msgid "Percent complete"
-msgstr "Porcentaje completado"
-
-#: calendar/gui/e-calendar-table.c:255
-msgid "Priority"
-msgstr "Prioridad"
-
-#: calendar/gui/e-calendar-table.c:256
-msgid "Summary"
-msgstr "Resumen"
-
-#: calendar/gui/e-calendar-table.c:257
-msgid "Transparency"
-msgstr "Transparencia"
-
-#: calendar/gui/e-calendar-table.c:258
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:259
-msgid "Alarms"
-msgstr "Alarmas"
-
-#: calendar/gui/e-calendar-table.c:260
-msgid "Click here to add a task"
-msgstr "Pulse aquМ para aЯadir una tarea"
-
-#: calendar/gui/e-calendar-table.c:470
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:472
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:473
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:474
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:475
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:477
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:478
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:479
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:480
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:957
-msgid "Edit this task"
-msgstr "Editar esta tarea"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-calendar-table.c:968
-#: calendar/gui/e-day-view.c:3316 calendar/gui/e-week-view.c:3161
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-calendar.xml.h:10
-#: ui/evolution-mail-list.xml.h:4
-msgid "Cut"
-msgstr "Cortar"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "C_ortar"
 
-#: calendar/gui/e-calendar-table.c:959 calendar/gui/e-calendar-table.c:969
-#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3163
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-calendar.xml.h:5
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:5
-msgid "Copy"
-msgstr "Copiar"
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-calendar-table.c:970
-#: calendar/gui/e-day-view.c:3291 calendar/gui/e-day-view.c:3320
-#: calendar/gui/e-week-view.c:3137 calendar/gui/e-week-view.c:3165
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:26
-#: ui/evolution-mail-list.xml.h:12
-msgid "Paste"
-msgstr "Pegar"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "_Pegar"
 
-#: calendar/gui/e-calendar-table.c:962
-msgid "Mark as complete"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
 msgstr "Marcar como completa"
 
-#: calendar/gui/e-calendar-table.c:963
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Borrar esta tarea"
 
-#: calendar/gui/e-calendar-table.c:972
-msgid "Mark tasks as complete"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
 msgstr "Marcar tareas como completas"
 
-#: calendar/gui/e-calendar-table.c:973 ui/evolution-tasks.xml.h:6
-msgid "Delete selected tasks"
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Borrar las tareas seleccionadas"
 
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "Pulse aquМ para aЯadir una tarea"
+
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% Comp_leto:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Alarmas"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "CategorМas"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "Completo"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "Fecha de vencimiento"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "Fecha de plazo"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Fecha fin"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "PosiciСn geogrАfica"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Prioridad"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Fecha de Inicio"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "Resumen"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "Lista de Tareas"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "Transparencia"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
 #: calendar/gui/e-day-view-time-item.c:519
 #, c-format
 msgid "%02i minute divisions"
@@ -3093,153 +3319,148 @@ msgstr "%02i divisiСnes por minuto"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1328
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1602
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d de %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:289 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr "%a, %d de %b de %Y"
-
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1355
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d de %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:575 calendar/gui/e-week-view.c:308
-#: calendar/gui/print.c:785
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:578 calendar/gui/e-week-view.c:311
-#: calendar/gui/print.c:787
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3296 ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Nueva cita"
 
-#: calendar/gui/e-day-view.c:3298 calendar/gui/e-week-view.c:3144
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "Nuevo evento para todo el dМa"
 
-#: calendar/gui/e-day-view.c:3303 calendar/gui/e-week-view.c:3149
-msgid "Go to Today"
-msgstr "Ir a hoy"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "Ir a _hoy"
 
-#: calendar/gui/e-day-view.c:3305 calendar/gui/e-week-view.c:3151
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "Ir a una fecha..."
 
-#: calendar/gui/e-day-view.c:3312 calendar/gui/e-week-view.c:3157
-#: shell/e-shortcuts-view.c:468 ui/evolution-calendar.xml.h:24
-#: ui/evolution-message-composer.xml.h:12
-msgid "Open"
-msgstr "Abrir"
-
-#: calendar/gui/e-day-view.c:3314 calendar/gui/e-week-view.c:3159
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Borrar esta Cita"
 
-#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3179
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Hacer esta Ocurrencia Movible"
 
-#: calendar/gui/e-day-view.c:3331 calendar/gui/e-week-view.c:3181
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "Borrar esta Ocurrencia"
 
-#: calendar/gui/e-day-view.c:3333
-msgid "Delete all Occurrences"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "Borrar todas las Ocurrencias"
 
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:694
 msgid "This is an event that can be added to your calendar."
 msgstr "Este es un evento que puede ser aЯadido a su calendario."
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:697
 msgid "This is a meeting request."
 msgstr "Esta es una peticiСn de reuniСn."
 
-#: calendar/gui/e-itip-control.c:619
+#: calendar/gui/e-itip-control.c:700
 msgid "This is one or more additions to a current meeting."
 msgstr "Esto es una o mАs adiciones a su encuentro actual."
 
-#: calendar/gui/e-itip-control.c:622
+#: calendar/gui/e-itip-control.c:703
 msgid "This is a request for the latest event information."
 msgstr "Esta es una peticiСn sobre la Зltima infromaciСn del evento."
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:706
 msgid "This is a reply to a meeting request."
 msgstr "Esta es una respuesta a una peticiСn de encuentro."
 
-#: calendar/gui/e-itip-control.c:628
+#: calendar/gui/e-itip-control.c:709
 msgid "This is an event cancellation."
 msgstr "Esta es la cancelaciСn de un evento."
 
-#: calendar/gui/e-itip-control.c:631 calendar/gui/e-itip-control.c:670
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 msgid "The message is not understandable."
 msgstr "Este mensaje no es comprensible."
 
-#: calendar/gui/e-itip-control.c:655
+#: calendar/gui/e-itip-control.c:737
 msgid "This is an task that can be added to your calendar."
 msgstr "Esta es una tarea que puede ser aЯadida a su calendario."
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:740
 msgid "This is a task request."
 msgstr "Esta es una peticiСn de tarea."
 
-#: calendar/gui/e-itip-control.c:661
+#: calendar/gui/e-itip-control.c:743
 msgid "This is a request for the latest task information."
 msgstr "Esta es una peticiСn para la Зltima informaciСn de la tarea."
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:746
 msgid "This is a reply to a task request."
 msgstr "Esta es una respuesta a una peticiСn de tarea."
 
-#: calendar/gui/e-itip-control.c:667
+#: calendar/gui/e-itip-control.c:749
 msgid "This is an task cancellation."
 msgstr "Esto es una cancelaciСn de tarea."
 
-#: calendar/gui/e-itip-control.c:689
+#: calendar/gui/e-itip-control.c:771
 msgid "This is freebusy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:692
+#: calendar/gui/e-itip-control.c:774
 msgid "This is a request for freebusy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:777
 msgid "This is a reply to a freebusy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:834
 msgid "The message does not appear to be properly formed"
 msgstr "Este mensaje no parece haber sido creado correctamente"
 
-#: calendar/gui/e-itip-control.c:737
+#: calendar/gui/e-itip-control.c:853
 msgid "The message contains only unsupported requests."
 msgstr "Este mensaje solo contiene peticiones no soportadas."
 
-#: calendar/gui/e-itip-control.c:753
+#: calendar/gui/e-itip-control.c:877
 msgid "The information contained in this attachment was not valid"
 msgstr "La informaciСn dentro de este adjunto no era vАlida"
 
-#: calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:989
 msgid "I couldn't update your calendar file!\n"
 msgstr "║No pude actualizar el archivo de su calendario!\n"
 
-#: calendar/gui/e-itip-control.c:894
+#: calendar/gui/e-itip-control.c:1015
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "║No pude quitar el elemento del archivo de su calendario!\n"
 
@@ -3280,21 +3501,21 @@ msgstr "fecha de fin"
 msgid "date-start"
 msgstr "fecha de inicio"
 
-#: calendar/gui/e-tasks.c:184 calendar/gui/e-tasks.c:521
-#: calendar/gui/e-tasks.c:554
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "Todo"
 
-#: calendar/gui/e-tasks.c:190
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "CategorМas:"
 
-#: calendar/gui/e-tasks.c:329
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "No puedo cargar las tareas en `%s'"
 
-#: calendar/gui/e-tasks.c:341
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "El mИtodo necesario para cargar `%s' no esta soportado"
@@ -3302,41 +3523,22 @@ msgstr "El mИtodo necesario para cargar `%s' no esta soportado"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1586
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
 #: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d de %B"
 
-#: calendar/gui/e-week-view.c:3142 calendar/gui/e-week-view.c:3170
-msgid "New Appointment..."
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
 msgstr "Nueva Cita..."
 
-#: calendar/gui/e-week-view.c:3183
-msgid "Delete All Occurrences"
-msgstr "Borrar todas las Ocurrencias"
-
-#: calendar/gui/gnome-cal.c:219
-msgid "Summary contains"
-msgstr "El resumen contiene"
-
-#: calendar/gui/gnome-cal.c:220
-msgid "Description contains"
-msgstr "La descripciСn contiene"
-
-#: calendar/gui/gnome-cal.c:221
-msgid "Comment contains"
-msgstr "El comentario contiene"
-
-#: calendar/gui/gnome-cal.c:222
-msgid "Has category"
-msgstr "Tiene la categorМa"
-
-#: calendar/gui/gnome-cal.c:1054
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "No puedo abrir la carpeta en `%s'"
 
-#: calendar/gui/gnome-cal.c:1065
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "El mИtodo necesario para abrir `%s' no esta soportado"
@@ -3362,251 +3564,255 @@ msgid "Go To Date"
 msgstr "Ir a una fecha"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Ir a hoy"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Enero"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "Julio"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "Junio"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "Marzo"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "Mayo"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "Noviembre"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "Octubre"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Septiembre"
 
-#: calendar/gui/itip-utils.c:211
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Ir a hoy"
+
+#: calendar/gui/itip-utils.c:224
 msgid "An organizer must be set."
 msgstr "Debe especificar un organizador."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1╨"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2╨"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3╨"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4╨"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5╨"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6╨"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7╨"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8╨"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9╨"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10╨"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11╨"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12╨"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13╨"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14╨"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15╨"
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16╨"
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17╨"
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18╨"
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19╨"
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20╨"
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21╨"
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22╨"
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23╨"
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24╨"
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25╨"
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26╨"
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27╨"
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28╨"
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29╨"
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30╨"
 
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31╨"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Lun"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Mar"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "Mier"
 
-#: calendar/gui/print.c:517
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Jue"
 
-#: calendar/gui/print.c:517
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Vier"
 
-#: calendar/gui/print.c:517
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "Sab"
 
-#: calendar/gui/print.c:1847 my-evolution/e-summary-tasks.c:156
-#: my-evolution/e-summary-tasks.c:172 shell/e-shortcuts.c:1015
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tareas"
 
 #. Day
-#: calendar/gui/print.c:1954
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "DМa actual (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1973 calendar/gui/print.c:1977
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1974
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1985
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Semana actual (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1993
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Mes actual (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:2000
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "AЯo actual (%Y)"
 
-#: calendar/gui/print.c:2321
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Imprimir calendario"
 
-#: calendar/gui/print.c:2409 calendar/gui/print.c:2501
-#: mail/mail-callbacks.c:1798 my-evolution/e-summary.c:478
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:31
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Vista previa"
 
-#: calendar/gui/print.c:2438
+#: calendar/gui/print.c:2317
 msgid "Print Item"
 msgstr "Imprimir Elemento"
 
-#: calendar/gui/print.c:2519
+#: calendar/gui/print.c:2398
 msgid "Print Setup"
 msgstr "Configurar impresiСn"
 
-#: calendar/gui/tasks-control.c:122
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "La URI que mostrarА la carpeta de tareas"
 
@@ -3699,56 +3905,51 @@ msgstr "Resincronizando con el servidor"
 msgid "You must be working online to complete this operation"
 msgstr "Debe estar trabajando en lМnea para competar esta operaciСn"
 
-#: camel/camel-filter-driver.c:526 camel/camel-filter-driver.c:535
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "Sincronizando carpetas"
 
-#: camel/camel-filter-driver.c:635
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr "No pude abrir la carpeta temporal"
 
-#: camel/camel-filter-driver.c:644
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr "No pude procesar la carpeta temporal"
 
-#: camel/camel-filter-driver.c:658
-#, c-format
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "Obteniendo mensaje %d (%d%%)"
 
-#: camel/camel-filter-driver.c:662 camel/camel-filter-driver.c:672
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, c-format
 msgid "Failed on message %d"
 msgstr "Error en el mensaje %d"
 
-#: camel/camel-filter-driver.c:663
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "No puedo abrir el mensaje"
 
-#: camel/camel-filter-driver.c:683 camel/camel-filter-driver.c:794
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "Sincronizando carpeta"
 
-#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:799
-msgid "Complete"
-msgstr "Completo"
-
-#: camel/camel-filter-driver.c:753
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Obteniendo mensaje %d de %d"
 
-#: camel/camel-filter-driver.c:758 camel/camel-filter-driver.c:776
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Error en el mensaje %d de %d"
 
-#: camel/camel-filter-driver.c:876
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error parseando filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:882
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error ejecutando filtro: %s: %s"
@@ -3790,10 +3991,12 @@ msgid "Invalid type in body-contains, expecting string"
 msgstr "Tipo invАlido en el contenido del cuerpo, esperando una cadena"
 
 #: camel/camel-lock-client.c:110
+#, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "No pude crear un conducto(pipe) para la ayuda: %s"
 
 #: camel/camel-lock-client.c:123
+#, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "No puedo hacer un fork del ayudante de bloqueo: %s"
 
@@ -3803,6 +4006,7 @@ msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "No puedo bloquear '%s': error de protocolo con el ayudante de bloqueo"
 
 #: camel/camel-lock-client.c:212
+#, c-format
 msgid "Could not lock '%s'"
 msgstr "No puedo bloquear '%s'"
 
@@ -3827,56 +4031,56 @@ msgstr "Fallo al hacer un lock usando fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Fallo al hacer un lock usando flock(2): %s"
 
-#: camel/camel-movemail.c:104
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "No pude comprobar el archivo de correo %s: %s"
 
-#: camel/camel-movemail.c:118
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "No pude abrir el archivo de correo %s: %s"
 
-#: camel/camel-movemail.c:126
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "No pude abrir el archivo de correo temporal %s: %s"
 
-#: camel/camel-movemail.c:151
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Error leyendo el archivo de correo: %s"
-
-#: camel/camel-movemail.c:162
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Error escribiendo en el archivo temporal de correo: %s"
-
-#: camel/camel-movemail.c:181
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "FallС al guardar el correo en al archivo temporal %s: %s"
 
-#: camel/camel-movemail.c:211
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "No pude crear un conducto(pipe): %s"
 
-#: camel/camel-movemail.c:223
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "No se puede hacer un fork: %s"
 
-#: camel/camel-movemail.c:261
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "El programa Movemail ha fallado: %s"
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Error desconocido)"
 
-#: camel/camel-movemail.c:492
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Error leyendo el archivo de correo: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Error escribiendo en el archivo temporal de correo: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Error copiando el correo al archivo temporal: %s"
@@ -3963,7 +4167,7 @@ msgid "Connection cancelled"
 msgstr "ConexiСn cancelada"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:270
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "No pude conectar con %s (puerto %d): %s"
@@ -3972,13 +4176,13 @@ msgstr "No pude conectar con %s (puerto %d): %s"
 msgid "(unknown host)"
 msgstr "(servidor desconocido)"
 
-#: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
-#: camel/camel-remote-store.c:470
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "OperaciСn cancelada"
 
-#: camel/camel-remote-store.c:476
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "El servidor se desconectС inesperadamente"
 
@@ -4089,7 +4293,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:438
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "Respuesta de autentificaciСn errСnea desde el servidor."
 
@@ -4158,7 +4362,7 @@ msgstr "Para leer correo como una bЗsqueda de otras carpetas"
 msgid "No provider available for protocol `%s'"
 msgstr "No hay proveedor para el protocolo `%s'"
 
-#: camel/camel-session.c:479
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4204,12 +4408,6 @@ msgstr "Error al docodificar el mensaje."
 msgid "Failed to verify certificates."
 msgstr "Error al verificar el certificado."
 
-#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:987 mail/mail-ops.c:994
-#: mail/mail-ops.c:1012 mail/mail-ops.c:1013
-msgid "Trash"
-msgstr "Papelera"
-
 #: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
@@ -4273,26 +4471,26 @@ msgstr "No existe el mensaje: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "No puede copiar mensajes de esta papelera."
 
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Respuesta inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "El comando IMAP ha fallado: %s"
 
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "La respuesta del servidor terminС demasiado pronto."
 
-#: camel/providers/imap/camel-imap-command.c:493
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "La respuesta del servidor IMAP no contenМa informaciСn de %s"
 
-#: camel/providers/imap/camel-imap-command.c:530
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "El servidor IMAP inesperadamente a respondido OK: %s"
@@ -4311,16 +4509,28 @@ msgstr "No puedo cargar el resumen de %s"
 msgid "Folder was destroyed and recreated on server."
 msgstr "La carpeta fue destruida y recreada en el servidor."
 
-#: camel/providers/imap/camel-imap-folder.c:430
-msgid "Scanning IMAP folder"
-msgstr "Escaneando carpeta IMAP"
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "Guardando mensajes"
 
-#: camel/providers/imap/camel-imap-folder.c:1483
-#: camel/providers/imap/camel-imap-folder.c:1763
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "Este mensaje no estА disponible actualmente"
 
-#: camel/providers/imap/camel-imap-folder.c:1796
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Guardando mensajes"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "No pude encontrar el cuerpo del mensaje en la respuesta de FETCH"
 
@@ -4329,7 +4539,7 @@ msgstr "No pude encontrar el cuerpo del mensaje en la respuesta de FETCH"
 msgid "Could not open cache directory: %s"
 msgstr "No puedo abrir directorio de cache: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:16
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "Comprobando si hay correo nuevo"
 
@@ -4337,7 +4547,7 @@ msgstr "Comprobando si hay correo nuevo"
 msgid "Check for new messages in all folders"
 msgstr "Comprobar si hay mensajes nuevos en todas las carpetas"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:642
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Carpetas"
 
@@ -4369,28 +4579,28 @@ msgstr "Para leer y guardar correo en los servidores IMAP."
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "ConectarА con el servidor IMAP usando una contraseЯa de texto plano"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "El servidor IMAP %s no soporta el mИtodo de autenticaciСn requerido %s"
 
-#: camel/providers/imap/camel-imap-store.c:471
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "No hay soporte para el tipo de autenticaciСn %s"
 
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPor favor escriba la contraseЯa IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:510
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "No escribiС una clave."
 
-#: camel/providers/imap/camel-imap-store.c:536
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4401,11 +4611,15 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:825 mail/mail-local.c:325
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
 msgid "No such folder %s"
 msgstr "No existe la carpeta %s"
 
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
+
 #: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "Directorios de correo en formato MH"
@@ -4479,7 +4693,7 @@ msgstr "No pude borrar el resumen la carpeta `%s': %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "No pude borrar el Мndice de la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
 #: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr "No pude aЯadir mensajes al resumen: razСn desconocida"
@@ -4680,7 +4894,7 @@ msgstr "No puedo resumir la carpeta: %s: %s"
 #: camel/providers/local/camel-mbox-summary.c:502
 #: camel/providers/local/camel-mbox-summary.c:703
 #: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1468
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Sincronizando carpeta"
 
@@ -4738,7 +4952,7 @@ msgstr "No pude cerrar la carpeta temporal: %s"
 msgid "Could not rename folder: %s"
 msgstr "No pude cambiar el nombre a la carpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
 #: camel/providers/local/camel-spool-summary.c:545
 #: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
@@ -4761,14 +4975,17 @@ msgid "Cannot open MH directory path: %s: %s"
 msgstr "No puedo abrir el directorio MH en la ruta: %s: %s"
 
 #: camel/providers/local/camel-spool-folder.c:465
+#, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "No puedo aЯadir el mensaje al archivo: %s: %s"
 
 #: camel/providers/local/camel-spool-store.c:132
+#, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "`%s' no existe o no es un archivo normal."
 
 #: camel/providers/local/camel-spool-store.c:159
+#, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "La carpeta `%s/%s' no existe."
 
@@ -4792,6 +5009,7 @@ msgstr ""
 #: camel/providers/local/camel-spool-summary.c:784
 #: camel/providers/local/camel-spool-summary.c:793
 #: camel/providers/local/camel-spool-summary.c:802
+#, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "No pude sincronizar la carpeta temporal %s: %s"
 
@@ -4924,7 +5142,7 @@ msgstr "Dejar mensajes en el servidor"
 msgid "Delete after %s day(s)"
 msgstr "Borrar tras %s dМa(s)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:62
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -5017,7 +5235,7 @@ msgid "No such folder `%s'."
 msgstr "No existe la carpeta `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -5070,7 +5288,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "EnvМo de correo vМa el programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:76
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -5078,124 +5296,124 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Para enviar correo conectАndose a un servidor de correo usando SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "Error de sintaxis, comando no reconocido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "Error de sintaxis en los parАmetros o los argumentos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Comando no implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "ParАmetro del comando no implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr "Estado del sistema, o respuesta a la ayuda del sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "Mensaje de ayuda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Servicio preparado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr "Servicio cerrando los canales de transmisiСn"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr "Servicio no disponible, cerrando los canales de transmisiСn"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr "AcciСn de correo requerida en orden, completada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr "El usuario no es local: lo reenviarИ a <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 "AcciСn solicitada del correo no realizada: el mailbox no estА disponible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "AcciСn solicitada no realizada: el mailbox no estА disponible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr "AcciСn solicitada abortada: error en procesamiento"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr "El usuario no es local: por favor pruebe con <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 "AcciСn solicitada no realizada: la capacidad del sistema es insuficiente"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "AcciСn solicitada no realizada: excediС la capacidad de almacenamiento"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "AcciСn solicitada no realizada: nombre no permitido para mailbox"
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Comience a escribir el mensaje; finalice con <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "Fallo en la transacciСn"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr "Es necesaria una transiciСn de contraseЯa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "El mИtodo de autenticaciСn en demasiado debil"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr "EncriptaciСn requerida por el mecanismo de autenticaciСn pedido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "Fallo temporal en la autenticaciСn"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "AutenticaciСn requerida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:314
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Mensaje de bienvenida errСneo: %s: posiblemente no es fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:357
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "El servidor SMTP %s no soporta el mИtodo de autenticaciСn requerido %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:396
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sPor favor escriba la contraseЯa SMTP para %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:419
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5206,116 +5424,130 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:535
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:537
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "EnvМo de correo SMTP vМa %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:562
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr "No puedo enviar el mensaje: direcciСn del remitente no definida."
 
-#: camel/providers/smtp/camel-smtp-transport.c:569
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr "No puedo enviar el mensaje: direcciСn del remitente no vАlida."
 
-#: camel/providers/smtp/camel-smtp-transport.c:583
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "Enviando mensaje"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "No puedo enviar el mensaje: no hay destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:677
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, fuzzy
+msgid "SMTP Greeting"
+msgstr "ReuniСn"
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "ExpirС el tiempo para HELO: %s: no es fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Respuesta de error al HELO: %s: no es fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:729
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr "Error al crear el objeto de autenticaciСn SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:744
-#: camel/providers/smtp/camel-smtp-transport.c:756
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "AutentificaciСn"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "ExpirС el tiempo para AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:782
 msgid "AUTH request failed."
 msgstr "Error en la peticiСn de AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:810
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr "Respuesta de autenticaciСn errСnea desde el servidor.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:836
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "ExpirС el tiempo para MAIL FROM: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:855
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Respuesta de error a MAIL FROM: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "ExpirС el tiempo para RCPT TO: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:899
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Respuesta de error a RCPT TO: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "ExpirС el tiempo para DATA: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Respuesta de error a DATA: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:966
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "ExpirС el tiempo para el envМo de DATA: terminaciСn del mensaje: %s: correo "
 "no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1003
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 "Respuesta de error a DATA: terminaciСn del mensaje: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1027
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "ExpirС el tiempo para RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1046
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Respuesta de error a RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "ExpirС el tiempo para QUIT: %s: no es fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Respuesta de error a QUIT: %s: no es fatal"
@@ -5345,7 +5577,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:131
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "adjunto"
 
@@ -5378,52 +5610,52 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir mostrar adjuntos automaticamente"
 
-#: composer/e-msg-composer-hdrs.c:325
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "Presione aquМ para acceder a la agenda"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:356
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:362
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "Responder a:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Escriba las direcciones que recibirАn una copia del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5454,29 +5686,29 @@ msgstr ""
 "Error cargando el archivo: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:869
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: composer/e-msg-composer.c:878
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr "║Aviso!"
 
-#: composer/e-msg-composer.c:880
+#: composer/e-msg-composer.c:884
 msgid "File exists, overwrite?"
 msgstr "El archivo existe, ©Sobreescribir?"
 
-#: composer/e-msg-composer.c:902
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error guardando el archivo: %s"
 
-#: composer/e-msg-composer.c:922
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error cargando el archivo: %s"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:997
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5484,16 +5716,16 @@ msgstr ""
 "No pude abrir la carpeta de borradores para esta cuenta.\n"
 "©Quiere usar la carpeta de borradores predeterminada?"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1047
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Error accediendo al archivo: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1055
 msgid "Unable to retrieve message from editor"
 msgstr "No pude obtener los mensajes del editor"
 
-#: composer/e-msg-composer.c:1057
+#: composer/e-msg-composer.c:1061
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5502,7 +5734,7 @@ msgstr ""
 "No pude buscar en el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1063
+#: composer/e-msg-composer.c:1067
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5511,7 +5743,7 @@ msgstr ""
 "No pude truncar el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1072
+#: composer/e-msg-composer.c:1076
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5520,20 +5752,16 @@ msgstr ""
 "Error auto guardando el mensaje: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1169
+#: composer/e-msg-composer.c:1173
+#, fuzzy
 msgid ""
-"Evolution has found unsaved files from a previous sesiion.\n"
+"Evolution has found unsaved files from a previous session.\n"
 "Would you like to attempt recovery?"
 msgstr ""
 "Evolution ha encontrado archivos no guardados de sesiones previas.\n"
 "©Quiere tratar de recuperarlos?"
 
-#: composer/e-msg-composer.c:1318 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:231
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:1324
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5543,19 +5771,24 @@ msgstr ""
 "\n"
 "©Quiere guardar los cambios?"
 
-#: composer/e-msg-composer.c:1349
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:1498
+#: composer/e-msg-composer.c:1500
 msgid "Insert File"
 msgstr "Insertar Archivo"
 
-#: composer/e-msg-composer.c:1855 composer/e-msg-composer.c:2243
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Nuevo mensaje"
 
-#: composer/e-msg-composer.c:2337
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "No pude crear una ventana para escribir el mensaje"
 
@@ -5584,40 +5817,56 @@ msgid "calendar information"
 msgstr "informaciСn del calendario"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:64 e-util/e-time-utils.c:106
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1312 widgets/misc/e-dateedit.c:1493
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:77 e-util/e-time-utils.c:187
-#: e-util/e-time-utils.c:312
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:80 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:304
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:83 e-util/e-time-utils.c:194
-#: e-util/e-time-utils.c:309 widgets/misc/e-dateedit.c:1290
-#: widgets/misc/e-dateedit.c:1349 widgets/misc/e-dateedit.c:1528
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
-#: e-util/e-time-utils.c:301 widgets/misc/e-dateedit.c:1287
-#: widgets/misc/e-dateedit.c:1346 widgets/misc/e-dateedit.c:1525
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
 msgid "%H:%M"
 msgstr "%H:%M"
 
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%m/%d/%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %m %d %Y"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
+
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:258
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -5625,65 +5874,65 @@ msgstr "%a %m %d %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:263
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:272
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "aЯo"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "aЯos"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "mes"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "meses"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "semana"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "semanas"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "hora"
 
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "minuto"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "segundo"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "segundos"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Oops. Te has olvidado de elegir una fecha."
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Oops. Has elegido una fecha incorrecta."
 
-#: filter/filter-datespec.c:276
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -5693,7 +5942,7 @@ msgstr ""
 "fecha del momento de ejecutar el filtro o\n"
 "cuando se abra el vfolder."
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5701,7 +5950,7 @@ msgstr ""
 "La fecha del mensaje serА comparada con la\n"
 "fecha que especifique aquМ."
 
-#: filter/filter-datespec.c:339
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5712,28 +5961,36 @@ msgstr ""
 "filtro. Por ejemplo: ╚Hace una semana╩."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "la fecha actual"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "Una fecha a especificar"
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "una fecha relativa al momento actual"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Comparar con"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "ahora"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<pinche aquМ para aЯadir una fecha>"
 
@@ -5758,8 +6015,8 @@ msgstr ""
 "Oops, te has olvidado de elegir una carpeta.\n"
 "Por favor vuelve y especifica una carpeta vАlida donde entregar el correo."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:292
-#: mail/mail-account-gui.c:766
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
@@ -5820,6 +6077,17 @@ msgstr "entrante"
 msgid "outgoing"
 msgstr "saliente"
 
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "AЯadir"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Editar"
+
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Editar filtros"
@@ -5860,206 +6128,197 @@ msgstr "con todas las carpetas locales y remotas activas"
 msgid "with all local folders"
 msgstr "con todas las carpetas locales"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Asignar Color"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Asignar puntuaciСn"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Adjuntos"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "contiene"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copiar a la carpeta"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Fecha de recepciСn"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Fecha de envМo"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Borrado"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "no contiene"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "no acaba en"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "no existe"
+
+#: filter/libfilter-i18n.h:16
+msgid "does not sound like"
+msgstr "no suena como"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
+msgstr "no comienza por"
+
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr "No Existe"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "Borrador"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:20
+msgid "ends with"
+msgstr "finaliza con"
+
+#: filter/libfilter-i18n.h:21
 msgid "Exist"
 msgstr "Salir"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:22
+msgid "exists"
+msgstr "existe"
+
+#: filter/libfilter-i18n.h:23
 msgid "Expression"
 msgstr "ExpresiСn"
 
-#: filter/libfilter-i18n.h:14
-msgid "Forward to Address"
-msgstr "Reenviar a direcciСn"
-
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:24
 msgid "Important"
 msgstr "Importante"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
+msgid "is"
+msgstr "es"
+
+#: filter/libfilter-i18n.h:26
+msgid "is greater than"
+msgstr "es mayor que"
+
+#: filter/libfilter-i18n.h:27
+msgid "is less than"
+msgstr "es menor que"
+
+#: filter/libfilter-i18n.h:28
+msgid "is not"
+msgstr "no es"
+
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Lista de correo"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Cuerpo del mensaje"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Cabecera del mensaje"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Se recibiС el mensaje"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Se enviС el mensaje"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Mover a la carpeta"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:35
+msgid "on or after"
+msgstr "en o despuИs de"
+
+#: filter/libfilter-i18n.h:36
+msgid "on or before"
+msgstr "en o antes de"
+
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "LeМdo"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "ExpresiСn regular"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Respondido a"
 
-#: filter/libfilter-i18n.h:26 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:6
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "PuntuaciСn"
 
-#: filter/libfilter-i18n.h:27 mail/mail-callbacks.c:1062
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Remitente"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Poner estado"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:44
 msgid "Size (kB)"
 msgstr "TamaЯo (kB)"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:45
+msgid "sounds like"
+msgstr "suena como"
+
+#: filter/libfilter-i18n.h:46
 msgid "Source Account"
 msgstr "Fuente de la cuenta"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr "Cabecera especМfica"
 
-#: filter/libfilter-i18n.h:32 mail/message-list.etspec.h:8
-msgid "Status"
-msgstr "Estado"
+#: filter/libfilter-i18n.h:48
+msgid "starts with"
+msgstr "comienza por"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Parar el proceso"
 
-#: filter/libfilter-i18n.h:34 mail/mail-format.c:861
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Asunto"
 
-#: filter/libfilter-i18n.h:37
-msgid "contains"
-msgstr "contiene"
-
-#: filter/libfilter-i18n.h:38
-msgid "does not contain"
-msgstr "no contiene"
-
-#: filter/libfilter-i18n.h:39
-msgid "does not end with"
-msgstr "no acaba en"
-
-#: filter/libfilter-i18n.h:40
-msgid "does not exist"
-msgstr "no existe"
-
-#: filter/libfilter-i18n.h:41
-msgid "does not sound like"
-msgstr "no suena como"
-
-#: filter/libfilter-i18n.h:42
-msgid "does not start with"
-msgstr "no comienza por"
-
-#: filter/libfilter-i18n.h:43
-msgid "ends with"
-msgstr "finaliza con"
-
-#: filter/libfilter-i18n.h:44
-msgid "exists"
-msgstr "existe"
-
-#: filter/libfilter-i18n.h:45
-msgid "is greater than"
-msgstr "es mayor que"
-
-#: filter/libfilter-i18n.h:46
-msgid "is less than"
-msgstr "es menor que"
-
-#: filter/libfilter-i18n.h:47
-msgid "is not"
-msgstr "no es"
-
-#: filter/libfilter-i18n.h:48
-msgid "is"
-msgstr "es"
-
-#: filter/libfilter-i18n.h:49
-msgid "on or after"
-msgstr "en o despuИs de"
-
-#: filter/libfilter-i18n.h:50
-msgid "on or before"
-msgstr "en o antes de"
-
-#: filter/libfilter-i18n.h:51
-msgid "sounds like"
-msgstr "suena como"
-
 #: filter/libfilter-i18n.h:52
-msgid "starts with"
-msgstr "comienza por"
-
-#: filter/libfilter-i18n.h:53
 msgid "was after"
 msgstr "estaba despuИs de"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:53
 msgid "was before"
 msgstr "estaba antes de"
 
@@ -6079,28 +6338,23 @@ msgstr "Editar Regla"
 msgid "Score Rules"
 msgstr "Reglas de puntuaciСn"
 
-#: importers/elm-importer.c:501 importers/evolution-gnomecard-importer.c:228
-#: importers/netscape-importer.c:769 importers/pine-importer.c:638
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
 #: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
 #: shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Importar"
 
-#: importers/elm-importer.c:506 importers/netscape-importer.c:774
-#: importers/pine-importer.c:643 my-evolution/my-evolution.glade.h:12
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
 msgid "Mail"
 msgstr "Correo"
 
-#: importers/elm-importer.c:510
-msgid "Elm Aliases"
-msgstr "Alias de Elm"
-
-#: importers/elm-importer.c:517 importers/netscape-importer.c:796
-#: importers/pine-importer.c:660 shell/importer/intelligent.c:199
-msgid "Don't ask me again"
-msgstr "No me preguntes mАs veces"
-
-#: importers/elm-importer.c:550
+#: importers/elm-importer.c:498
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -6108,11 +6362,11 @@ msgstr ""
 "Evolution ha encontrado archivos de correo de Elm\n"
 "©Quiere importarlos a Evolution?"
 
-#: importers/elm-importer.c:579
+#: importers/elm-importer.c:527
 msgid "Elm mail"
 msgstr "Correo de Elm"
 
-#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:653
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
 msgid "Addressbook"
 msgstr "Agenda de direcciones"
 
@@ -6124,19 +6378,11 @@ msgstr ""
 "Evolution ha encontrado archivos de GnomeCard.\n"
 "©Quiere importarlos a Evolution?"
 
-#: importers/netscape-importer.c:779 importers/pine-importer.c:648
+#: importers/netscape-importer.c:824
 msgid "Settings"
 msgstr "ConfiguraciСn"
 
-#: importers/netscape-importer.c:784 mail/mail-callbacks.c:1710
-msgid "Filters"
-msgstr "Filtros"
-
-#: importers/netscape-importer.c:789
-msgid "Addressbooks"
-msgstr "Agenda de direcciones"
-
-#: importers/netscape-importer.c:836
+#: importers/netscape-importer.c:849
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6144,7 +6390,7 @@ msgstr ""
 "Evolution ha encontrado archivos de correo de Netscape.\n"
 "©Quiere importarlos a Evolution?"
 
-#: importers/pine-importer.c:697
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -6152,7 +6398,7 @@ msgstr ""
 "Evolution ha encontrado archivos de correo de Pine.\n"
 "©Quiere importarlos a Evolution?"
 
-#: importers/pine-importer.c:725
+#: importers/pine-importer.c:691
 msgid "Pine mail"
 msgstr "Correo de Pine"
 
@@ -6192,147 +6438,162 @@ msgstr "FactorМa para el componente de Resumen de Correo."
 msgid "Mail configuration interface"
 msgstr "Interface de configuraciСn del correo"
 
-#: mail/component-factory.c:679
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "_Propiedades..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Cambiar las propiedades de esta carpeta"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No puedo inicializar el componente de correo de Evolution."
 
-#: mail/component-factory.c:813
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr "No puedo registrar un sistema de guardado con la shell"
 
-#: mail/folder-browser-ui.c:253
+#: mail/folder-browser-ui.c:254
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propiedades para ╚%s╩"
 
-#: mail/folder-browser-ui.c:255
+#: mail/folder-browser-ui.c:256
 msgid "Properties"
 msgstr "Propiedades"
 
-#: mail/folder-browser.c:227 mail/mail-display.c:277
+#: mail/folder-browser.c:231 mail/mail-display.c:278
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No puedo crear el directorio temporal: %s"
 
-#: mail/folder-browser.c:884
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "Guardar la bЗsqueda como una carpeta virtual"
 
-#: mail/folder-browser.c:1227
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr "VFolder segЗn el a_sunto"
 
-#: mail/folder-browser.c:1230
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "VFolder segЗn el _remitente"
 
-#: mail/folder-browser.c:1233
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "VFolder segЗn los _destinatarios"
 
-#: mail/folder-browser.c:1236
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr "Carpeta virtual segЗn la _Lista de Correo"
 
-#: mail/folder-browser.c:1242
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "Filtrar segЗn el As_unto"
 
-#: mail/folder-browser.c:1245
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "Filtrar segЗn el Re_mitente"
 
-#: mail/folder-browser.c:1248
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "Filtrar segЗn los Des_tinatarios"
 
-#: mail/folder-browser.c:1251
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "Filtrar segЗn la Lista de _Correo"
 
-#: mail/folder-browser.c:1260
-msgid "_Open"
-msgstr "_Abrir"
-
-#: mail/folder-browser.c:1262
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Reenviar"
 
-#: mail/folder-browser.c:1264 ui/evolution-calendar.xml.h:54
-#: ui/evolution-mail-message.xml.h:86 ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Guardar _como..."
 
-#: mail/folder-browser.c:1266 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "Im_primir"
 
-#: mail/folder-browser.c:1271 ui/evolution-mail-message.xml.h:85
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "_Resp. al Remitente"
 
-#: mail/folder-browser.c:1273 ui/evolution-mail-message.xml.h:61
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
 msgid "Reply to _List"
 msgstr "Resp. a la _Lista"
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:60
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "Re: _Todos"
 
-#: mail/folder-browser.c:1277
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: mail/folder-browser.c:1280
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Mar_car como leМdo"
 
-#: mail/folder-browser.c:1282
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Marcar como _no leМdo"
 
-#: mail/folder-browser.c:1284
+#: mail/folder-browser.c:1295
 msgid "Mark as _Important"
 msgstr "Marcar como _Importante"
 
-#: mail/folder-browser.c:1289
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Marcar como _Importante"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "_Mover a la carpeta..."
 
-#: mail/folder-browser.c:1291
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta..."
 
-#: mail/folder-browser.c:1295 ui/evolution-mail-message.xml.h:87
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "_Recuperar"
 
-#: mail/folder-browser.c:1300
+#: mail/folder-browser.c:1313
 msgid "Add Sender to Address Book"
 msgstr "AЯadir Remitente a la Agenda de Direcciones"
 
-#: mail/folder-browser.c:1305
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Aplicar filtro"
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "Crear una Reg_la con el Mensaje"
 
-#: mail/folder-browser.c:1448
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "Filtrar segЗn la lista de correo"
 
-#: mail/folder-browser.c:1449
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "Carpeta virtual segЗn la Lista de Correo"
 
-#: mail/folder-browser.c:1451
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrar segЗn la lista de correo (%s)"
 
-#: mail/folder-browser.c:1452
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Carpeta virtual segЗn la Lista de Correo (%s)"
@@ -6402,11 +6663,11 @@ msgstr "Editor de Noticias de Evolution"
 msgid "Evolution Account Editor"
 msgstr "Editor de cuentas de Evolution"
 
-#: mail/mail-account-gui.c:956
+#: mail/mail-account-gui.c:971
 msgid "Save signature"
 msgstr "Guardar firma"
 
-#: mail/mail-account-gui.c:962
+#: mail/mail-account-gui.c:977
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -6416,28 +6677,38 @@ msgstr ""
 "\n"
 "©Quiere guardar los cambios?"
 
-#: mail/mail-accounts.c:130
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr "(valores predeterminados)"
 
-#: mail/mail-accounts.c:169
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "Deshabilitado"
 
-#: mail/mail-accounts.c:171 mail/mail-config.glade.h:37
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "Habilitado"
 
-#: mail/mail-accounts.c:259 mail/mail-accounts.c:263
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "©Esta seguro que quiere borrar esta cuenta?"
 
-#: mail/mail-accounts.c:504 mail/mail-accounts.c:508
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Borrar"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "Hacer de esta mi cuenta predeterminada"
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr "©Esta seguro que quiere borrar esta cuenta de noticias?"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:709
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Administrador de cuentas de Evolution"
 
@@ -6525,29 +6796,29 @@ msgstr "Debes especificar destinatarios para poder enviar el mensaje."
 msgid "You must configure an account before you can send this email."
 msgstr "Debe configurar una cuenta antes de poder enviar este mensaje."
 
-#: mail/mail-callbacks.c:656
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "El dМa %s, %s escribiС:"
 
-#: mail/mail-callbacks.c:888
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Mensaje reenviado:\n"
 
-#: mail/mail-callbacks.c:982
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "Mover Mensaje(s) a"
 
-#: mail/mail-callbacks.c:984
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Copiar mensaje(s) a"
 
-#: mail/mail-callbacks.c:1339
+#: mail/mail-callbacks.c:1374
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "©Esta seguro que quiere editar los %d mensajes?"
 
-#: mail/mail-callbacks.c:1361
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6555,7 +6826,7 @@ msgstr ""
 "Solo puede editar mensajes guardados\n"
 "en la carpeta Borradores."
 
-#: mail/mail-callbacks.c:1395
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6563,24 +6834,24 @@ msgstr ""
 "Solo puede reenviar mensajes\n"
 "de la carpeta Enviados."
 
-#: mail/mail-callbacks.c:1407
+#: mail/mail-callbacks.c:1442
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "©Esta seguro que quiere reenviar los %d mensajes?"
 
-#: mail/mail-callbacks.c:1428
+#: mail/mail-callbacks.c:1463
 msgid "No Message Selected"
 msgstr "Se hay mensajes seleccionados"
 
-#: mail/mail-callbacks.c:1510
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Guardar mensaje como..."
 
-#: mail/mail-callbacks.c:1512
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Guardar mensajes como..."
 
-#: mail/mail-callbacks.c:1700
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6589,15 +6860,19 @@ msgstr ""
 "Error cargando la informaciСn del filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1758
+#: mail/mail-callbacks.c:1776
+msgid "Filters"
+msgstr "Filtros"
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/mail-callbacks.c:1805
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "Ha fallado la impresiСn del mensaje"
 
-#: mail/mail-callbacks.c:1900
+#: mail/mail-callbacks.c:1966
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "©Esta seguro que quiere abrir %d mensajes en ventanas separadas?"
@@ -6647,11 +6922,11 @@ msgstr ""
 "usarА para mostrar informaciСn."
 
 #. set window title
-#: mail/mail-config-druid.c:463
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr "Configurador de cuentas de Evolution"
 
-#: mail/mail-config.c:1563 mail/mail-config.c:1566
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 msgid "Connecting to server..."
 msgstr "Conectando al servidor..."
 
@@ -6664,58 +6939,63 @@ msgid " color"
 msgstr "color"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Firmar no esta soportado por este cifrado"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Cuenta"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "InformaciСn de la cuenta"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "GestiСn de la cuenta"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr "Siempre encriptarme a mi mismo cuando envie correo cifrado"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr "Siempre encriptarme a mi mismo cuando envie correo cifrado"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:11
 msgid "Always load images off the net"
 msgstr "Cargar imagenes fuera de la red"
 
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Adjunto"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "AutentificaciСn"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Tipo de autentificaciСn: "
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "Comprobar el correo automАticamente cada"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid "Certificate ID:"
 msgstr "ID del certificado:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:18
 msgid "Composer"
 msgstr "Nuevo"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6731,253 +7011,272 @@ msgstr ""
 "\n"
 "Pulse ╚Finalizar╩ para guardar su configuraciСn."
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "Va_lores predeterminados"
 
-#: mail/mail-config.glade.h:25
-msgid "Default \"Forward\" style is: "
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Default Forward style is: "
 msgstr "El estilo predeterminado de ╚Reenvio╩ es: "
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:27
 msgid "Default character set: "
 msgstr "Juego de caracteres predeterminado: "
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr "ID digitales..."
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Hecho"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Borradores"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Carpeta de borradores:"
 
-#: mail/mail-config.glade.h:34 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Editar..."
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "DirecciСn de correo:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37
 msgid "Empty trash folders on exit"
 msgstr "Vaciar papelera al salir"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "Habilitado"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Nombre completo:"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Get Digital ID..."
 msgstr "Obtener ID digital..."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "HTML Signature:"
 msgstr "Firma en HTML:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Highlight citations with"
 msgstr "Resaltadar citas con"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Identidad"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "In HTML mail"
 msgstr "Correo en HTML"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "Inline"
 msgstr "Incluido en lМnea"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Load images if sender is in addressbook"
 msgstr "Cargar imАgenes si el remitente esta el la agenda de direcciones"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "ConfiguraciСn del correo"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Formato Mailbox"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "Hacer de esta mi cuenta predeterminada"
 
-#: mail/mail-config.glade.h:51
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "Marcar mensajes como ╚leМdo╩ tras:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
 msgid "NNTP Server:"
 msgstr "Servidor NNTP:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:59
 msgid "Never load images off the net"
 msgstr "No cargar nunca imАgenes desde la red"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "Noticias"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "InformaciСn Opcional"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "OrganizaciСn:"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:65
 msgid "PGP Key ID:"
 msgstr "ID de la clave PGP:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "LocalizaciСn del binario de PGP:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:70
 msgid "Pick a color"
 msgstr "Elije un color"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:71
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:72
 msgid "Prompt when sending messages with an empty subject"
 msgstr "Preguntar al mandar mensajes con el asunto vacio"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "Preguntar al mandar mensajes con el asunto vacio"
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr "Maildir estilo Qmail"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:75
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "Recibiendo mensajes"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "Recibiendo Mensajes"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "Recibiendo Opciones"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:79
 msgid "Remember PGP Passphrase until exit"
 msgstr "Recordar la frase de paso de PGP hasta salir del programa"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "InformaciСn Requerida"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:83
 msgid "Secure MIME"
 msgstr "MIME seguro"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:84
 msgid "Security"
 msgstr "Seguridad"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "Seleccione el binario de PGP"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "Enviar el mensaje en formato HTML de forma predeterminada"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "Enviando correo"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "Enviado"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr "Mensajes Enviados y Borradores"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "Carpeta de mensajes enviados:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "ConfiguraciСn del servidor"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Tipo de servidor:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "El servidor requiere autentificaciСn"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Archivo de firma:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:97
 msgid "Source"
 msgstr "Fuente"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:98
 msgid "Source Information"
 msgstr "InformaciСn de la Fuente"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Fuentes"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "Carpetas Especiales"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr "Mabox estАndar de Unix"
 
-#: mail/mail-config.glade.h:96
-#: shell/glade/e-active-connection-dialog.glade.h:5
-msgid "Type"
-msgstr "Tipo"
-
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "Use conexiones seguras (SSL)"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Nombre:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6987,23 +7286,15 @@ msgstr ""
 "\n"
 "Pulse ╚Siguiente╩ para comenzar. "
 
-#: mail/mail-config.glade.h:104 ui/evolution-comp-editor.xml.h:20
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:46
-msgid "_Edit"
-msgstr "_Editar"
-
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:112
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:113
 msgid "placeholder"
 msgstr "placeholder"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:114
 msgid "seconds."
 msgstr "segundos."
 
@@ -7043,191 +7334,181 @@ msgstr "No pude crear un contexto sobre tipo S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "No pude crear un contexto de decodificaciСn S/MIME."
 
-#: mail/mail-display.c:220
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Guardar adjunto"
 
-#: mail/mail-display.c:337
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Guardar en disco..."
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "Ver incluido"
 
-#: mail/mail-display.c:341
+#: mail/mail-display.c:342
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:398
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver incluido (vМa %s)"
 
-#: mail/mail-display.c:402
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Ocultar"
 
-#: mail/mail-display.c:423
+#: mail/mail-display.c:424
 msgid "External Viewer"
 msgstr "Visores externos"
 
-#: mail/mail-display.c:1054
+#: mail/mail-display.c:1048
 msgid "Loading message content"
 msgstr "Cargando el contenido del mensaje"
 
-#: mail/mail-display.c:1397
+#: mail/mail-display.c:1404
 msgid "Open Link in Browser"
 msgstr "Abrir Enlaze en el Navegador"
 
-#: mail/mail-display.c:1399
+#: mail/mail-display.c:1406
 msgid "Copy Link Location"
 msgstr "Copiar DirecciСn del Enlaze"
 
-#: mail/mail-display.c:1401
+#: mail/mail-display.c:1408
 msgid "Save Link as (FIXME)"
 msgstr "Guardar Enlaze como (ARREGLAME)"
 
-#: mail/mail-display.c:1403
-msgid "Save Image as"
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
 msgstr "Guardar Imagen como..."
 
-#: mail/mail-folder-cache.c:164
+#: mail/mail-folder-cache.c:170
 #, fuzzy, c-format
 msgid "%d new"
 msgstr "%d nuevos"
 
-#: mail/mail-folder-cache.c:170 mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
 msgid ", "
 msgstr ", "
 
-#: mail/mail-folder-cache.c:171
+#: mail/mail-folder-cache.c:177
 #, c-format
 msgid "%d hidden"
 msgstr "%d ocultos"
 
-#: mail/mail-folder-cache.c:178
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr "%d nuevos"
+
+#: mail/mail-folder-cache.c:188
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/mail-format.c:603
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s adjunto"
 
-#: mail/mail-format.c:652
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No puede analizar el mensaje MIME. Mostrando la fuente."
 
-#: mail/mail-format.c:734 mail/message-list.etspec.h:2
+#: mail/mail-format.c:746
 msgid "Date"
 msgstr "Fecha"
 
-#: mail/mail-format.c:850 mail/message-list.etspec.h:4
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "DirecciСn de correo:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:853
+#: mail/mail-format.c:867
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: mail/mail-format.c:856 mail/message-list.etspec.h:10
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "A"
 
-#: mail/mail-format.c:859
+#: mail/mail-format.c:873
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1182
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "No hay programas GPG/PGP configurados."
 
-#: mail/mail-format.c:1197
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "Mensaje encriptado no mostrado"
 
-#: mail/mail-format.c:1203
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Mensaje encriptado"
 
-#: mail/mail-format.c:1204
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Pulse el icono para desencriptar."
 
-#: mail/mail-format.c:1260
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Este mensaje estА firmado digitalmente y es autИntico."
 
-#: mail/mail-format.c:1268
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Este mensaje estА firmado digitalmente pero no se puede verificar su "
 "autenticidad."
 
-#: mail/mail-format.c:1920
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:1932
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntero a archivo local (%s) valido en ╚%s╩"
 
-#: mail/mail-format.c:1936
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: mail/mail-format.c:1970
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Puntero a sitio FTP (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo ╚%s╩)"
 
-#: mail/mail-format.c:1975
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: mail/mail-local.c:455
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "Abriendo '%s'"
 
-#: mail/mail-local.c:755
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando la carpeta ╚%s╩ al formato ╚%s╩"
 
-#: mail/mail-local.c:759
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Cambiar la carpeta ╚%s╩ al formato ╚%s╩"
-
-#: mail/mail-local.c:782
-msgid "Reconfiguring folder"
-msgstr "Reconfigurar carpeta"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:811
-msgid "Closing current folder"
-msgstr "Cerrando carpeta actual"
-
-#: mail/mail-local.c:838
-msgid "Renaming old folder and opening"
-msgstr "Renombrando carpeta antigua y abriИndola"
-
-#: mail/mail-local.c:856
-msgid "Creating new folder"
-msgstr "Creando una nueva carpeta"
-
-#: mail/mail-local.c:870
-msgid "Copying messages"
-msgstr "Copiando mensajes"
-
-#: mail/mail-local.c:887
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -7236,7 +7517,7 @@ msgstr ""
 "No puedo guardar la metainformaciСn de la carpeta: probablemente\n"
 "volver a abrir esta carpeta: %s"
 
-#: mail/mail-local.c:926
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -7244,12 +7525,17 @@ msgstr ""
 "Si no puede volver a abrir este buzСn, entonces\n"
 "puede que tenga que arreglarlo a mano."
 
-#: mail/mail-local.c:1012
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "No puede copiar mensajes de esta papelera."
+
+#: mail/mail-local.c:1011
 #, c-format
 msgid "Reconfigure %s"
 msgstr "Reconfigurar %s"
 
-#: mail/mail-mt.c:190
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -7258,7 +7544,7 @@ msgstr ""
 "Error mientras `%s':\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -7267,110 +7553,104 @@ msgstr ""
 "Error mientras hacia:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:885
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Trabajando"
 
-#: mail/mail-mt.c:867
-msgid "Evolution progress"
-msgstr "Progreso de Evolution"
-
-#: mail/mail-ops.c:556
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando ╚%s╩"
 
-#: mail/mail-ops.c:560
-msgid "Sending message"
-msgstr "Enviando mensaje"
-
-#: mail/mail-ops.c:676
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
 
-#: mail/mail-ops.c:695
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Error en mensaje %d de %d"
 
-#: mail/mail-ops.c:697 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:783
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Guardando mensajes en la carpeta"
 
-#: mail/mail-ops.c:862
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moviendo mensajes a %s"
 
-#: mail/mail-ops.c:862
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensajes a %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Moviendo"
 
-#: mail/mail-ops.c:882
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:972
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Escaneando carpetas en ╚%s╩"
 
-#: mail/mail-ops.c:1141
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "Papelera"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-ops.c:1182 mail/mail-ops.c:1320
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: mail/mail-ops.c:1249
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr "Abriendo sitio %s"
 
-#: mail/mail-ops.c:1388
+#: mail/mail-ops.c:1436
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando carpeta %s"
 
-#: mail/mail-ops.c:1520
+#: mail/mail-ops.c:1568
 msgid "Refreshing folder"
 msgstr "Actualizando carpeta"
 
-#: mail/mail-ops.c:1556
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "Comprimiendo carpeta"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Obteniendo mensaje %s"
 
-#: mail/mail-ops.c:1672
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Obteniendo mensajes"
 
-#: mail/mail-ops.c:1682
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Obteniendo mensaje nЗmero %d de %d (uid ╚%s╩)"
-
-#: mail/mail-ops.c:1756
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Guardando mensajes"
 
-#: mail/mail-ops.c:1835
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7379,12 +7659,7 @@ msgstr ""
 "No pude crear el archivo de salida: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1848
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Guardando mensaje %d de %d (uid ╚%s╩)"
-
-#: mail/mail-ops.c:1862
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7393,11 +7668,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1936
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: mail/mail-ops.c:1951
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7406,12 +7681,12 @@ msgstr ""
 "No pude crear el archivo de salida: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1979
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No pude escribir datos: %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2101
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectar de %s"
@@ -7420,23 +7695,33 @@ msgstr "Desconectar de %s"
 msgid "(Untitled Message)"
 msgstr "(Mansaje sin tМtulo)"
 
-#: mail/mail-search.c:268
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Mansaje sin tМtulo)"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "Mensaje"
+
+#: mail/mail-search.c:284
 msgid "Find in Message"
 msgstr "Buscar en Mensaje"
 
-#: mail/mail-search.c:298
+#: mail/mail-search.c:314
 msgid "Case Sensitive"
 msgstr "Sensible a mayusculas"
 
-#: mail/mail-search.c:299
+#: mail/mail-search.c:315
 msgid "Search Forward"
 msgstr "Buscar hacia adelante"
 
-#: mail/mail-search.c:316
+#: mail/mail-search.c:332
 msgid "Find:"
 msgstr "Buscar:"
 
-#: mail/mail-search.c:319
+#: mail/mail-search.c:335
 msgid "Matches:"
 msgstr "Coincide:"
 
@@ -7468,47 +7753,35 @@ msgstr "Enviando"
 msgid "Cancelled."
 msgstr "Cancelado"
 
-#: mail/mail-session.c:170
+#: mail/mail-session.c:171
 msgid "User canceled operation."
 msgstr "OperaciСn cancelada por el usuario."
 
-#: mail/mail-tools.c:159
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "No puedo crear el mbox temporal `%s': %s"
 
-#: mail/mail-tools.c:207
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (mensaje reenviado)"
-
-#: mail/mail-tools.c:217
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (sin asunto)"
-
-#: mail/mail-tools.c:234
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Reenviado mensaje - %s"
 
-#: mail/mail-tools.c:236
-msgid "Forwarded message (no subject)"
-msgstr "Mensaje reenviado (sin asunto)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Mensaje reenviados"
 
-#: mail/mail-tools.c:457
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
-"s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Mensaje Reenviado-----<br><b>De:</b> %s<br><b>A:</b> %s<br><b>Asunto:</"
-"b> %s<br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Mensaje reenviados"
 
-#: mail/mail-vfolder.c:250
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "Carpetas virtuales"
 
-#: mail/mail-vfolder.c:442
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Nueva carpeta virtual"
 
@@ -7572,11 +7845,16 @@ msgstr "%b %d %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.etspec.h:3
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Guardando mensajes"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Marcado"
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Recibido"
 
@@ -7644,51 +7922,65 @@ msgstr "%l:%M%p"
 msgid "%a %l:%M%p"
 msgstr "%a %l:%M%p"
 
-#: my-evolution/e-summary-mail.c:100
+#: my-evolution/e-summary-mail.c:104
 msgid "Mail summary"
 msgstr "Resumen de correo"
 
-#: my-evolution/e-summary-preferences.c:424
+#: my-evolution/e-summary-preferences.c:420
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Palabra del DМa"
 
-#: my-evolution/e-summary-preferences.c:446
+#: my-evolution/e-summary-preferences.c:442
 msgid "Quotes of the Day"
 msgstr "Frase del DМa"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "AЯadir una fuente de noticias"
 
-#: my-evolution/e-summary-preferences.c:883
+#: my-evolution/e-summary-preferences.c:877
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Escriba la URL de la fuente de noticias que quiere aЯadir"
 
-#: my-evolution/e-summary-rdf.c:379 my-evolution/e-summary-rdf.c:405
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "ConfiguraciСn de _Mi Evolution..."
+
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Error obteniendo RDF</b>"
 
-#: my-evolution/e-summary-tasks.c:157
+#: my-evolution/e-summary-tasks.c:206
 msgid "No tasks"
 msgstr "No hay tareas"
 
-#: my-evolution/e-summary-weather.c:56
+#: my-evolution/e-summary-weather.c:57
 msgid "My Weather"
 msgstr "Mi Tiempo"
 
-#: my-evolution/e-summary-weather.c:300
-msgid "<b>Error downloading Metar</b>"
-msgstr "<b>Error obteniendo Metar</b>"
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
 
-#: my-evolution/e-summary-weather.c:616
+#: my-evolution/e-summary-weather.c:643
 msgid "Regions"
 msgstr "Regiones"
 
-#: my-evolution/e-summary.c:439 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A %d de %B"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 msgid "Print My Evolution"
 msgstr "Imprimir Mi Evolution"
 
-#: my-evolution/e-summary.c:485
+#: my-evolution/e-summary.c:518
 msgid "Printing of My Evolution failed"
 msgstr "La impresiСn de Mi Evolution ha fallado"
 
@@ -7696,95 +7988,95 @@ msgstr "La impresiСn de Mi Evolution ha fallado"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "El componente de resumen de trabajo no pudo inicializar Bonobo.\n"
 
-#: my-evolution/metar.c:43
+#: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Cielo claro"
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 msgid "Broken clouds"
 msgstr ""
 
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
 msgid "Scattered clouds"
 msgstr "Nubes dispersas"
 
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:47
 msgid "Few clouds"
 msgstr "Algun nube"
 
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
 msgid "Overcast"
 msgstr "Cubierto"
 
-#: my-evolution/metar.c:55 my-evolution/metar.c:73 my-evolution/metar.c:136
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
 msgid "Invalid"
 msgstr "InvАlido"
 
-#: my-evolution/metar.c:62
+#: my-evolution/metar.c:63
 msgid "Variable"
 msgstr "Variable"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "North"
 msgstr "Norte"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "North - NorthEast"
 msgstr "Norte - Noreste"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "Northeast"
 msgstr "Noreste"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "East - NorthEast"
 msgstr "Este - Noreste"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East"
 msgstr "Este"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - Southeast"
 msgstr "Este - Sureste"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "Southeast"
 msgstr "Sureste"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "South - Southeast"
 msgstr "Sur - Sureste"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South"
 msgstr "Sur"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southwest"
 msgstr "Sur - Suroeste"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "Southwest"
 msgstr "Suroeste"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "West - Southwest"
 msgstr "Oeste - Suroeste"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West"
 msgstr "Oeste"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Northwest"
 msgstr "Oeste - Noroeste"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "Northwest"
 msgstr "Noroeste"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "North - Northwest"
 msgstr "Norte - Noroeste"
 
@@ -7792,1207 +8084,1194 @@ msgstr "Norte - Noroeste"
 #. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
 #. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Drizzle"
 msgstr "Llovizna"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Drizzle in the vicinity"
 msgstr "Llovizna en las proximidades"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Light drizzle"
 msgstr "Ligera llovizna"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Moderate drizzle"
 msgstr "Llovizna moderada"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Heavy drizzle"
 msgstr "Fuerte Llovizna"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Shallow drizzle"
 msgstr "Llovizna suave"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Patches of drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Partial drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:99 my-evolution/metar.c:100
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
 msgid "Thunderstorm"
 msgstr "Tormenta"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Windy drizzle"
 msgstr "Llovizna ventosa"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Showers"
 msgstr "Chaparrones"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Drifting drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Freezing drizzle"
 msgstr ""
 
 #. RAIN
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Rain"
 msgstr "Lluvia"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Rain in the vicinity"
 msgstr "Lluvia en las proximidades"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Light rain"
 msgstr "Lluvia suave"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Moderate rain"
 msgstr "Lluvia moderada"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Heavy rain"
 msgstr "Lluvia fuerte"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Shallow rain"
 msgstr "Lluvia suave"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Patches of rain"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Partial rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Blowing rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Rain showers"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 #, fuzzy
 msgid "Drifting rain"
 msgstr "La descripciСn contiene"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 #, fuzzy
 msgid "Freezing rain"
 msgstr "Buscar de nuevo"
 
 #. SNOW
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Snow"
 msgstr "Nieve"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Snow in the vicinity"
 msgstr "Nevadas en las proximidades"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Light snow"
 msgstr "Ligera nevada"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Moderate snow"
 msgstr "Nevada moderada"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Heavy snow"
 msgstr "Nevada fuerte"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Shallow snow"
 msgstr "Nevada suave"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Patches of snow"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Partial snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:101 my-evolution/metar.c:102
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
 msgid "Snowstorm"
 msgstr "Tormenta de nieve"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Blowing snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Snow showers"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Drifting snow"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Freezing snow"
 msgstr ""
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Snow grains"
 msgstr "Granizada"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Snow grains in the vicinity"
 msgstr "Granizada en las proximidades"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Light snow grains"
 msgstr "Ligera granizada"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Moderate snow grains"
 msgstr "Granizada moderada"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Heavy snow grains"
 msgstr "Fuerte granizada"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Shallow snow grains"
 msgstr "Granizada suave"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Patches of snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Partial snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Blowing snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Snow grain showers"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 #, fuzzy
 msgid "Drifting snow grains"
 msgstr "La descripciСn contiene"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Freezing snow grains"
 msgstr ""
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Ice crystals"
 msgstr "Helada"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Ice crystals in the vicinity"
 msgstr "Heladas en las proximidades"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Few ice crystals"
 msgstr "Algunas placas de hielo"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Moderate ice crystals"
 msgstr "Helada moderada"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Heavy ice crystals"
 msgstr "Helada intensa"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Patches of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Partial ice crystals"
 msgstr "Helada parcial"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Ice crystal storm"
 msgstr "Tormenta de hielo"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Blowing ice crystals"
 msgstr "Ventisca de hielo"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Showers of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Drifting ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Freezing ice crystals"
 msgstr ""
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Ice pellets in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Few ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Moderate ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Heavy ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Shallow ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Patches of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Partial ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Ice pellet storm"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Blowing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Showers of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Drifting ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Freezing ice pellets"
 msgstr ""
 
 #. HAIL
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 #, fuzzy
 msgid "Hail"
 msgstr "Correo"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:105 my-evolution/metar.c:106
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
 msgid "Light hail"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Moderate hail"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Heavy hail"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 #, fuzzy
 msgid "Shallow hail"
 msgstr "Mostrar todo "
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Patches of hail"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 #, fuzzy
 msgid "Partial hail"
 msgstr "Correo electrСnico principal"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Blowing hail"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hail showers"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Drifting hail"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 #, fuzzy
 msgid "Freezing hail"
 msgstr "Recibiendo Mensajes"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Small hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Moderate small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Heavy small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 #, fuzzy
 msgid "Shallow small hail"
 msgstr "Mostrar todo "
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Patches of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Partial small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Small hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Blowing small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 #, fuzzy
 msgid "Showers of small hail"
 msgstr "Mostrar todo "
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Drifting small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Freezing small hail"
 msgstr ""
 
 #. PRECIPITATION
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 #, fuzzy
 msgid "Unknown precipitation"
 msgstr "Estado de la autenticaciСn desconocido."
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Precipitation in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 #, fuzzy
 msgid "Light precipitation"
 msgstr "Resaltadar citas con"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Moderate precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Heavy precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Shallow precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Patches of precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Partial precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 #, fuzzy
 msgid "Unknown thunderstorm"
 msgstr "Error desconocido"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Blowing precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Showers, type unknown"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Drifting precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 #, fuzzy
 msgid "Freezing precipitation"
 msgstr "Invitaciones para la reuniСn"
 
 #. MIST
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 #, fuzzy
 msgid "Mist"
 msgstr "SeЯorita"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Mist in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Light mist"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Moderate mist"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Thick mist"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Shallow mist"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Patches of mist"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 #, fuzzy
 msgid "Partial mist"
 msgstr "Vertical"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Mist with wind"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 #, fuzzy
 msgid "Drifting mist"
 msgstr "Lista de correo"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Freezing mist"
 msgstr ""
 
 #. FOG
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Fog in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Light fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Moderate fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Thick fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 #, fuzzy
 msgid "Shallow fog"
 msgstr "Mostrar todo "
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Patches of fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Partial fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 #, fuzzy
 msgid "Fog with wind"
 msgstr "Cerrar esta ventana"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Drifting fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Freezing fog"
 msgstr ""
 
 #. SMOKE
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 #, fuzzy
 msgid "Smoke"
 msgstr "Almacenar"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Smoke in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Thin smoke"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Moderate smoke"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Thick smoke"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 #, fuzzy
 msgid "Shallow smoke"
 msgstr "Mostrar tareas"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Patches of smoke"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Partial smoke"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Smoke w/ thunders"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 #, fuzzy
 msgid "Smoke with wind"
 msgstr "Cerrar esta ventana"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Drifting smoke"
 msgstr ""
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Volcanic ash in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Moderate volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Thick volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Shallow volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Patches of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Partial volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Volcanic ash w/ thunders"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Blowing volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Showers of volcanic ash "
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Drifting volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Freezing volcanic ash"
 msgstr ""
 
 #. SAND
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 #, fuzzy
 msgid "Sand"
 msgstr "Enviar"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Sand in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Light sand"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Moderate sand"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Heavy sand"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Patches of sand"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Partial sand"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Blowing sand"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Drifting sand"
 msgstr ""
 
 #. HAZE
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 #, fuzzy
 msgid "Haze"
 msgstr "Cabecera"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Haze in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Light haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Moderate haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Thick haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Shallow haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Patches of haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Partial haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Haze with wind"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Drifting haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Freezing haze"
 msgstr ""
 
 #. SPRAY
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 #, fuzzy
 msgid "Sprays"
 msgstr "dМas"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Sprays in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Light sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Moderate sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Heavy sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Shallow sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Patches of sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Partial sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Blowing sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Drifting sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Freezing sprays"
 msgstr ""
 
 #. DUST
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 #, fuzzy
 msgid "Dust"
 msgstr "Agosto"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Dust in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Light dust"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Moderate dust"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Heavy dust"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Patches of dust"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Partial dust"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Blowing dust"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Drifting dust"
 msgstr ""
 
 #. SQUALL
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Squall in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Light squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Moderate squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Heavy squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Partial squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Thunderous squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Blowing squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Drifting squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Freezing squall"
 msgstr ""
 
 #. SANDSTORM
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Sandstorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Light standstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Moderate sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Heavy sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Shallow sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Partial sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Thunderous sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Blowing sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Drifting sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Freezing sandstorm"
 msgstr ""
 
 #. DUSTSTORM
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Duststorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Light duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Moderate duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Heavy duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Shallow duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Partial duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Thunderous duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Blowing duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Drifting duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Freezing duststorm"
 msgstr ""
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Funnel cloud in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Light funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Moderate funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Thick funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Shallow funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Patches of funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Partial funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Funnel cloud w/ wind"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Tornado"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Tornado in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Moderate tornado"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 #, fuzzy
 msgid "Raging tornado"
 msgstr "Cosas por hacer"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Partial tornado"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 #, fuzzy
 msgid "Thunderous tornado"
 msgstr "Cosas por hacer"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Drifting tornado"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Freezing tornado"
 msgstr ""
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Dust whirls in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Light dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Moderate dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Heavy dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Shallow dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Patches of dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Partial dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Blowing dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Drifting dust whirls"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
 #, fuzzy
-msgid "Add ->"
-msgstr "AЯadir"
-
-#: my-evolution/my-evolution.glade.h:2
-#, fuzzy
 msgid "Add new feed"
 msgstr "Contestado"
 
-#: my-evolution/my-evolution.glade.h:3
+#: my-evolution/my-evolution.glade.h:2
 #, fuzzy
 msgid "All folders:"
 msgstr "Seleccionar carpeta"
 
-#: my-evolution/my-evolution.glade.h:4
+#: my-evolution/my-evolution.glade.h:3
 msgid "All news feeds:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:4
 msgid "All stations:"
 msgstr "Todas las estaciones"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:6
 msgid "Display folders:"
 msgstr "Mostrar carpetas:"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:7
 msgid "Display stations:"
 msgstr "Mostrar estaciones:"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:8
 #, fuzzy
 msgid "Displayed feeds:"
 msgstr "Mostrar"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:9
 msgid "Five days"
 msgstr "Cinco dias"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:10
 msgid "How many days should the calendar display at once?"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:12
 msgid "Max number of items shown:"
 msgstr "NЗmero mАximo de elementos mostrados:"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:13
 #, fuzzy
 msgid "News Feed Settings"
 msgstr "ConfiguraciСn"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:14
 msgid "News Feeds"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:15
 msgid "One day"
 msgstr "Un dМa"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:16
 msgid "One month"
 msgstr "Un mes"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:17
 msgid "One week"
 msgstr "Una semana"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:18
 msgid "Refresh time (seconds):"
 msgstr "Tiempo de actualizaciСn (segundos):"
 
-#: my-evolution/my-evolution.glade.h:20
-msgid "Remove <-"
-msgstr "Quitar <-"
-
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:19
 msgid "Schedule"
 msgstr "Horario"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:20
 msgid "Show all tasks"
 msgstr "Mostrar tadas las tareas"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:21
 msgid "Show full path for folders"
 msgstr "Mostrar ruta completa a las carpetas"
 
-#: my-evolution/my-evolution.glade.h:24
+#: my-evolution/my-evolution.glade.h:22
 msgid "Show today's tasks"
 msgstr "Mostrar las tareas de hoy"
 
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:23
 msgid "Tasks "
 msgstr "Tareas "
 
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:24
 msgid "Units: "
 msgstr "Unidades: "
 
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:25
 #, fuzzy
 msgid "Weather"
 msgstr "Tiempo"
 
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:26
 #, fuzzy
 msgid "Weather settings"
 msgstr "Quitar la seleccionada"
 
-#: my-evolution/my-evolution.glade.h:29
-msgid "Wipe trackers"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:27
 msgid "imperial"
 msgstr "anglosajСn"
 
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:28
 msgid "metric"
 msgstr "mИtrico"
 
@@ -9008,7 +9287,12 @@ msgstr "Mostrar Detalles"
 msgid "Cancel Operation"
 msgstr "Cancelar OperaciСn"
 
-#: shell/e-setup.c:125 shell/e-setup.c:195
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Carpetas Especiales"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "InstalaciСn de Evolution"
 
@@ -9023,24 +9307,24 @@ msgstr ""
 #: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
-"Por favor, pulse en ╚Aceptar╩ para instalar los archivos, o ╚Cancelar╩ "
-"para salir."
+"Por favor, pulse en ╚Aceptar╩ para instalar los archivos, o ╚Cancelar╩ para "
+"salir."
 
 #: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "No pude actualizar correctamente los archivos"
 
-#: shell/e-setup.c:199
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Parece que esta es la primera vez que ejecuta Evolution"
 
-#: shell/e-setup.c:200
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Por favor, pulse en ╚Aceptar╩ para instalar los archivos de usuario de "
 "Evolution en"
 
-#: shell/e-setup.c:219
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -9051,7 +9335,8 @@ msgstr ""
 "%s\n"
 "Error: %s"
 
-#: shell/e-setup.c:234
+#: shell/e-setup.c:235
+#, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
@@ -9059,7 +9344,7 @@ msgstr ""
 "Ha ocurrido un error mientras se copiaban archivos a\n"
 "`%s'."
 
-#: shell/e-setup.c:299
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9070,7 +9355,7 @@ msgstr ""
 "Por favor, renombre lo para permitir la instalaciСn\n"
 "de los archivos de usuario de Evolution."
 
-#: shell/e-setup.c:313
+#: shell/e-setup.c:322
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9084,7 +9369,7 @@ msgstr ""
 "Evolution.\n"
 "©Quiere que borre ese directorio?"
 
-#: shell/e-setup.c:338
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9140,7 +9425,7 @@ msgstr "©Esta seguro que quiere borrar la carpeta `%s'?"
 msgid "Rename folder '%s'"
 msgstr "Renombrar carpeta '%s'"
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -9149,11 +9434,11 @@ msgstr ""
 "No puedo crear la carpeta especificada:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "El nombre de carpeta especificado no es valido."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crear nuevas carpetas"
 
@@ -9165,11 +9450,11 @@ msgstr ""
 "El tipo de carpeta seleccionada no es valido para\n"
 "la operaciСn requerida."
 
-#: shell/e-shell-folder-selection-dialog.c:332
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Nuevo..."
 
-#: shell/e-shell-folder-title-bar.c:468 shell/e-shell-folder-title-bar.c:469
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Sin tМtulo)"
 
@@ -9277,19 +9562,19 @@ msgstr "Seleccionar una carpeta de destino donde importar estos datos"
 msgid "Closing connections..."
 msgstr "Cerrando conexiones..."
 
-#: shell/e-shell-view-menu.c:182
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "No se ha encontrado a bug buddy en su $PATH."
 
-#: shell/e-shell-view-menu.c:188
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "No se ha podido ejecutar bug buddy"
 
-#: shell/e-shell-view-menu.c:233
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:235
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -9299,59 +9584,61 @@ msgstr ""
 "trabajo en grupo para manejar el correo, el calendario y\n"
 "la lista de contactos en el entorno del escritorio GNOME."
 
-#: shell/e-shell-view-menu.c:453
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Ir a la carpeta..."
 
-#: shell/e-shell-view-menu.c:454
+#: shell/e-shell-view-menu.c:438
 msgid "Select the folder that you want to open"
 msgstr "Seleccione la carpeta que quiere abrir"
 
-#: shell/e-shell-view-menu.c:599
+#: shell/e-shell-view-menu.c:583
 msgid "Create a new shortcut"
 msgstr "Crear un nuevo atajo"
 
-#: shell/e-shell-view-menu.c:600
+#: shell/e-shell-view-menu.c:584
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Seleccione la carpeta a la que quiere que apunte el atajo:"
 
-#: shell/e-shell-view-menu.c:705
-msgid "Work online"
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
 msgstr "Trabajar conectado"
 
-#: shell/e-shell-view-menu.c:717 shell/e-shell-view-menu.c:729
-msgid "Work offline"
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
-#: shell/e-shell-view.c:173
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr "(No hay carpetas mostrАndose)"
 
 #. Special case for My Evolution
-#: shell/e-shell-view.c:1391 shell/e-storage-set-view.c:1441
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
 msgid "My Evolution"
 msgstr "Mi Evolution"
 
-#: shell/e-shell-view.c:1408
+#: shell/e-shell-view.c:1411
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1410
+#: shell/e-shell-view.c:1413
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1448
+#: shell/e-shell-view.c:1451
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution estА conectado.  Pulse este botСn para trabajar desconectado."
 
-#: shell/e-shell-view.c:1455
+#: shell/e-shell-view.c:1458
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution estА en proceso de desconectarse."
 
-#: shell/e-shell-view.c:1461
+#: shell/e-shell-view.c:1464
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Evolution estА desconectado.  Pulse este botСn para trabajar conectado."
@@ -9361,7 +9648,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "No puedo configurar una carpeta local -- %s"
 
-#: shell/e-shell.c:1308
+#: shell/e-shell.c:1311
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -9391,160 +9678,164 @@ msgstr ""
 msgid "Don't remove"
 msgstr "No quitar"
 
-#: shell/e-shortcuts-view.c:297
+#: shell/e-shortcuts-view.c:300
 msgid "Rename Shortcut Group"
 msgstr "Renombrar Grupo de Atajos"
 
-#: shell/e-shortcuts-view.c:298
+#: shell/e-shortcuts-view.c:301
 msgid "Rename selected shortcut group to:"
 msgstr "Renombrar grupos de atajos seleccionados a:"
 
-#: shell/e-shortcuts-view.c:308
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "Icono_s pequeЯos"
 
-#: shell/e-shortcuts-view.c:309
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Mostrar los atajos como iconos pequeЯos"
 
-#: shell/e-shortcuts-view.c:311
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "Iconos _grandes"
 
-#: shell/e-shortcuts-view.c:312
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Mostrar los atajos como iconos grandes"
 
-#: shell/e-shortcuts-view.c:323
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_Nuevo grupo..."
 
-#: shell/e-shortcuts-view.c:324
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Crear un nuevo grupo de atajos"
 
-#: shell/e-shortcuts-view.c:326
+#: shell/e-shortcuts-view.c:332
 msgid "_Remove this Group..."
 msgstr "_Quitar este Grupo..."
 
-#: shell/e-shortcuts-view.c:327
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Quitar este grupo de atajos"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:335
 msgid "Re_name this Group..."
 msgstr "Re_nombrar este Grupo..."
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:336
 msgid "Rename this shortcut group"
 msgstr "Renombrar este grupo de atajos"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "_Ocultar la barra de atajos"
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Ocultar la barra de atajos"
 
-#: shell/e-shortcuts-view.c:455
+#: shell/e-shortcuts-view.c:461
 msgid "Rename shortcut"
 msgstr "Renombrar atajo"
 
-#: shell/e-shortcuts-view.c:456
+#: shell/e-shortcuts-view.c:462
 msgid "Rename selected shortcut to:"
 msgstr "Renombrar atajos seleccionados a:"
 
-#: shell/e-shortcuts-view.c:468
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Abrir"
+
+#: shell/e-shortcuts-view.c:474
 msgid "Open the folder linked to this shortcut"
 msgstr "Abrir la carpeta enlazada a este atajo"
 
-#: shell/e-shortcuts-view.c:470 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Abrir en una nueva ventana"
 
-#: shell/e-shortcuts-view.c:470
+#: shell/e-shortcuts-view.c:476
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Abrir la carpeta asociada a este atajo en una nueva ventana"
 
-#: shell/e-shortcuts-view.c:473
+#: shell/e-shortcuts-view.c:479
 msgid "Rename"
 msgstr "Renombrar"
 
-#: shell/e-shortcuts-view.c:473
+#: shell/e-shortcuts-view.c:479
 msgid "Rename this shortcut"
 msgstr "Renombrar este atajo"
 
-#: shell/e-shortcuts-view.c:475
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Quitar este atajo de la lista de atajos"
 
-#: shell/e-shortcuts.c:614
+#: shell/e-shortcuts.c:585
 msgid "Error saving shortcuts."
 msgstr "Error guardando atajos."
 
-#: shell/e-shortcuts.c:1011
+#: shell/e-shortcuts.c:982
 msgid "Shortcuts"
 msgstr "Atajos"
 
-#: shell/e-shortcuts.c:1013
+#: shell/e-shortcuts.c:984
 msgid "Inbox"
 msgstr "Inbox"
 
-#: shell/e-shortcuts.c:1016
+#: shell/e-shortcuts.c:987
 msgid "Contacts"
 msgstr "Contactos"
 
-#: shell/e-storage.c:178
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Sin nombre)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Sin errores"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Error genИrico"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "Ya existe una carpeta con ese nombre"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "Es tipo de fichero especificado no es vАlido"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "Error de I/O"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "No hay suficiente espacio para crear la carpeta"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "No se encontrС la carpeta especificada"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "FunciСn sin implementar en este manejador"
 
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "OperaciСn no soportada"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "El tipo especificado no esta soportado por este manejador"
 
-#: shell/e-task-widget.c:167
+#: shell/e-task-widget.c:168
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:172
+#: shell/e-task-widget.c:173
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completado)"
 
@@ -9606,7 +9897,16 @@ msgstr "Importadores"
 msgid "Don't import"
 msgstr "No importar"
 
-#: shell/main.c:89
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr "No me preguntes mАs veces"
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -9621,7 +9921,9 @@ msgid ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 msgstr ""
-"Hola. Gracias por tomarse la molestia de descargar esta liberaciСn de prueba\n""de la herramienta de trabajo en grupo Evolution.\n"
+"Hola. Gracias por tomarse la molestia de descargar esta liberaciСn de "
+"prueba\n"
+"de la herramienta de trabajo en grupo Evolution.\n"
 "\n"
 "Evolution todavМa no estА completa. Se estА acercando, pero hay sitios\n"
 "donde faltan las utilidades o solo funcionan a medias. \n"
@@ -9633,7 +9935,7 @@ msgstr ""
 "Esperamos que le gusten los resultados de nuestro duro trabajo, y\n"
 "║esperamos sus contribuciСnes!\n"
 
-#: shell/main.c:110
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -9641,28 +9943,28 @@ msgstr ""
 "Gracias\n"
 "El equipo de Evolution\n"
 
-#: shell/main.c:148
+#: shell/main.c:155
 msgid "Cannot access the Evolution shell."
 msgstr "No puedo acceder a la shell de Evolution."
 
-#: shell/main.c:208
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "Desahilitar pantalla de entrada"
 
-#: shell/main.c:209
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr "Enviar la salida de depurado de todos los componente a un archivo."
 
-#: shell/main.c:244
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "No puedo inicializar el sistema de componentes Bonobo."
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:3
-#: ui/evolution-tasks.xml.h:1
-msgid "C_ut"
-msgstr "C_ortar"
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Copiar"
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:6
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
 msgstr "Copiar la selecciСn"
 
@@ -9674,7 +9976,11 @@ msgstr "Crear nuevo contacto"
 msgid "Create new contact list"
 msgstr "Crear nueva lista de contactos"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:11
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Cortar"
+
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
 msgid "Cut the selection"
 msgstr "Cortar la selecciСn"
 
@@ -9690,7 +9996,11 @@ msgstr "Nuevo contacto"
 msgid "New list"
 msgstr "Nueva lista"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:27
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Pegar"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Pegar el contenido del porta papeles"
 
@@ -9730,19 +10040,8 @@ msgstr "_Contacto"
 msgid "_Contact Group"
 msgstr "_Contactar con el Grupo"
 
-#: ui/evolution-addressbook.xml.h:25 ui/evolution-calendar.xml.h:47
-#: ui/evolution-tasks.xml.h:14
-msgid "_Copy"
-msgstr "_Copiar"
-
-#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:52
-#: ui/evolution-tasks.xml.h:16
-msgid "_Paste"
-msgstr "_Pegar"
-
-#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:53
-#: ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13 ui/my-evolution.xml.h:5
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "Im_primir..."
 
@@ -9754,172 +10053,131 @@ msgstr "Bu_scar contactos"
 msgid "_Select All"
 msgstr "_Seleccionar todo"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:55
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
 #: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_Herramientas"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 DМas"
-
 #: ui/evolution-calendar.xml.h:2
-msgid "Alter preferences"
-msgstr "Alterar preferencias"
+msgid "Configure the calendar's settings"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new all day Event"
+#: ui/evolution-calendar.xml.h:4
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "Crear un nuevo evento de todo el dМa"
 
-#: ui/evolution-calendar.xml.h:8
-msgid "Create a new appointment"
+#: ui/evolution-calendar.xml.h:5
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Crear una nueva cita"
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Create a new calendar"
-msgstr "Creando un nuevo calendario"
+#: ui/evolution-calendar.xml.h:6
+msgid "Create a new appointment"
+msgstr "Crear una nueva cita"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr "DМa"
+#: ui/evolution-calendar.xml.h:7
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Ir a"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Volver en el tiempo"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Avanzar en el tiempo"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "Ir a una _fecha"
 
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to _Today"
-msgstr "Ir a _hoy"
-
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Ir a una fecha especМfica"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Ir al momento actual"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Month"
-msgstr "Mes"
-
-#: ui/evolution-calendar.xml.h:22
-msgid "New _Event"
-msgstr "Nuevo _Evento"
-
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail-message.xml.h:48
-msgid "Next"
-msgstr "Siguiente"
-
-#: ui/evolution-calendar.xml.h:25
-msgid "Open Calendar"
-msgstr "Abrir calendario"
-
-#: ui/evolution-calendar.xml.h:28
-msgid "Prev"
-msgstr "Previo"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Nueva cita"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Vista previa del calendario a imprimir"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Imprimir calendario"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Imprimir este calendario"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:22
 #, fuzzy
 msgid "Publish Free/Busy Information"
 msgstr "InformaciСn Requerida"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:23
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:36 ui/evolution-message-composer.xml.h:19
-msgid "Save As"
-msgstr "Guardar como"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "Save calendar as something else"
-msgstr "Guardar el calendario como otra cosa"
-
-#: ui/evolution-calendar.xml.h:38
-msgid "Settings..."
-msgstr "ConfiguraciСn..."
-
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Mostrar 1 dМa"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Mostrar un mes"
 
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Mostrar 1 semana"
 
-#: ui/evolution-calendar.xml.h:42
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Mostrar un semana laboral"
 
-#: ui/evolution-calendar.xml.h:43 widgets/misc/e-cell-date-edit.c:232
-#: widgets/misc/e-dateedit.c:431
-msgid "Today"
-msgstr "Hoy"
-
-#: ui/evolution-calendar.xml.h:44
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "Semana lab_oral"
 
-#: ui/evolution-calendar.xml.h:45
-msgid "Week"
-msgstr "Semana"
-
-#: ui/evolution-calendar.xml.h:46
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "Cit_a"
 
-#: ui/evolution-calendar.xml.h:48
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "_ConfiguraciСn del correo..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "_DМa"
 
-#: ui/evolution-calendar.xml.h:49
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "_Mes"
 
-#: ui/evolution-calendar.xml.h:50 ui/evolution.xml.h:56
-msgid "_New"
-msgstr "_Nuevo"
-
-#: ui/evolution-calendar.xml.h:51
-msgid "_Open Calendar"
-msgstr "_Abrir calendario"
-
-#: ui/evolution-calendar.xml.h:56
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "_Semana"
 
-#: ui/evolution-comp-editor.xml.h:1
-msgid "C_lose"
-msgstr "_Cerrar"
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Cerrar"
 
 #: ui/evolution-comp-editor.xml.h:3
 msgid "Close this appointment"
@@ -9938,7 +10196,7 @@ msgstr "Barra de herramientas principal"
 msgid "Preview the printed item"
 msgstr "Ver el elemento que va a ser impreso"
 
-#: ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
 msgid "Print Pre_view"
 msgstr "Vista pre_via"
 
@@ -9947,17 +10205,15 @@ msgid "Print S_etup"
 msgstr "Configurar Impr_esiСn"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
-#: ui/evolution-contact-list-editor.xml.h:5
 msgid "Print this item"
 msgstr "Imprimir este elemento"
 
 #: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:6
 msgid "Print..."
 msgstr "Imprimir..."
 
 #: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:5
 msgid "Save and Close"
 msgstr "Guardar y cerrar"
 
@@ -9977,20 +10233,15 @@ msgstr "Configurar los datos de la pАgina para la impresora actual"
 msgid "_Action"
 msgstr "_AcciСn"
 
-#: ui/evolution-comp-editor.xml.h:21 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
 #: ui/evolution-mail-messagedisplay.xml.h:10
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:47
 msgid "_File"
 msgstr "_Archivo"
 
-#: ui/evolution-comp-editor.xml.h:22 ui/evolution-signature-editor.xml.h:9
-#: ui/evolution.xml.h:51
-msgid "_Help"
-msgstr "A_yuda"
-
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Borrar este elemento"
@@ -10005,13 +10256,12 @@ msgid "Help"
 msgstr "Ayuda"
 
 #: ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-contact-list-editor.xml.h:4
 msgid "Print En_velope..."
 msgstr "Imprimir ca_becera..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:7
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Guardar _como..."
 
@@ -10033,28 +10283,32 @@ msgid "Send _message to contact..."
 msgstr "Enviar un _mensaje al contacto..."
 
 #: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:10
 #: ui/evolution-message-composer.xml.h:54
 #: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Guardar"
 
 #: ui/evolution-contact-list-editor.xml.h:2
-msgid "Delete this group"
-msgstr "Borrar este grupo"
+#, fuzzy
+msgid "Delete this list"
+msgstr "Borrar este elemento"
 
-#: ui/evolution-contact-list-editor.xml.h:9
-msgid "Save the group and close the dialog box"
-msgstr "Guardar el grupo y cerrar la ventana de diАlogo"
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "Guardar el contacto y cerrar la ventana de diАlogo"
 
-#: ui/evolution-contact-list-editor.xml.h:10
-msgid "Se_nd group to other..."
-msgstr "E_nviar el egrupo a otro..."
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "E_nviar el contacto a otro..."
 
 #
-#: ui/evolution-contact-list-editor.xml.h:11
-msgid "Send _message to group..."
-msgstr "Enviar un _mensaje al grupo..."
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "Enviar un _mensaje al contacto..."
 
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
@@ -10110,79 +10364,84 @@ msgid "Compose"
 msgstr "Nuevo"
 
 #: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Nuevo mensaje"
+
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit mail accounts and other preferences"
 msgstr "Crear o editar cuentas de correo y otras preferencias"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
 msgstr "Crear o editar reglas para el filtrado de mensajes"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:7
 msgid "Create or edit virtual folder definitions"
 msgstr "Crear o editar definiciones de carpetas virtuales"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
 msgstr "Vaciar _Papelera"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget _Passwords"
 msgstr "Olvidar _contraseЯa"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:10
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Olvidar las contraseЯas recordadas con lo que serА preguntado de nuevo"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:11
 msgid "Manage _Subscriptions..."
 msgstr "Administrar _suscripciones..."
 
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:12
 msgid "Open a window for composing a mail message"
 msgstr "Abrir una ventana para escribir un mensaje de correo"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:13
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 "Eliminar permanentemente todos los mansajes borrados de todas las carpetas"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Send queued mail and retrieve new mail"
 msgstr "Enviar el correo en la cola y obtener el nuevo"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "Mostrar ventana de vista previa del mensajes"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:17
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Suscribirse o desuscribirse de carpetas de los servidores remotos"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor de carpetas virtuales..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Filters..."
 msgstr "_Filtros..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:20
 msgid "_Mail Message"
 msgstr "_Mensaje de correo"
 
-#: ui/evolution-mail-global.xml.h:20
+#: ui/evolution-mail-global.xml.h:21
 msgid "_Mail Settings..."
 msgstr "_ConfiguraciСn del correo..."
 
-#: ui/evolution-mail-global.xml.h:21
+#: ui/evolution-mail-global.xml.h:22
 msgid "_Preview Pane"
 msgstr "Vista _previa"
 
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:23
 msgid "_Send / Receive"
 msgstr "_Enviar / Recibir"
 
@@ -10207,7 +10466,8 @@ msgid "Hide _Deleted Messages"
 msgstr "Ocultar mensajes _borrados"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide _Read messages"
+#, fuzzy
+msgid "Hide _Read Messages"
 msgstr "Ocultar mensajes _leМdos"
 
 #: ui/evolution-mail-list.xml.h:9
@@ -10378,19 +10638,23 @@ msgid "Display the previous unread message"
 msgstr "Mostrar el anterior mensaje no leМdo"
 
 #: ui/evolution-mail-message.xml.h:24
-msgid "Filter on Mailing _List"
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "Filtrar segЗn la _lista de correo"
 
 #: ui/evolution-mail-message.xml.h:25
-msgid "Filter on Se_nder"
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "Filtrar segЗn el remite_nte"
 
 #: ui/evolution-mail-message.xml.h:26
-msgid "Filter on _Recipients"
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "Filtrar segЗn los destinata_rios"
 
 #: ui/evolution-mail-message.xml.h:27
-msgid "Filter on _Subject"
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "Filtrar segЗn el a_sunto"
 
 #: ui/evolution-mail-message.xml.h:28
@@ -10433,171 +10697,210 @@ msgstr "Reenviar el mensaje seleccionado a alguien"
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Reenviar el mensaje seleccionado como un adjunto a alguien"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 msgid "Load _Images"
 msgstr "Cargar _ImАgenes"
 
-#: ui/evolution-mail-message.xml.h:39
-msgid "Mar_k As Read"
-msgstr "Mar_car como LeМdo"
-
-#: ui/evolution-mail-message.xml.h:40
-msgid "Mark As I_mportant"
-msgstr "Marcar como I_mportante"
-
 #: ui/evolution-mail-message.xml.h:41
-msgid "Mark As U_nread"
-msgstr "Marcar como _no leМdo"
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "Marcar como _Importante"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
+msgstr "Marcar como _Importante"
+
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar los mensajes seleccionados como leidos"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark the selected messages as important"
 msgstr "Marcar los mensajes seleccionados como importantes"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar los mensajes seleccionados como no leidos"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Marcar los mensajes seleccionados como importantes"
+
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar los mensajes seleccionados para borrar"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Mover"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "Mover mensajes seleccionados a otra carpeta"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "Siguiente"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Mostrar el siguiente mensaje importante"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Mensaje"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Seleccionar _Hilo"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "(Mansaje sin tМtulo)"
+
+#: ui/evolution-mail-message.xml.h:56
 msgid "Open the selected message in a new window"
 msgstr "Abrir el mensaje seleccionado en una nueva ventana"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:57
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Abrir el mensaje seleccionado para reenviarlo"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:58
 msgid "Previews the message to be printed"
 msgstr "Ver el mensaje que va a ser impreso"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:59
 msgid "Previous"
 msgstr "Previo"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Mostrar el anterior mensaje importante"
+
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Imprimir mensaje"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Mostrar el anterior mensaje no leМdo"
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Print Message..."
 msgstr "Imprimir Mensaje..."
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:65
 msgid "Print Preview..."
 msgstr "Vista previa..."
 
-#: ui/evolution-mail-message.xml.h:56
-msgid "Print message to the printer"
-msgstr "Imprimir el mensaje en la impresora"
-
-#: ui/evolution-mail-message.xml.h:57
-msgid "Redirect (FIXME: implement me)"
-msgstr "Redirigir (ARREGLAME: implementame)"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "Imprimir mensaje"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply"
 msgstr "Responder"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:68
 msgid "Reply to All"
 msgstr "Re: Todos"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:71
 msgid "S_earch Message"
 msgstr "Buscar M_ensaje"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:72
 msgid "Save the message as a text file"
 msgstr "Guardar el mensaje en un archivo de texto"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:73
 msgid "Search for text in the body of the displayed message"
 msgstr "Buscar un texto en el cuerpo del mensaje mostrado"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "Mostrar la Fuente del Men_saje"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:75
 msgid "Show Full _Headers"
 msgstr "Mostrar cabeceras completas"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:76
 msgid "Show message in the normal style"
 msgstr "Mostrar mensajes en el estilo normal"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:77
 msgid "Show message with all email headers"
 msgstr "Mostrar mensajes con todas las cabeceras"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:78
 msgid "Show the raw email source of the message"
 msgstr "Mostrar la fuentes sin formatear del mensaje"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "Recuperar los mensajes seleccionados"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:80
 msgid "VFolder on Mailing _List..."
 msgstr "Carpeta virtual segЗn la _Lista de Correo..."
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:81
 msgid "VFolder on Se_nder..."
 msgstr "VFolder segЗn el Remite_nte..."
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:82
 msgid "VFolder on _Recipients..."
 msgstr "VFolder segЗn los Destinata_rios..."
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:83
 msgid "VFolder on _Subject..."
 msgstr "VFolder segЗn el A_sunto..."
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_Aplicar filtro"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Copy to Folder"
 msgstr "_Copiar a la Carpeta"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "_Crear filtro del mensaje"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:88
 msgid "_Forward Message"
 msgstr "_Reenviar Mensaje"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:89
 msgid "_Message Display"
 msgstr "_Mostrar Mensaje"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Move to Folder"
 msgstr "_Mover a la Carpeta"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Normal Display"
 msgstr "Vista _Normal"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Open Message"
 msgstr "_Abrir Mensaje"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Re-send Message"
 msgstr "_Reenviar Mensaje"
 
@@ -10618,7 +10921,7 @@ msgid "Customize toolbars"
 msgstr "Personalizar barras de herramientas"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:42
 msgid "_Close"
@@ -10658,153 +10961,159 @@ msgid "HTML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "Insertar un archivo de texto..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Insertar un archivo como texto en el mensaje"
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Insertar un archivo de texto..."
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Abrir un archivo"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "Encriptar con PGP"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "Firmar con PGP"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
 msgstr "Encriptar con S/MIME"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr "Firmar con S/MIME"
 
-#: ui/evolution-message-composer.xml.h:18
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
 msgid "Save"
 msgstr "Guardar"
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Guardar como"
+
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save _Draft"
 msgstr "Guardar _Borrador"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Guardar en carpeta..."
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:24
 #: ui/evolution-signature-editor.xml.h:4
 msgid "Save the current file"
 msgstr "Guardar archivo actual"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Guardar el archivo actual con un nombre diferente"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Guardara el mensaje a una carpeta especМfica"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Enviar"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Enviar _mas tarde"
 
-#: ui/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Enviar _mas tarde"
 
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Enviar el mensaje en formato HTML"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Enviar el mensaje mАs tarde"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Enviar este mensaje ahora"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Mostrar / ocultar adjuntos"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Mostrar _adjuntos"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Mostrar adjuntos"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "Firmar este mensaje con tu clave PGP"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:37
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Firmar este mensaje con su certificado de firma S/MIME"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Activa si se muestra el campo CCO"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr "Activa si se muestra el campo CC"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Activa si se muestra el selector 'De'"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Activa si se muestra el campo Responder-A"
 
-#: ui/evolution-message-composer.xml.h:41
-msgid "_Attachment"
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
 msgstr "_Adjunto"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "Campo Cc_o"
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
 #: ui/evolution-signature-editor.xml.h:6
 msgid "_Debug"
 msgstr "_Depurar"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
 msgstr "_Borrar todo"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "Campo _De"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:51
 #: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: ui/evolution-message-composer.xml.h:51
-msgid "_Insert text file..."
-msgstr "_Insertar un archivo de texto..."
-
 #: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Abrir..."
@@ -10817,6 +11126,10 @@ msgstr "Campo _Responder-A"
 msgid "_Security"
 msgstr "_Seguridad"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "A_yuda"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "AЯadir carpeta a tu lista de carpeta suscritas"
@@ -10858,40 +11171,41 @@ msgid "Re_fresh Task"
 msgstr "Re_leer Tarea"
 
 #: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Copiar las tareas seleccionadas"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Crear una nueva tarea"
 
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Cortar las tareas seleccionadas"
 
 #: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
+msgstr "Borrar las tareas seleccionadas"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Nueva tarea"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Paste task from the clipboard"
 msgstr "Pegar la tarea del portapapeles"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Guardar la tarea como otra cosa"
 
-#: ui/evolution-tasks.xml.h:11
-msgid "Set task view preferences"
-msgstr "Configurar las preferencias de la vista de tareas"
-
-#: ui/evolution-tasks.xml.h:12
-msgid "Tasks Preferences..."
-msgstr "Preferencias de las tareas..."
-
 #: ui/evolution-tasks.xml.h:13
-msgid "TasksPreferences"
-msgstr "Preferencias de las tareas"
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "_ConfiguraciСn del correo..."
 
 #: ui/evolution-tasks.xml.h:19
 msgid "_Task"
@@ -11017,10 +11331,6 @@ msgstr "Usando el _correo"
 msgid "View the selected folder"
 msgstr "Ver la carpeta seleccionada"
 
-#: ui/evolution.xml.h:38
-msgid "Work Offline"
-msgstr "Trabajar desconectado"
-
 #: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "_Acerca de Evolution..."
@@ -11061,6 +11371,10 @@ msgstr "_Enviar mensaje"
 msgid "_Move..."
 msgstr "_Mover..."
 
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Nuevo"
+
 #: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "_Nueva carpeta"
@@ -11132,10 +11446,6 @@ msgstr "Con categorМa"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "Tentativa"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Ocupado"
@@ -11218,19 +11528,18 @@ msgstr "Definir Vistas"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:427
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "LMMJVSD"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1067 widgets/misc/e-calendar-item.c:2766
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:425
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Ahora"
 
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Hoy"
+
 #: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
@@ -11297,6 +11606,7 @@ msgid "New"
 msgstr "Nuevo"
 
 #: widgets/misc/e-charset-picker.c:160
+#, c-format
 msgid "Unknown character set: %s"
 msgstr "Juego de caracteres desconocido: %s"
 
@@ -11316,19 +11626,24 @@ msgstr "CodificaciСn de Caracteres"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:167
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Editor de contactos"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "Guardar bЗsqueda"
 
-#: widgets/misc/e-filter-bar.c:238
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "BЗqueda avanzada"
 
-#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Mostrar todo"
 
-#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Avanzado..."
 
@@ -11381,3 +11696,208 @@ msgstr "init_corba(): no pude inicializar GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonob(): no pude inicializar Bonobo"
 
+#~ msgid "Set task view preferences"
+#~ msgstr "Configurar las preferencias de la vista de tareas"
+
+#~ msgid "TasksPreferences"
+#~ msgstr "Preferencias de las tareas"
+
+#~ msgid "(none)"
+#~ msgstr "(nada)"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "C_ontactos..."
+
+#~ msgid "_Company:"
+#~ msgstr "_CompaЯМa:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Notification about your journal entry starting on %s and ending on %s"
+#~ msgstr "NotificaciСn sobre su cita en %A %b %d %Y %H:%M"
+
+#, fuzzy
+#~ msgid "Notification about your journal entry starting on %s"
+#~ msgstr "NotificaciСn sobre su cita en %A %b %d %Y %H:%M"
+
+#, fuzzy
+#~ msgid "Notification about your journal entry ending on %s"
+#~ msgstr "NotificaciСn sobre su cita en %A %b %d %Y %H:%M"
+
+#, fuzzy
+#~ msgid "Notification about your journal entry"
+#~ msgstr "NotificaciСn sobre su cita en %A %b %d %Y %H:%M"
+
+#~ msgid "File not found"
+#~ msgstr "Archivo no encontrado"
+
+#~ msgid "Open calendar"
+#~ msgstr "Abrir calendario"
+
+#~ msgid "Save calendar"
+#~ msgstr "Guardar calendario"
+
+#~ msgid "Show a dialog"
+#~ msgstr "Mostrar un diАlogo"
+
+#~ msgid "Percent complete"
+#~ msgstr "Porcentaje completado"
+
+#~ msgid "Edit this task"
+#~ msgstr "Editar esta tarea"
+
+#~ msgid "Go to Today"
+#~ msgstr "Ir a hoy"
+
+#~ msgid "Delete all Occurrences"
+#~ msgstr "Borrar todas las Ocurrencias"
+
+#~ msgid "Summary contains"
+#~ msgstr "El resumen contiene"
+
+#~ msgid "Description contains"
+#~ msgstr "La descripciСn contiene"
+
+#~ msgid "Comment contains"
+#~ msgstr "El comentario contiene"
+
+#~ msgid "Has category"
+#~ msgstr "Tiene la categorМa"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Escaneando carpeta IMAP"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Reenviar a direcciСn"
+
+#~ msgid "Elm Aliases"
+#~ msgstr "Alias de Elm"
+
+#~ msgid "Addressbooks"
+#~ msgstr "Agenda de direcciones"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "Cambiar la carpeta ╚%s╩ al formato ╚%s╩"
+
+#~ msgid "Reconfiguring folder"
+#~ msgstr "Reconfigurar carpeta"
+
+#~ msgid "Closing current folder"
+#~ msgstr "Cerrando carpeta actual"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Renombrando carpeta antigua y abriИndola"
+
+#~ msgid "Creating new folder"
+#~ msgstr "Creando una nueva carpeta"
+
+#~ msgid "Copying messages"
+#~ msgstr "Copiando mensajes"
+
+#~ msgid "Evolution progress"
+#~ msgstr "Progreso de Evolution"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Obteniendo mensaje nЗmero %d de %d (uid ╚%s╩)"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Guardando mensaje %d de %d (uid ╚%s╩)"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (mensaje reenviado)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Fwd: (sin asunto)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Mensaje reenviado (sin asunto)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Mensaje Reenviado-----<br><b>De:</b> %s<br><b>A:</b> "
+#~ "%s<br><b>Asunto:</b> %s<br>"
+
+#~ msgid "<b>Error downloading Metar</b>"
+#~ msgstr "<b>Error obteniendo Metar</b>"
+
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "AЯadir"
+
+#~ msgid "Remove <-"
+#~ msgstr "Quitar <-"
+
+#~ msgid "Work offline"
+#~ msgstr "Trabajar desconectado"
+
+#~ msgid "5 Days"
+#~ msgstr "5 DМas"
+
+#~ msgid "Alter preferences"
+#~ msgstr "Alterar preferencias"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Creando un nuevo calendario"
+
+#~ msgid "Day"
+#~ msgstr "DМa"
+
+#~ msgid "Month"
+#~ msgstr "Mes"
+
+#~ msgid "New _Event"
+#~ msgstr "Nuevo _Evento"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Abrir calendario"
+
+#~ msgid "Prev"
+#~ msgstr "Previo"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Guardar el calendario como otra cosa"
+
+#~ msgid "Settings..."
+#~ msgstr "ConfiguraciСn..."
+
+#~ msgid "Week"
+#~ msgstr "Semana"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Abrir calendario"
+
+#~ msgid "Delete this group"
+#~ msgstr "Borrar este grupo"
+
+#~ msgid "Save the group and close the dialog box"
+#~ msgstr "Guardar el grupo y cerrar la ventana de diАlogo"
+
+#~ msgid "Se_nd group to other..."
+#~ msgstr "E_nviar el egrupo a otro..."
+
+#
+#~ msgid "Send _message to group..."
+#~ msgstr "Enviar un _mensaje al grupo..."
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "Mar_car como LeМdo"
+
+#~ msgid "Mark As I_mportant"
+#~ msgstr "Marcar como I_mportante"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Marcar como _no leМdo"
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Imprimir el mensaje en la impresora"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "Redirigir (ARREGLAME: implementame)"
+
+#~ msgid "_Insert text file..."
+#~ msgstr "_Insertar un archivo de texto..."
+
+#~ msgid "Tasks Preferences..."
+#~ msgstr "Preferencias de las tareas..."
diff --git a/po/fi.po b/po/fi.po
index 3d95876d12..b905f241ac 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-05-08 09:51+0000\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-05-08 15:00+0300\n"
 "Last-Translator: Jarkko Ranta <jjranta@cc.joensuu.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -13,11 +13,19 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3278
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Kortti: "
 
-#: addressbook/backend/ebook/e-card.c:3280
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +33,7 @@ msgstr ""
 "\n"
 "Nimi: "
 
-#: addressbook/backend/ebook/e-card.c:3281
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,7 +41,7 @@ msgstr ""
 "\n"
 "  Etuliite:   "
 
-#: addressbook/backend/ebook/e-card.c:3282
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -41,7 +49,7 @@ msgstr ""
 "\n"
 "  Etunimi:    "
 
-#: addressbook/backend/ebook/e-card.c:3283
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -49,7 +57,7 @@ msgstr ""
 "\n"
 "  Muut nimet: "
 
-#: addressbook/backend/ebook/e-card.c:3284
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -57,13 +65,13 @@ msgstr ""
 "\n"
 "  Sukunimi:   "
 
-#: addressbook/backend/ebook/e-card.c:3285
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3299
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -71,7 +79,7 @@ msgstr ""
 "\n"
 "SyntymДpДivД: "
 
-#: addressbook/backend/ebook/e-card.c:3310
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -79,7 +87,7 @@ msgstr ""
 "\n"
 "Osoite:"
 
-#: addressbook/backend/ebook/e-card.c:3312
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -87,13 +95,13 @@ msgstr ""
 "\n"
 "  Postilokero: "
 
-#: addressbook/backend/ebook/e-card.c:3313
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3314
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -101,7 +109,7 @@ msgstr ""
 "\n"
 "  Katu:        "
 
-#: addressbook/backend/ebook/e-card.c:3315
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -109,13 +117,13 @@ msgstr ""
 "\n"
 "  Kaupunki:    "
 
-#: addressbook/backend/ebook/e-card.c:3316
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3317
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -123,7 +131,7 @@ msgstr ""
 "\n"
 "  Postinumero: "
 
-#: addressbook/backend/ebook/e-card.c:3318
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -131,13 +139,13 @@ msgstr ""
 "\n"
 "  Maa:         "
 
-#: addressbook/backend/ebook/e-card.c:3331
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3343
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -145,7 +153,7 @@ msgstr ""
 "\n"
 "Puhelimet:\n"
 
-#: addressbook/backend/ebook/e-card.c:3346
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -153,7 +161,7 @@ msgstr ""
 "\n"
 "Puhelin:"
 
-#: addressbook/backend/ebook/e-card.c:3370
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -161,7 +169,7 @@ msgstr ""
 "\n"
 "SДhkЖposti:\n"
 
-#: addressbook/backend/ebook/e-card.c:3373
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -169,13 +177,13 @@ msgstr ""
 "\n"
 "SДhkЖposti:"
 
-#: addressbook/backend/ebook/e-card.c:3392
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3398
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -183,7 +191,7 @@ msgstr ""
 "\n"
 "AikavyЖhyke: "
 
-#: addressbook/backend/ebook/e-card.c:3406
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -191,19 +199,19 @@ msgstr ""
 "\n"
 "Maant. sijainti: "
 
-#: addressbook/backend/ebook/e-card.c:3410
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3422
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3423
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -211,7 +219,7 @@ msgstr ""
 "\n"
 "  Nimi:  "
 
-#: addressbook/backend/ebook/e-card.c:3424
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -219,7 +227,7 @@ msgstr ""
 "\n"
 "  YksikkЖ: "
 
-#: addressbook/backend/ebook/e-card.c:3425
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -227,7 +235,7 @@ msgstr ""
 "\n"
 "  YksikkЖ2: "
 
-#: addressbook/backend/ebook/e-card.c:3426
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -235,7 +243,7 @@ msgstr ""
 "\n"
 "  YksikkЖ3: "
 
-#: addressbook/backend/ebook/e-card.c:3427
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -243,7 +251,7 @@ msgstr ""
 "\n"
 "  YksikkЖ4: "
 
-#: addressbook/backend/ebook/e-card.c:3431
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -251,7 +259,7 @@ msgstr ""
 "\n"
 "RyhmДt: "
 
-#: addressbook/backend/ebook/e-card.c:3432
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -267,13 +275,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3445
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3448
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -281,36 +289,24 @@ msgstr ""
 "\n"
 "Julkinen avain: "
 
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:4045
 #, c-format
 msgid "VCard for %s"
 msgstr ""
 
-#: addressbook/backend/ebook/e-destination.c:232
-msgid "???"
-msgstr "???"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr ""
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr ""
-
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Bonobon alustus ei onnistunut"
 
@@ -323,14 +319,14 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr ""
 
@@ -339,717 +335,844 @@ msgstr ""
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "LDAP-palvelin"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Tiedosto"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Tuntematon osoitekirjatyyppi"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Salasana"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Muista tДmД salasana"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "IsДntДpalvelin:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Portti:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Todennus:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Polku:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "Luo polku mikДli sitД ei ole olemassa."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "Muokkaa osoitekirjaa"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "LisДД osoitekirja"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"Valitse osoitekirjan tyyppi, ja anna sen jДlkeen tarpeelliset tiedot siitД."
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Nimi:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Kuvaus:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr ""
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "LisДД"
+msgid "Addressbook Sources"
+msgstr "Osoitekirjan lДhteet"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Poista"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Nimi"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "_LisДД"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "_Muokkaa"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "Muut kontaktit"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Osoitekirjaa ei voitu avata"
+
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
+msgstr "MikД tahansa kenttД sisДltДД"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "Nimi sisДltДД"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "SДhkЖposti sisДltДД"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "Nimi sisДltДД"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "Ensisijainen sДhkЖposti"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "SДhkЖposti 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "SДhkЖposti 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "Valitse tiedosto"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Luo uusi kontakti"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "Muokkaa osoitekirjaa"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "LisДД kontakteihin"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "SДhkЖpostiosoite:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr ""
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr ""
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr ""
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Poista"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "Poista kaikki"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "LДhtevД posti"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Muut kontaktit"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "Vastaanottajat"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "Valitse nimet"
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "Valitse tiedosto"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "RyhmДt:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Etsi"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "T_yЖpaikka"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "TyЖ-_faksi"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "K_ontaktit..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ry_hmДt..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Kontaktinhallinta"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Yksityiskohtaiset"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Yleiset"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Uusi puhelintyyppi"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Organisaatio:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Puhelintyypit"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
-msgstr "Ensisijainen sДhkЖposti"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "Haluaa sДhkЖpostit HTML-muodossa"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Kotisivun osoite:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
-msgstr "_LisДД"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "_Osoite..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "_SyntymДpДivД:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_TyЖ"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Yritys:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "_Kontaktit..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:640 mail/mail-config.glade.h:75
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:98
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Poista"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "_Osasto:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "_Koko nimi..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_Koti"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "_TehtДvДnimike:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_Matkapuhelin"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "_Kutsumanimi:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "_Asema:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_Ammatti:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "Puoli_so:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "_TДmД on postitusosoite"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Poista kontakti?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "TДmД kontakti kuuluu nДihin ryhmiin:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "TyЖ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "TyЖ 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "TyЖ/faksi"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Yritys"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Koti"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Koti 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Koti/faksi"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Matkapuhelin"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Muut"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Muu faksi"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Ensisijainen"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
-msgid "Email 2"
-msgstr "SДhkЖposti 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
-msgid "Email 3"
-msgstr "SДhkЖposti 3"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Poista kontakti?"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:233
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Kontaktin pikalisДys"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:235
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:276
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:282
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "SДhkЖposti"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Osoite _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Kanada"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Tarkista osoite"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "M_aa:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Suomi"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "Yhdysvallat"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Osoite:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_Kaupunki:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "_Postilokero:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "_Osavaltio/lДДni:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "Po_stinumero:"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Tarkasta kokonimi"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "Neiti"
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Hra."
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Rva."
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Nti."
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Etunimi:"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_Sukunimi:"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Toinen nimi:"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:242
-msgid "As _Minicards"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:248
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:408
-#, c-format
-msgid "Enter password for %s"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:436
-msgid "Unable to open addressbook"
-msgstr "Osoitekirjaa ei voitu avata"
-
-#: addressbook/gui/component/addressbook.c:443
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or the LDAP server\n"
-"is down"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:448
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:456
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:607 calendar/gui/gnome-cal.c:233
-msgid "Any field contains"
-msgstr "MikД tahansa kenttД sisДltДД"
-
-#: addressbook/gui/component/addressbook.c:608
-msgid "Name contains"
-msgstr "Nimi sisДltДД"
-
-#: addressbook/gui/component/addressbook.c:609
-msgid "Email contains"
-msgstr "SДhkЖposti sisДltДД"
-
-#: addressbook/gui/component/addressbook.c:752
-msgid "The URI that the Folder Browser will display"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "LDAP-palvelin"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Tiedosto"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Tuntematon osoitekirjatyyppi"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
-msgid "Password"
-msgstr "Salasana"
-
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:170
-msgid "Unknown auth type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "Base"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "One"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:183
-msgid "Subtree"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Unknown scope type"
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "Tiedostonimi:"
 
-#: addressbook/gui/component/addressbook-config.c:353
-msgid "Bind DN:"
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "Joulukuu"
 
-#: addressbook/gui/component/addressbook-config.c:354
-msgid "FIXME Bind DN Help text here"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
-msgstr "Muista tДmД salasana"
-
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
-msgid "Host:"
-msgstr "IsДntДpalvelin:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Host help text here."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Port:"
-msgstr "Portti:"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
+msgstr "Poista"
 
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "Kontaktinhallinta"
 
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
-msgstr ""
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "Kontaktinhallinta"
 
-#: addressbook/gui/component/addressbook-config.c:435
-msgid "Search Scope:"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:489
-msgid "Authentication:"
-msgstr "Todennus:"
-
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
-msgid "Path:"
-msgstr "Polku:"
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "FIXME Path Help text here"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:513
-msgid "Create path if it doesn't exist."
-msgstr "Luo polku mikДli sitД ei ole olemassa."
-
-#: addressbook/gui/component/addressbook-config.c:647
-msgid "Edit Addressbook"
-msgstr "Muokkaa osoitekirjaa"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#, fuzzy
+msgid "New Contact:"
+msgstr "Uusi kontakti"
 
-#: addressbook/gui/component/addressbook-config.c:649
-msgid "Add Addressbook"
-msgstr "LisДД osoitekirja"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#, fuzzy
+msgid "Original Contact:"
+msgstr "Muut kontaktit"
 
-#: addressbook/gui/component/addressbook-config.c:665
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"Valitse osoitekirjan tyyppi, ja anna sen jДlkeen tarpeelliset tiedot siitД."
-
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
-msgid "Name:"
-msgstr "Nimi:"
-
-#: addressbook/gui/component/addressbook-config.c:672
-msgid "FIXME Name help text here"
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:674
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Kuvaus:"
-
-#: addressbook/gui/component/addressbook-config.c:675
-msgid "FIXME Description help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Osoitekirjan lДhteet"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:19
-#: mail/message-browser.c:203 ui/evolution-addressbook.xml.h:3
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Poista"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "Muokkaa"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Nimi"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+msgid "Changed Contact:"
 msgstr "Muut kontaktit"
 
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr ""
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr ""
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
-msgstr ""
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
-msgid "Add to Contacts"
-msgstr "LisДД kontakteihin"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
-msgstr "Poista"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
-msgid "Remove All"
-msgstr "Poista kaikki"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr ""
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Etsi..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Vastaanottajat"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Valitse nimet"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
 msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:148
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Etsi"
 
@@ -1161,150 +1284,250 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Send message to contact"
 msgstr "LДhetД viesti kontaktille"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576 mail/message-browser.c:200
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:55 ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Tulosta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Poista"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "Virhe %s:n lataamisessa"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "LДhteet"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Tuntematon virhe"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "TyЖskentele poissa linjoilta"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+msgid "Card not found"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+msgid "Protocol not supported"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "Peruutettu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "I/O-virhe"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "Virhe %s:n lataamisessa"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Virhe %s:n lataamisessa"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Virhe %s:n lataamisessa"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "Virhe %s:n lataamisessa"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr "Virhe %s:n lataamisessa"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "SДhkЖposti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "Ensisijainen puhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "TyЖpuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "Yrityksen puhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "Kotipuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "TyЖosoite"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "Autopuhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "TyЖpuhelin 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "Kotipuhelin 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "Muu puhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "Muu osoite"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "Osasto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Asema"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Ammatti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "Puoliso"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "Valmis"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "Ladataan kalenteria..."
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Tallenna osoitekirjaan"
 
-#: addressbook/gui/widgets/e-minicard-view.c:469
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1342,7 +1565,8 @@ msgid "Dimensions:"
 msgstr "Mitat:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Kirjasin..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1402,7 +1626,6 @@ msgid "Margins"
 msgstr "Reunukset"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "Sarakkeiden mДДrД:"
 
@@ -1482,37 +1705,61 @@ msgstr "Tyyppi:"
 msgid "Width:"
 msgstr "Leveys:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Kirjasin..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Virhe kommunikoitaessa kalenteripalvelimen kanssa"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
 msgstr ""
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Ok"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr ""
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1522,140 +1769,250 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:56
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+msgid "Notification about your appointment"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, c-format
+msgid "Notification about your task starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, c-format
+msgid "Notification about your task ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+msgid "Notification about your task"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Sulje"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+msgid "Snoo_ze"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "Muokkaa tapaamista"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+msgid "No description available."
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr ""
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
 "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
 "know."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:93 calendar/gui/main.c:52
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
 msgid "Could not initialize GNOME"
 msgstr "GNOMEn alustus ei onnistunut"
 
-#: calendar/gui/alarm-notify/notify-main.c:108
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Bonobon alustus ei onnistunut"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
-msgstr ""
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A, %e %B %Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
-msgstr "Avaa kalenteri"
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
-msgstr "Tallenna kalenteri"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:468
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "Julkinen"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "HenkilЖkohtainen"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1601
-#: calendar/gui/event-editor.c:1628
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "P"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "I"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "L"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:694
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Korkea"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
-#: calendar/gui/calendar-model.c:1574
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:693
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Tavallinen"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:692
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Matala"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:544
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Peruutettu"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:802
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1666,7 +2023,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:882
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
@@ -1674,134 +2031,311 @@ msgstr ""
 "'MДДrittelemДtЖn'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
-#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1198
-#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
-#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "MДДrittelemДtЖn"
 
-#: calendar/gui/calendar-model.c:970
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1010
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1051
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "Prioriteetin tulee olla 'Korkea', 'Tavallinen', 'Matala' tai "
 "'MДДrittelemДtЖn'."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1064
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "MДДrittelemДtЖn"
 
-#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1576
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1578
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "KyllД"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Ei"
 
-#: calendar/gui/calendar-summary.c:198
-msgid "%A, %e %B %Y"
-msgstr "%A, %e %B %Y"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "_NДytД"
 
-#: calendar/gui/calendar-summary.c:207
-msgid "Appointments"
-msgstr "Tapaamiset"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "TyЖviikk_o"
 
-#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "Viikko"
 
-#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:948
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "TehtДvДt"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "Kuukausi"
 
-#: calendar/gui/calendar-summary.c:443
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Virhe ladattaessa kalenteria</b>"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "URI jonka kalenteri nДyttДД"
 
-#: calendar/gui/calendar-summary.c:455
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Virhe ladattaessa kalenteria:<br>Metodia ei tueta"
+#: calendar/gui/dialogs/alarm-options.c:354
+msgid "Audio Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:622
-msgid "Display"
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "Vastaanottajat"
+
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "NДytД asetukset"
+
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:627
-msgid "Show appointments"
-msgstr "NДytД tapaamiset"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:635
-msgid "Show tasks"
-msgstr "NДytД tehtДvДt"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:690
-msgid "Things to do"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Ladataan kalenteria"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "Viestit"
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "URI jonka kalenteri nДyttДД"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+msgid "Play sound:"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "Aja ohjelma"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "pДivДД"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "PДivitД joka"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "tuntia"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "minuutti"
+
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr " %d pДivДД"
+
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr " 1 pДivД"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr " %d viikkoa"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr " 1 viikko"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr " %d tuntia"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr " 1 tunti"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr " %d minuuttia"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr " 1 minuutti"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr " %d sekuntia"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr " 1 sekunti"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Sulje"
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "Kirjoita viesti"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Muokkaa tapaamista"
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an email"
+msgstr "LДhetД sДhkЖpostia"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr "Aja ohjelma"
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr "Luo uusi tapaaminen"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr "Luo uusi tapaaminen"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr "Muistuta minua kaikista tapaamisista"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr "Luo uusi tapaaminen"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+msgid "Basics"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "PДivДys & Aika"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "Muistutukset"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Kuvaus:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_Asetukset"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "jДlkeen"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "ennen"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "pДivД(Д)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr "tunti(a)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+msgid "minute(s)"
+msgstr "minuutti"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
@@ -1833,36 +2367,37 @@ msgid "60 minutes"
 msgstr "60 minuuttia"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
+msgid "Beep when alarm windows appear."
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr ""
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
+msgid "Calendar"
+msgstr "Kalenteri"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
-msgstr ""
+msgid "Calendar Preferences"
+msgstr "Kalenterin asetukset"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
-msgid "Calendar"
-msgstr "Kalenteri"
+msgid "Color for overdue tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
-msgstr "Kalenterin asetukset"
+msgid "Color for tasks due today"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "VДrit"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+#, fuzzy
+msgid "Compress weekends in month view"
 msgstr "TiivistД viikonloput"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+msgid "Date Navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1870,1027 +2405,1154 @@ msgid "Defaults"
 msgstr "Oletukset"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "NДytД asetukset"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
+#: mail/mail-config.glade.h:30
+msgid "Display"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "End of day:"
 msgstr "PДivДn loppu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "Pe"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Perjantai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Korosta"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "Ma"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Maanantai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+msgid "Overdue tasks"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
-msgstr "Valitse vДri"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "Prioriteetti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Muistuta minua kaikista tapaamisista"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Muistutukset"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "La"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "NДytД"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "NДytД tapaamisten loppumisajat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "NДytД viikkonumerot"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "PДivДn alku:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "Su"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Sunnuntai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "TehtДvДt"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "Tasks due today"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "To"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Torstai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "Time"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"AikavyЖhyke: "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "Ti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Tiistai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "Ke"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "TyЖviikko"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
+msgstr "TyЖviikk_o"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "minuuttia niitД ennen."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
-msgid "seconds."
-msgstr "sekuntia."
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "Haluatko varmasti poistaa tДmДn tilin?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "Haluatko todella poistaa tehtДvДn '%s'?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "Haluatko varmasti poistaa tДmДn tilin?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "Valmis"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "Valmis"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+msgid "Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "Muokkaa tapaamista"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "Tapaaminen - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "TehtДvД - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Ei kuvausta"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "Kirjoita tiedoston yli?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Saman niminen tiedosto on jo olemassa.\n"
+"Kirjoitetaanko sen yli?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Tallenna nimellД..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Haluatko todella poistaa tapaamisen '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:73
+#: calendar/gui/dialogs/delete-comp.c:87
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Haluatko todella poistaa tДmДn nimettЖmДn tapaamisen?"
 
-#: calendar/gui/dialogs/delete-comp.c:79
+#: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Haluatko todella poistaa tehtДvДn '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:82
+#: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Haluatko todella poistaa tДmДn nimettЖmДn tehtДvДn?"
 
-#: calendar/gui/dialogs/delete-comp.c:88
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Haluatko tallentaa muutokset?"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "Haluatko todella poistaa tapaamisen '%s'?"
 
-#: calendar/gui/dialogs/task-editor.c:709
-msgid "Edit Task"
-msgstr "Muokkaa tehtДvДД"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "Haluatko todella poistaa tehtДvДn '%s'?"
 
-#: calendar/gui/dialogs/task-editor.c:714 calendar/gui/event-editor.c:382
-#, c-format
-msgid "Appointment - %s"
-msgstr "Tapaaminen - %s"
+#: calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "Haluatko varmasti poistaa tДmДn tilin?"
 
-#: calendar/gui/dialogs/task-editor.c:717 calendar/gui/event-editor.c:385
-#, c-format
-msgid "Task - %s"
-msgstr "TehtДvД - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Valitse tiedosto"
 
-#: calendar/gui/dialogs/task-editor.c:720 calendar/gui/event-editor.c:388
-#, c-format
-msgid "Journal entry - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "KДДnnД valinta"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
 msgstr ""
+"\n"
+"AikavyЖhyke: "
 
-#: calendar/gui/dialogs/task-editor.c:734 calendar/gui/event-editor.c:402
-msgid "No summary"
-msgstr "Ei kuvausta"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
+msgstr "Tapaaminen"
+
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
+msgstr "Muistutus"
+
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "Peruuta tapaaminen"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "_Koko pДivДn kestДvД tapahtuma"
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Luokittelu"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Date & Time"
 msgstr "PДivДys & Aika"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Pri_vate"
 msgstr "Y_ksityinen"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "Ju_lkinen"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "_AlkamispДivД:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "K_uvaus:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "TehtДvД"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
 msgid "_Confidential"
 msgstr "_Luottamuksellinen"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "_Kontaktit..."
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "_Loppumisaika:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr ""
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "_Alkamisaika:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_Prioriteetti:"
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "_Tila:"
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "RyhmДn nimi:"
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
-msgstr "RyhmДt"
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "PaperilДhde:"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Completion Date"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "End Date"
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Start Date"
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:164
-msgid "Percent complete"
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Summary"
-msgstr "Kuvaus"
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "LisДД toiminto"
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
-msgstr "LДpinДkyvyys"
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr "HyvДksy "
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
-msgstr "URL:"
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr "Poistettu"
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:170
-msgid "Click here to add a task"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Poistettu"
 
-#: calendar/gui/e-calendar-table.c:374
-#, c-format
-msgid "0%"
-msgstr "0%"
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "Ammatti"
 
-#: calendar/gui/e-calendar-table.c:375
-#, c-format
-msgid "10%"
-msgstr "10%"
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:376
-#, c-format
-msgid "20%"
-msgstr "20%"
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Autopuhelin"
 
-#: calendar/gui/e-calendar-table.c:377
-#, c-format
-msgid "30%"
-msgstr "30%"
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-calendar-table.c:378
-#, c-format
-msgid "40%"
-msgstr "40%"
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/e-calendar-table.c:379
-#, c-format
-msgid "50%"
-msgstr "50%"
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Non-Participants"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:380
-#, c-format
-msgid "60%"
-msgstr "60%"
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "LДhetetyt"
 
-#: calendar/gui/e-calendar-table.c:381
-#, c-format
-msgid "70%"
-msgstr "70%"
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "Poista..."
 
-#: calendar/gui/e-calendar-table.c:382
-#, c-format
-msgid "80%"
-msgstr "80%"
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
+msgstr "Osanottaja"
 
-#: calendar/gui/e-calendar-table.c:383
-#, c-format
-msgid "90%"
-msgstr "90%"
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+msgid "Common Name"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:384
-#, c-format
-msgid "100%"
-msgstr "100%"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "Poistettu"
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "Poistettu"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+msgid "Language"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit this task..."
-msgstr "Muokkaa tДtД tehtДvДД..."
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "Joulukuu"
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "Muokkaa tehtДvДД"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
-msgstr "Poista tДmД tehtДvД"
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr "Rooli"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
-msgstr "Poista tehtДvД"
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Tila"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
-msgstr "am"
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Tyyppi"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organisoija:"
 
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
-msgid "%A %d %B"
-msgstr "%A %d %B"
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Organisoija:"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+msgid "_Invite Others"
+msgstr ""
 
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
-#: calendar/gui/e-week-view-main-item.c:348
-msgid "%d %b"
-msgstr "%d %b"
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Organisoija:"
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
-msgstr "Uusi tapaaminen"
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
-msgid "New All Day Event"
-msgstr "Uusi koko pДivДn tapahtuma"
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
-msgid "Go to Today"
-msgstr "Siirry tДhДn pДivДДn"
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
-msgid "Go to Date..."
-msgstr "Siirry pДivДДn..."
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "pДivД"
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Avaa"
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
-msgid "Delete this Appointment"
-msgstr "Poista tДmД tapaaminen"
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr "."
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
-msgid "Make this Occurrence Movable"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
-msgid "Delete this Occurrence"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Joka"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "Poikkeukset"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3179
-msgid "Delete all Occurrences"
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
-msgid "Component successfully updated."
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "Muuta"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
-msgstr "En pystynyt avaamaan kalenteritiedostoasi!\n"
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "kuukautta"
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
-msgstr "En pystynyt lataamaan kalenteritiedostoasi!\n"
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
-msgstr "En pystynyt lukemaan kalenteritiedostoasi!\n"
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "viikkoa"
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
+msgstr "vuotta"
 
-#: calendar/gui/e-itip-control.c:499
-msgid "I couldn't update your calendar store."
-msgstr ""
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr "Haluatko tallentaa muutokset?"
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Component successfully deleted."
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-msgid "I don't recognize this type of calendar component."
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
-msgstr "LisДД kalenteriin"
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
-msgid " Accept "
-msgstr "HyvДksy "
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "Poistettu"
 
-#: calendar/gui/e-itip-control.c:815
-msgid " Decline "
-msgstr ""
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "Poistettu"
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Tentative "
-msgstr ""
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "MДДrittelemДtЖn"
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
-msgstr "PДivitД kalenteri"
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
+msgstr "URL:"
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
-msgstr "Peruuta tapaaminen"
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "TehtДvД"
 
-#: calendar/gui/e-itip-control.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:2
 #, no-c-format
-msgid "%P %%"
-msgstr "%P %%"
-
-#: calendar/gui/e-itip-control.glade.h:3
-msgid "--to--"
+msgid "% Comp_lete:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:4
-msgid "Calendar Message"
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:623
-msgid "Date:"
-msgstr "PДivДys:"
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "_AlkamispДivД:"
 
-#: calendar/gui/e-itip-control.glade.h:8
-msgid "Loading calendar..."
-msgstr "Ladataan kalenteria..."
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
+msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organisoija:"
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
+msgstr "_Prioriteetti:"
 
-#: calendar/gui/e-itip-control.glade.h:10
-msgid "Server Message:"
-msgstr ""
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
+msgstr "_Tila:"
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Kuvaus:"
+#: calendar/gui/e-calendar-table.c:351
+#, c-format
+msgid "0%"
+msgstr "0%"
 
-#: calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:352
+#, c-format
+msgid "10%"
+msgstr "10%"
 
-#: calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:353
+#, c-format
+msgid "20%"
+msgstr "20%"
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "Osanottaja"
+#: calendar/gui/e-calendar-table.c:354
+#, c-format
+msgid "30%"
+msgstr "30%"
 
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "Osanottajan osoite"
+#: calendar/gui/e-calendar-table.c:355
+#, c-format
+msgid "40%"
+msgstr "40%"
 
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "Osanottajat: "
+#: calendar/gui/e-calendar-table.c:356
+#, c-format
+msgid "50%"
+msgstr "50%"
 
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"Peruuta\n"
-"tapaaminen"
+#: calendar/gui/e-calendar-table.c:357
+#, c-format
+msgid "60%"
+msgstr "60%"
 
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:358
+#, c-format
+msgid "70%"
+msgstr "70%"
 
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:359
+#, c-format
+msgid "80%"
+msgstr "80%"
 
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:360
+#, c-format
+msgid "90%"
+msgstr "90%"
 
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:361
+#, c-format
+msgid "100%"
+msgstr "100%"
 
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr ""
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "_Avaa"
 
-#: calendar/gui/e-meeting-dialog.glade.h:14
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "L_eikkaa"
 
-#: calendar/gui/e-meeting-dialog.glade.h:16
-msgid "RSVP"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Kopioi"
 
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "L_iitД"
 
-#: calendar/gui/e-meeting-dialog.glade.h:19
-msgid "Required Participant"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "Valmis"
 
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Role"
-msgstr "Rooli"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
+msgstr "Poista tДmД tehtДvД"
 
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid ""
-"Schedule\n"
-"Time"
+#: calendar/gui/e-calendar-table.c:866
+msgid "_Mark Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:23 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1086
-msgid "Status"
-msgstr "Tila"
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
+msgstr "Poista tehtДvД"
 
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
-msgid "All"
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:155
-msgid "Category:"
-msgstr "RyhmДt:"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "Valmis"
 
-#: calendar/gui/e-tasks.c:298
-#, c-format
-msgid "Could not load the tasks in `%s'"
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:310
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr ""
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "RyhmДt"
 
-#: calendar/gui/event-editor.c:377
-msgid "Edit Appointment"
-msgstr "Muokkaa tapaamista"
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "Valmis"
 
-#: calendar/gui/event-editor.c:449
-msgid "on"
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:81
-msgid "day"
-msgstr "pДivД"
-
-#: calendar/gui/event-editor.c:601
-msgid "on the"
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/event-editor.c:608
-msgid "th"
-msgstr "."
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr ""
 
-#: calendar/gui/event-editor.c:754
-msgid "occurrences"
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/event-editor.c:871
-msgid "This appointment contains recurrences that Evolution cannot edit."
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Prioriteetti"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1543
-#, c-format
-msgid " %d days"
-msgstr " %d pДivДД"
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "Kuvaus"
 
-#: calendar/gui/event-editor.c:1545
-msgid " 1 day"
-msgstr " 1 pДivД"
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "TehtДvДt"
 
-#: calendar/gui/event-editor.c:1548
-#, c-format
-msgid " %d weeks"
-msgstr " %d viikkoa"
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "LДpinДkyvyys"
 
-#: calendar/gui/event-editor.c:1550
-msgid " 1 week"
-msgstr " 1 viikko"
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL:"
 
-#: calendar/gui/event-editor.c:1553
+#: calendar/gui/e-day-view-time-item.c:519
 #, c-format
-msgid " %d hours"
-msgstr " %d tuntia"
+msgid "%02i minute divisions"
+msgstr ""
 
-#: calendar/gui/event-editor.c:1555
-msgid " 1 hour"
-msgstr " 1 tunti"
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
+msgid "%A %d %B"
+msgstr "%A %d %B"
 
-#: calendar/gui/event-editor.c:1558
-#, c-format
-msgid " %d minutes"
-msgstr " %d minuuttia"
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
+#: calendar/gui/e-week-view-main-item.c:348
+msgid "%d %b"
+msgstr "%d %b"
 
-#: calendar/gui/event-editor.c:1560
-msgid " 1 minute"
-msgstr " 1 minuutti"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "am"
 
-#: calendar/gui/event-editor.c:1563
-#, c-format
-msgid " %d seconds"
-msgstr " %d sekuntia"
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "pm"
 
-#: calendar/gui/event-editor.c:1565
-msgid " 1 second"
-msgstr " 1 sekunti"
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
+msgstr "Uusi tapaaminen"
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1588
-msgid "Play a sound"
-msgstr ""
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
+msgstr "Uusi koko pДivДn tapahtuma"
 
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1591
-msgid "Show a dialog"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1594
-msgid "Send an email"
-msgstr "LДhetД sДhkЖpostia"
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
+msgstr "Siirry pДivДДn..."
 
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1597
-msgid "Run a program"
-msgstr "Aja ohjelma"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
+msgstr "Poista tДmД tapaaminen"
 
-#: calendar/gui/event-editor.c:1612
-msgid " before start of appointment"
-msgstr ""
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
+msgstr "Tallenna nykyinen tiedosto"
 
-#: calendar/gui/event-editor.c:1614
-msgid " after start of appointment"
-msgstr ""
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
+msgstr "Poista tДmД viesti"
 
-#: calendar/gui/event-editor.c:1622
-msgid " before end of appointment"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1624
-msgid " after end of appointment"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3132 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "_Koko pДivДn kestДvД tapahtuma"
+#: calendar/gui/e-itip-control.c:697
+#, fuzzy
+msgid "This is a meeting request."
+msgstr "_TДmД on postitusosoite"
 
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Tapaaminen"
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Joka"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Poikkeukset"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+#, fuzzy
+msgid "The message is not understandable."
+msgstr "Tiedosto on olemassa, muttei lukukelpoinen."
 
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Muuta"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Muistutus"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "Asetukset..."
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "_Loppumisaika:"
+#: calendar/gui/e-itip-control.c:834
+msgid "The message does not appear to be properly formed"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "_Alkamisaika:"
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "_AlkamispДivД:"
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "jДlkeen"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
-msgid "before"
-msgstr "ennen"
+#: calendar/gui/e-itip-control.c:1015
+#, fuzzy
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "En pystynyt avaamaan kalenteritiedostoasi!\n"
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "pДivД(Д)"
+#: calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr "%P %%"
 
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
+#: calendar/gui/e-itip-control.glade.h:4
+msgid "Calendar Message"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr ""
+#: calendar/gui/e-itip-control.glade.h:5
+msgid "Date:"
+msgstr "PДivДys:"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "tunti(a)"
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "Ladataan kalenteria"
 
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
-msgid "minute(s)"
-msgstr "minuutti"
+#: calendar/gui/e-itip-control.glade.h:8
+msgid "Loading calendar..."
+msgstr "Ladataan kalenteria..."
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr "kuukautta"
+#: calendar/gui/e-itip-control.glade.h:10
+msgid "Server Message:"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "start of appointment"
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "until"
+#: calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "week(s)"
-msgstr "viikkoa"
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
+msgid "All"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "year(s)"
-msgstr "vuotta"
+#: calendar/gui/e-tasks.c:252
+msgid "Category:"
+msgstr "RyhmДt:"
 
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-msgid "New Appointment..."
-msgstr "Uusi tapaaminen..."
+#: calendar/gui/e-tasks.c:403
+#, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr ""
 
-#: calendar/gui/e-week-view.c:3314
-msgid "Delete All Occurrences"
+#: calendar/gui/e-tasks.c:415
+#, c-format
+msgid "The method required to load `%s' is not supported"
 msgstr ""
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/gnome-cal.c:234
-msgid "Summary contains"
-msgstr "Yhteenveto sisДltДД"
-
-#: calendar/gui/gnome-cal.c:235
-msgid "Description contains"
-msgstr "Kuvaus sisДltДД"
-
-#: calendar/gui/gnome-cal.c:236
-msgid "Comment contains"
-msgstr "Kommentti sisДltДД"
-
-#: calendar/gui/gnome-cal.c:237
-msgid "Has category"
-msgstr "SisДltДД ryhmДn"
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "Uusi tapaaminen..."
 
-#: calendar/gui/gnome-cal.c:840
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:851
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Huhtikuu"
@@ -2912,232 +3574,253 @@ msgid "Go To Date"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Siirry tДhДn pДivДДn"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Tammikuu"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "HeinДkuu"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "KesДkuu"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "Maaliskuu"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "Toukokuu"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "Marraskuu"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "Lokakuu"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Syyskuu"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Siirry tДhДn pДivДДn"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Su"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Ma"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Ti"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "Ke"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "To"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Pe"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "La"
 
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "TehtДvДt"
+
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1104
+#: calendar/gui/print.c:1846
 #, c-format
-msgid "Current week (%s - %s)"
+msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Tulosta kalenteri"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1524
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:57
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Tulostuksen esikatselu"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Tulosta tДmД kohta"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "Tulostusasetukset"
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
@@ -3173,80 +3856,100 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "SMTKTPL"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:209
+#: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:336
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "Haetaan viestiД %d (%d%%)"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
-#, c-format
-msgid "Failed message %d"
-msgstr ""
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, fuzzy, c-format
+msgid "Failed on message %d"
+msgstr "VДlitetty viesti - %s"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "ViestiД ei voida avata"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-msgid "Complete"
-msgstr "Valmis"
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Haetaan viestiД %d / %d"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Virhe jДsennettДessД suodatinta: %s: %s"
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -3278,14 +3981,33 @@ msgstr ""
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Putken luonti epДonnistui: %s"
+
+#: camel/camel-lock-client.c:123
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "Haaroitus epДonnistui: %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3300,113 +4022,108 @@ msgstr ""
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:199
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:245
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "VIrhe luettaessa viestitiedostoa: %s"
-
-#: camel/camel-movemail.c:256
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Virhe kirjoitettaessa vДliaikaista viestitiedostoa: %s"
-
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Viestin tallentaminen vДliaikaistiedostoon %s epДonnistui: %s"
 
-#: camel/camel-movemail.c:306
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Putken luonti epДonnistui: %s"
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Haaroitus epДonnistui: %s"
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(tuntematon virhe)"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "VIrhe luettaessa viestitiedostoa: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Virhe kirjoitettaessa vДliaikaista viestitiedostoa: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Virhe kopioitaessa viestin vДliaikaistiedostoa: %s"
 
-#: camel/camel-pgp-context.c:188
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:509
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
-#: camel/camel-pgp-context.c:1055 camel/camel-pgp-context.c:1267
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Ei annettu salasanaa."
 
-#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
-#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1062
-#: camel/camel-pgp-context.c:1274
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Putken luominen GPG/PGP:lle epДonnistui: %s"
 
-#: camel/camel-pgp-context.c:681
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:871
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr ""
 
-#: camel/camel-pgp-context.c:888
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "VДliaikaistiedostoa ei voitu luoda: %s"
 
-#: camel/camel-pgp-context.c:1045
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr "Ei puhdasta tekstiД salattavaksi."
 
-#: camel/camel-pgp-context.c:1071
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "Vastaanottajia ei ole mДДritelty"
 
-#: camel/camel-pgp-context.c:1259
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -3442,7 +4159,7 @@ msgid "Connection cancelled"
 msgstr "Yhteys peruutettu"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
@@ -3451,13 +4168,13 @@ msgstr ""
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
-#: camel/camel-remote-store.c:470
-#: camel/providers/imap/camel-imap-command.c:287
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:476
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr ""
 
@@ -3554,7 +4271,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -3618,12 +4335,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:294 camel/camel-session.c:363
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:478
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3632,26 +4349,53 @@ msgstr ""
 "Hakemistoa %s ei voitu luoda:\n"
 "%s"
 
-#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:1007 mail/mail-ops.c:1014
-#: mail/mail-ops.c:1032 mail/mail-ops.c:1033
-msgid "Trash"
-msgstr "Roskakori"
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "Tiedostoa ei ole olemassa."
+
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "Tiedostoa ei ole olemassa."
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, fuzzy, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "KДyttДjДtunnuksen lДhetys palvelimelle epДonnistui"
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
+#, fuzzy
+msgid "Failed to decode message."
+msgstr "LisДД viestiin liitetiedoston"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3661,17 +4405,29 @@ msgid ""
 "Do you wish to accept anyway?"
 msgstr ""
 
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
+
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL:n `%s' jДsentДminen epДonnistui"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "Ei kyseistД viestiД: %s"
@@ -3680,64 +4436,75 @@ msgstr "Ei kyseistД viestiД: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Et voi kopioida viestejД tДstД roskakorista."
 
-#: camel/providers/imap/camel-imap-message-cache.c:150
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "VДlimuistihakemistoa ei voitu avata: %s"
-
-#: camel/providers/imap/camel-imap-command.c:232
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-komento epДonnistui: %s"
 
-#: camel/providers/imap/camel-imap-command.c:241 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Tuntematon virhe"
-
-#: camel/providers/imap/camel-imap-command.c:295
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:487
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:524
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Odottamaton OK-vastaus IMAP-palvelimelta: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:170
+#: camel/providers/imap/camel-imap-folder.c:192
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Hakemistoa %s ei voitu luoda: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:189
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:362
-msgid "Scanning IMAP folder"
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1043
-#: camel/providers/imap/camel-imap-folder.c:1265
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "Tallennetaan viestejД"
+
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1071
-#: camel/providers/imap/camel-imap-folder.c:1298
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Tallennetaan viestejД"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "VДlimuistihakemistoa ei voitu avata: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "Tarkastetaan onko uutta sДhkЖpostia"
 
@@ -3745,7 +4512,7 @@ msgstr "Tarkastetaan onko uutta sДhkЖpostia"
 msgid "Check for new messages in all folders"
 msgstr "Etsi uusia viestejД kaikista kansioista"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:551
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Kansiot"
 
@@ -3777,28 +4544,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ota yhteys IMAP-palvelimeen tekstimuotoista salasanaa kДyttДen."
 
-#: camel/providers/imap/camel-imap-store.c:454
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:464
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:488
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:503
-#: camel/providers/smtp/camel-smtp-transport.c:410
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "Et antanut salasanaa."
 
-#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3806,36 +4573,49 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:788 mail/mail-local.c:337
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:39
-msgid "MH-format mail directories"
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:40
+msgid "MH-format mail directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
+#: camel/providers/local/camel-local-provider.c:70
+msgid "Unix mbox spool-format mail files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:71
+msgid "For storing local mail in standard Unix spool directories"
+msgstr ""
+
 #: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -3875,42 +4655,43 @@ msgstr ""
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -3918,14 +4699,14 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Kansiota `%s' ei ole olemassa."
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -3933,22 +4714,27 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kansion `%s' poistaminen epДonnistui: %s"
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr ""
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr "Kansion `%s' poistaminen epДonnistui: %s"
+
 #: camel/providers/local/camel-maildir-summary.c:405
 #: camel/providers/local/camel-maildir-summary.c:526
 #, c-format
@@ -3956,11 +4742,13 @@ msgid "Cannot open maildir directory path: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
@@ -3970,9 +4758,12 @@ msgstr ""
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3981,11 +4772,13 @@ msgstr ""
 "Viestin %s hakeminen kansiosta %s epДonnistui\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -4025,36 +4818,45 @@ msgstr ""
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
 #: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 msgid "Summarising folder"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1397
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Synkronoidaan kansiota"
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
@@ -4063,21 +4865,28 @@ msgstr ""
 #: camel/providers/local/camel-mbox-summary.c:557
 #: camel/providers/local/camel-mbox-summary.c:746
 #: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:635
 #: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
@@ -4092,13 +4901,14 @@ msgstr ""
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Tuntematon virhe: %s"
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
@@ -4113,39 +4923,94 @@ msgstr "`%s' ei ole hakemisto."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr ""
+"Viestin %s hakeminen kansiosta %s epДonnistui\n"
+"  %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "`%s' ei ole tavallinen tiedosto."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "Kansiota `%s' ei ole olemassa."
+
+#: camel/providers/local/camel-spool-store.c:176
+msgid "Spool stores do not have an inbox"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Paikallinen viestitiedosto %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "VДliaikaishakemistoa ei voitu luoda: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "Kansion `%s' poistaminen epДonnistui: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "KДyttДjДtunnuksen lДhetys palvelimelle epДonnistui"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "Ei saatu ryhmДluetteloa palvelimelta."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -4158,24 +5023,24 @@ msgstr "KeskusteluryhmДt"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
@@ -4226,7 +5091,7 @@ msgstr "JДtД viestit palvelimelle"
 msgid "Delete after %s day(s)"
 msgstr "Poista %s:n pДivДn kuluttua"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4305,7 +5170,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4357,7 +5222,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4365,122 +5230,122 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:168
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "VДliaikainen todennusvirhe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "Todennus vaaditaan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:313
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:356
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:395
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:418
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4488,311 +5353,234 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:534
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-palvelin %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr "ViestiД ei voida lДhettДД: lДhettДjДn osoitetta ei ole mДДritelty."
 
-#: camel/providers/smtp/camel-smtp-transport.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr "ViestiД ei voida lДhettДД: lДhettДjДn osoite on epДkelpo."
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "LДhetetДДn viestiД"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "ViestiД ei voida lДhettДД: vastaanottajia ei ole mДДritelty."
 
-#: camel/providers/smtp/camel-smtp-transport.c:676
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:695
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#: camel/providers/smtp/camel-smtp-transport.c:755
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Todennus"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:805
+#: camel/providers/smtp/camel-smtp-transport.c:782
+msgid "AUTH request failed."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:831
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:850
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:875
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:925
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:944
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:959
-#: camel/providers/smtp/camel-smtp-transport.c:977
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:996
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1020
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1062
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 tavy"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u tavua"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "liite"
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "LiitД tiedosto"
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "Poista seuraavat tiedostot liiteluettelosta"
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "LisДД liite..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "LisДД viestiin liitetiedoston"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1086
-msgid "Attachment"
-msgstr "Liite"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "Liitteen ominaisuudet"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Tiedostonimi:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr ""
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "MIME-tyyppi:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr ""
-
-#: composer/e-msg-composer.c:529
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-
-#: composer/e-msg-composer.c:702
-msgid "Save as..."
-msgstr "Tallenna nimellД..."
-
-#: composer/e-msg-composer.c:713
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Virhe tallennettaessa tiedostoa: %s"
-
-#: composer/e-msg-composer.c:733
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Virhe avattaessa tiedostoa: %s"
-
-#: composer/e-msg-composer.c:805
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-
-#: composer/e-msg-composer.c:863 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:869
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"TДtД viestiД ei ole lДhetetty.\n"
-"\n"
-"Haluatko tallentaa muutokset?"
-
-#: composer/e-msg-composer.c:894
-msgid "Open file"
-msgstr "Avaa tiedosto"
-
-#: composer/e-msg-composer.c:1020
-msgid "That file does not exist."
-msgstr "Tiedostoa ei ole olemassa."
-
-#: composer/e-msg-composer.c:1030
-msgid "That is not a regular file."
-msgstr "Se ei ole tavallinen tiedosto."
-
-#: composer/e-msg-composer.c:1040
-msgid "That file exists but is not readable."
-msgstr "Tiedosto on olemassa, muttei lukukelpoinen."
-
-#: composer/e-msg-composer.c:1050
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Tiedosto vaikutti avattavalta, mutta avaaminen epДonnistui."
-
-#: composer/e-msg-composer.c:1072
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"Tiedosto on hyvin suuri (yli 100K).\n"
-"Haluatko varmasti liittДД sen?"
-
-#: composer/e-msg-composer.c:1093
-msgid "An error occurred while reading the file."
-msgstr "Virhe luettaessa tiedostoa."
-
-#: composer/e-msg-composer.c:1394 composer/e-msg-composer.c:1737
-msgid "Compose a message"
-msgstr "Kirjoita viesti"
-
-#: composer/e-msg-composer.c:1828
-msgid "Could not create composer window."
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr ""
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:354 mail/mail-format.c:744
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "LДhettДjД:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:360 mail/mail-format.c:746
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "Vastausosoite:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:371 mail/mail-format.c:643
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Aihe:"
 
-#: composer/e-msg-composer-hdrs.c:385 mail/mail-format.c:748
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "Vastaanottaja:"
 
-#: composer/e-msg-composer-hdrs.c:386
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:389 mail/mail-format.c:750
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Kopiot:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Anna osoitteet joihin lДhetetДДn kopio viestistД (Cc)"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Piilokopiot:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4800,334 +5588,278 @@ msgstr ""
 "Anna osoitteet joihin lДhetetДДn kopiot viestistД ilman ettД muut "
 "vastaanottajat nДkisivДt tДtД (Bcc)"
 
-#: composer/evolution-composer.c:355
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "LiitД tiedosto"
+
+#: composer/e-msg-composer.c:670
+#, fuzzy, c-format
 msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
+"Could not open file %s:\n"
+"%s"
+msgstr "Kansion `%s' poistaminen epДonnistui: %s"
 
-#: composer/evolution-composer.c:370
-msgid "Cannot initialize Evolution's composer."
-msgstr ""
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr "Virhe avattaessa tiedostoa: %s"
 
-#: data/evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr ""
+#: composer/e-msg-composer.c:873
+msgid "Save as..."
+msgstr "Tallenna nimellД..."
 
-#: data/evolution.keys.in.h:1
-msgid "address card"
-msgstr ""
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "Varoitus"
 
-#: data/evolution.keys.in.h:2
-msgid "calendar information"
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
 msgstr ""
 
-#. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
-
-#. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
-msgid "%a %m/%d/%Y %H:%M"
-msgstr "%a %d/%m/%Y %H:%M"
-
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%a %d/%m/%Y %I:%M %p"
-
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
-msgid "%H:%M"
-msgstr "%H:%M"
+#: composer/e-msg-composer.c:906
+#, c-format
+msgid "Error saving file: %s"
+msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
+#: composer/e-msg-composer.c:926
+#, c-format
+msgid "Error loading file: %s"
+msgstr "Virhe avattaessa tiedostoa: %s"
 
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
+#: composer/e-msg-composer.c:997
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
 
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
+#: composer/e-msg-composer.c:1055
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "ViestiД ei saatu POP-palvelimelta %s: %s"
 
-#: executive-summary/component/e-summary.c:926
-#, c-format
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
 msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"HTML-tiedostoa ei voitu avata:\n"
+"Unable to seek on file: %s\n"
 "%s"
+msgstr "Viestin tallentaminen vДliaikaistiedostoon %s epДonnistui: %s"
 
-#: executive-summary/component/e-summary.c:940
-#, c-format
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
 msgid ""
-"Error reading data:\n"
+"Unable to truncate file: %s\n"
 "%s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:958
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:126
-msgid "Select a service"
-msgstr "Valitse palvelu"
+msgstr "Viestin tallentaminen vДliaikaistiedostoon %s epДonnistui: %s"
 
-#: executive-summary/component/e-summary-callbacks.c:290
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
 msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
+#: composer/e-msg-composer.c:1173
+#, fuzzy
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
 msgstr ""
+"Evolution on lЖytДnyt Elmin sДhkЖpostitiedostoja.\n"
+"Haluatko tuoda nДmД postit Evolutioniin?"
 
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
+#: composer/e-msg-composer.c:1321
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
 msgstr ""
+"TДtД viestiД ei ole lДhetetty.\n"
+"\n"
+"Haluatko tallentaa muutokset?"
 
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Suorita %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Sulje %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "SiirrД %s vasemmalle"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "SiirrД %s oikealle"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "SiirrД %s edelliselle riville"
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
 
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "SiirrД %s seuraavalle riville"
+#: composer/e-msg-composer.c:1351
+msgid "Open file"
+msgstr "Avaa tiedosto"
 
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "Aseta %s"
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "LiitД tekstitiedosto..."
 
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "UlkonДkЖ"
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+msgid "Compose a message"
+msgstr "Kirjoita viesti"
 
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "Tausta:"
+#: composer/e-msg-composer.c:2351
+msgid "Could not create composer window."
+msgstr ""
 
-#: executive-summary/component/main.c:62
+#: composer/evolution-composer.c:359
 msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
 msgstr ""
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
+#: composer/evolution-composer.c:374
+msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
+#: data/evolution.desktop.in.h:2
+msgid "The Evolution groupware suite"
 msgstr ""
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
+#: data/evolution.keys.in.h:1
+msgid "address card"
 msgstr ""
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
+#: data/evolution.keys.in.h:2
+msgid "calendar information"
 msgstr ""
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr ""
+#. strptime format for a date.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1480
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr ""
+#. strptime format for a time of day, in 12-hour format.
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Testaa bonobo-palvelua"
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Testaa palvelua"
+#. strptime format for time of day, without seconds, 12-hour format.
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "Virhe"
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: executive-summary/test-service/rdf-summary.c:768
-msgid "Update automatically"
-msgstr "PДivitД automaattisesti"
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
 
-#: executive-summary/test-service/rdf-summary.c:778
-msgid "Update now"
-msgstr "PДivitД heti"
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %d/%m/%Y"
 
-#: executive-summary/test-service/rdf-summary.c:788
-msgid "Update every "
-msgstr "PДivitД joka"
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
 
-#: executive-summary/test-service/rdf-summary.c:796
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "minuutti"
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:298
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:303
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%a %d/%m/%Y %H:%M"
 
-#: filter/filter-datespec.c:78
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:312
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%a %d/%m/%Y %I:%M %p"
+
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "vuosi"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "vuotta"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "kuukausi"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "kuukautta"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "viikko"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "viikkoa"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "pДivДД"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "tunti"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "tuntia"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "minuutti"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "sekunti"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "sekuntia"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Hups. Olet unohtanut valita pДivДn."
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Hups. Olet valinnut epДkelvon pДivДn."
 
-#: filter/filter-datespec.c:276
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:339
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5135,28 +5867,36 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr ""
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr ""
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "nyt"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr ""
 
@@ -5179,8 +5919,8 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr ""
 
@@ -5192,46 +5932,6 @@ msgstr ""
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr ""
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr ""
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Tulevat"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "LДhtevДt"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr ""
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr ""
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr ""
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr ""
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr ""
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr ""
-
 #: filter/filter-input.c:193
 #, c-format
 msgid ""
@@ -5251,36 +5951,87 @@ msgstr "SДДnnЖn nimi: "
 msgid "Untitled"
 msgstr "NimetЖn"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "Jos"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Suorita toiminnot"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "kaikki ehdot tДytetДДn"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "mikДДn ehdoista tДyttyy"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "LisДД ehto"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "tulevat"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "lДhtevДt"
 
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "LisДД"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Muokkaa"
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr ""
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr ""
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "Tulevat"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "LДhtevДt"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr ""
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr ""
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr ""
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr ""
+
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
+msgid "Assign Color"
 msgstr ""
 
 #: filter/libfilter-i18n.h:4
@@ -5356,90 +6107,91 @@ msgid "Expression"
 msgstr ""
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "VДlitД osoitteeseen"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "on"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "on suurempi kuin"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "on pienempi kuin"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "ei ole"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Viestin otsikko"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Viesti vastaanotettu"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Viesti lДhetetty"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "SiirrД kansioon"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Lue"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Vastaanottajat"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.c:1086
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "LДhettДjД"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr ""
 
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Koko"
+
 #: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr ""
@@ -5460,7 +6212,8 @@ msgstr "alkaa merkkijonolla"
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/message-list.c:1087
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Aihe"
 
@@ -5488,188 +6241,269 @@ msgstr "Muokkaa sДДntЖД"
 msgid "Score Rules"
 msgstr ""
 
-#: mail/component-factory.c:329
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
+msgstr ""
+
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "Mail"
+msgstr "SДhkЖposti"
+
+#: importers/elm-importer.c:498
+#, fuzzy
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution on lЖytДnyt Elmin sДhkЖpostitiedostoja.\n"
+"Haluatko tuoda nДmД postit Evolutioniin?"
+
+#: importers/elm-importer.c:527
+msgid "Elm mail"
+msgstr "Elm-sДhkЖposti"
+
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "LisДД osoitekirja"
+
+#: importers/evolution-gnomecard-importer.c:253
+#, fuzzy
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution on lЖytДnyt Elmin sДhkЖpostitiedostoja.\n"
+"Haluatko tuoda nДmД postit Evolutioniin?"
+
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "Asetukset..."
+
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: importers/pine-importer.c:691
+msgid "Pine mail"
+msgstr "Pine-sДhkЖposti"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+msgid "Mail configuration interface"
+msgstr ""
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "_Ominaisuudet..."
+
+#: mail/component-factory.c:337
+msgid "Change this folder's properties"
+msgstr ""
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:268
+#: mail/folder-browser-ui.c:254
+#, c-format
+msgid "Properties for \"%s\""
+msgstr ""
+
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr ""
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "VДliaikaishakemistoa ei voitu luoda: %s"
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr ""
 
-#: mail/folder-browser.c:576 ui/evolution-mail.xml.h:91
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:579 ui/evolution-mail.xml.h:89
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:582 ui/evolution-mail.xml.h:90
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:585 ui/evolution-mail.xml.h:88
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:591
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "Suodata a_iheen mukaan"
 
-#: mail/folder-browser.c:594
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "Suodata _lДhettДjДn mukaan"
 
-#: mail/folder-browser.c:597
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: mail/folder-browser.c:600
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "Suodata _postituslistan mukaan"
 
-#: mail/folder-browser.c:609
-msgid "_Open"
-msgstr "_Avaa"
-
-#: mail/folder-browser.c:611
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "LДhetД uudelleen"
 
-#: mail/folder-browser.c:613 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:113 ui/evolution-tasks.xml.h:8
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Tallenna _nimellД..."
 
-#: mail/folder-browser.c:615 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: mail/folder-browser.c:620
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "_Vastaa lДhettДjДlle"
 
-#: mail/folder-browser.c:622 ui/evolution-mail.xml.h:66
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "Vastaa _kaikille"
+
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "Vastaa _kaikille"
 
-#: mail/folder-browser.c:624 ui/evolution-mail.xml.h:102
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "_VДlitД"
 
-#: mail/folder-browser.c:626
-msgid "Forward _inline"
-msgstr ""
-
-#: mail/folder-browser.c:629 ui/evolution-mail.xml.h:40
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: mail/folder-browser.c:631 ui/evolution-mail.xml.h:44
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Merkitse luke_mattomaksi"
 
-#: mail/folder-browser.c:636 ui/evolution-mail.xml.h:107
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "Merkitse luke_mattomaksi"
+
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Merkitse luke_mattomaksi"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "_SiirrД kansioon..."
 
-#: mail/folder-browser.c:638 ui/evolution-mail.xml.h:96
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: mail/folder-browser.c:642 ui/evolution-mail.xml.h:118
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "_Palauta"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:652 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "LisДД osoitekirja"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Toteuta suodattimet"
 
-#: mail/folder-browser.c:656
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "_Luo viestistД sДДntЖ"
 
-#: mail/folder-browser.c:795
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "Suodata postituslistan mukaan"
 
-#: mail/folder-browser.c:796
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:798
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Suodata postituslistan mukaan (%s)"
 
-#: mail/folder-browser.c:799
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser-factory.c:213
-#, c-format
-msgid "Properties for \"%s\""
-msgstr ""
-
-#: mail/folder-browser-factory.c:215 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr ""
-
-#: mail/importers/elm-importer.c:420
-msgid ""
-"Evolution has found Elm mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution on lЖytДnyt Elmin sДhkЖpostitiedostoja.\n"
-"Haluatko tuoda nДmД postit Evolutioniin?"
-
-#: mail/importers/elm-importer.c:430
-msgid "Elm mail"
-msgstr "Elm-sДhkЖposti"
-
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr ""
@@ -5686,22 +6520,6 @@ msgstr ""
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:440
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-
-#: mail/importers/pine-importer.c:385
-msgid ""
-"Evolution has found Pine mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-
-#: mail/importers/pine-importer.c:395
-msgid "Pine mail"
-msgstr "Pine-sДhkЖposti"
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr ""
@@ -5733,37 +6551,69 @@ msgstr ""
 msgid "mh"
 msgstr ""
 
-#: mail/mail-account-editor.c:105
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
 msgid "You have not filled in all of the required information."
 msgstr "Et ole tДyttДnyt kaikkia tarvittavia kohtia."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Evolutionin tilimuokkain"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Evolutionin tilimuokkain"
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "Allekirjoitustiedosto:"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"TДtД viestiД ei ole lДhetetty.\n"
+"\n"
+"Haluatko tallentaa muutokset?"
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr " (oletus)"
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "дlД kДytД"
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "KДytД"
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "Haluatko varmasti poistaa tДmДn tilin?"
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Palauta"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "TДmД on oletustilini"
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr "Haluatko varmasti poistaa tДmДn keskusteluryhmДtilin?"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:536
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Evolutionin tilienhallinta"
 
@@ -5827,38 +6677,46 @@ msgstr ""
 "ViestillД ei ole aihetta.\n"
 "LДhetetДДnkЖ toedella?"
 
-#: mail/mail-callbacks.c:311
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
-msgstr "Sinuun tulee mДДritellД vastaanottajat ennen tДmДn viestin "
-"lДhettДmistД."
+msgstr ""
+"Sinuun tulee mДДritellД vastaanottajat ennen tДmДn viestin lДhettДmistД."
 
-#: mail/mail-callbacks.c:354
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr "Sinun tulee luoda tili ennen kuin voit lДhettДД tДtД viestiД."
 
-#: mail/mail-callbacks.c:593
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "%s %s kirjoitti:"
 
-#: mail/mail-callbacks.c:774
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "VДlitetty viesti:\n"
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "SiirrД viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:879
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Kopioi viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:1156
+#: mail/mail-callbacks.c:1374
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1170
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5866,7 +6724,7 @@ msgstr ""
 "Voit muokata vain Luonnokset\n"
 "-kansiossa olevia viestejД."
 
-#: mail/mail-callbacks.c:1202
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -5874,54 +6732,48 @@ msgstr ""
 "Voit lДhettДД uudelleen vain\n"
 "\"LДhetetyt\"-kansiossa olevia viestejД."
 
-#: mail/mail-callbacks.c:1224
+#: mail/mail-callbacks.c:1442
+#, fuzzy, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "Haluatko todella poistaa tehtДvДn '%s'?"
+
+#: mail/mail-callbacks.c:1463
 msgid "No Message Selected"
 msgstr "Ei viestejД valittuna"
 
-#: mail/mail-callbacks.c:1250 mail/mail-display.c:90
-msgid "Overwrite file?"
-msgstr "Kirjoita tiedoston yli?"
-
-#: mail/mail-callbacks.c:1254 mail/mail-display.c:94
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Saman niminen tiedosto on jo olemassa.\n"
-"Kirjoitetaanko sen yli?"
-
-#: mail/mail-callbacks.c:1298
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Tallenna viesti nimellД..."
 
-#: mail/mail-callbacks.c:1300
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Tallenna viestit nimellД..."
 
-#: mail/mail-callbacks.c:1435
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1484 ui/evolution-mail.xml.h:56
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "S_uodattimet..."
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: mail/mail-callbacks.c:1531
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "Viestin tulostus epДonnistui"
 
-#: mail/mail-callbacks.c:1609
+#: mail/mail-callbacks.c:1966
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 
-#: mail/mail-config.c:1121 mail/mail-config.c:1124
-msgid "Connecting to server..."
-msgstr ""
-
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -5953,10 +6805,14 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:445
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr ""
 
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
+msgstr ""
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr " Tarkista tuetut tavat "
@@ -5966,34 +6822,63 @@ msgid " color"
 msgstr " "
 
 #: mail/mail-config.glade.h:3
+msgid "(SSL is not supported in this build of evolution)"
+msgstr ""
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Tili"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Tilitiedot"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "Tilinhallinta"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Tilit"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Liite"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Todennus"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Todennustapa:"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "Tarkasta onko uutta postia joka"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "Kirjoita"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6003,716 +6888,856 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "_Oletukset"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Valmis"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Luonnokset"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Luonnoskansio:"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "Muokkaa..."
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "SДhkЖpostiosoite:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "KДytД"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Koko nimi:"
 
-#: mail/mail-config.glade.h:27
-msgid "Highlight citations with "
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
+msgstr ""
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "Allekirjoitustiedosto:"
+
+#: mail/mail-config.glade.h:43
+#, fuzzy
+msgid "Highlight citations with"
 msgstr "Korosta lainaukset vДrillД "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+msgid "Inline"
+msgstr ""
+
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+msgid "Mailbox location"
+msgstr ""
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "TДmД on oletustilini"
 
-#: mail/mail-config.glade.h:34
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "Merkitse viestit luetuiksi kun on kulunut:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "LDAP-palvelin"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "Valinnaiset tiedot"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organisaatio:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "PGP-ohjelman polku:"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "Valitse vДri"
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "ViestiД ei voida lДhettДД: vastaanottajia ei ole mДДritelty."
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+msgid "Quoted"
+msgstr ""
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "Otetaan vastaan sДhkЖpostia"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "Tuleva posti"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "Hakuasetukset"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "Pakolliset tiedot"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
+
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Security"
+msgstr "Turvalli_suus"
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "Valitse PGP-ohjelma"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "LДhetД sДhkЖpostit oletuksena HTML-muodossa."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "LДhetetДДn sДhkЖpostia"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "LДhtevД posti"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "LДhetetyt"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr "LДhetetyt viestit ja luonnokset"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "LДhetettyjen kansio:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Palvelimen asetukset"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Palvelintyyppi: "
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Palvelin vaati todennuksen"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Allekirjoitustiedosto:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "LДhteet"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Pakolliset tiedot"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "LДhteet"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "Erikoiskansiot"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Type"
-msgstr "Tyyppi"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "KДytД salattua yhteyttД (SSL)"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "KДyttДjДtunnus:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:32
-msgid "_Edit"
-msgstr "_Muokkaa"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
+msgstr ""
 
-#: mail/mail-display.c:194
-msgid "Save Attachment"
-msgstr "Tallenna liite"
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
+msgstr ""
 
-#: mail/mail-display.c:234
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "VДliaikaishakemistoa ei voitu luoda: %s"
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr "sekuntia."
 
-#: mail/mail-display.c:295
-msgid "Save to Disk..."
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "Putken luonti epДonnistui: %s"
+
+#: mail/mail-crypto.c:86
+msgid "Could not create a PGP verification context."
 msgstr ""
 
-#: mail/mail-display.c:297
-#, c-format
-msgid "Open in %s..."
+#: mail/mail-crypto.c:116
+msgid "Could not create a PGP encryption context."
+msgstr ""
+
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
+msgstr ""
+"Hakemistoa %s ei voitu luoda:\n"
+"%s"
+
+#: mail/mail-crypto.c:177
+msgid "Could not create a S/MIME signature context."
+msgstr ""
+
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
+msgstr ""
+
+#: mail/mail-crypto.c:240
+msgid "Could not create a S/MIME encryption context."
+msgstr ""
+
+#: mail/mail-crypto.c:271
+msgid "Could not create a S/MIME envelope context."
+msgstr ""
+
+#: mail/mail-crypto.c:301
+msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:299
+#: mail/mail-display.c:221
+msgid "Save Attachment"
+msgstr "Tallenna liite"
+
+#: mail/mail-display.c:338
+msgid "Save to Disk..."
+msgstr ""
+
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:334
-msgid "External Viewer"
-msgstr "Ulkoinen katselin"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr ""
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Piilota"
 
-#: mail/mail-display.c:1107
-msgid "Open link in browser"
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "Ulkoinen katselin"
+
+#: mail/mail-display.c:1048
+msgid "Loading message content"
+msgstr "Ladataan viestin sisДltЖД"
+
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
 msgstr "Avaa linkki selaimessa"
 
-#: mail/mail-display.c:1109
-msgid "Save as (FIXME)"
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "Kopioi sijainti"
+
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
 msgstr "Tallenna nimellД"
 
-#: mail/mail-display.c:1111
-msgid "Copy location (FIXME)"
-msgstr "Kopioi sijainti"
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "Tallenna nimellД..."
 
-#: mail/mail-format.c:522
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr " %d sekuntia"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:564
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:771
-msgid "Loading message content"
-msgstr "Ladataan viestin sisДltЖД"
+#: mail/mail-format.c:746
+msgid "Date"
+msgstr "PДivДys"
+
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "SДhkЖpostiosoite:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr "LДhettДjД"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "Vastausosoite:"
 
-#: mail/mail-format.c:1080
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "Vastaanottaja"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Kopiot:"
+
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr ""
 
-#: mail/mail-format.c:1095
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:1101
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Salattu viesti"
 
-#: mail/mail-format.c:1102
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Napsauta kuvaketta salauksen purkamiseksi."
 
-#: mail/mail-format.c:1192 mail/mail-format.c:1580
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1200 mail/mail-format.c:1588
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1801
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1813
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1817
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1851
+#: mail/mail-format.c:2094
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr ""
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1856
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:509
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr ""
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:791
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:814
-msgid "Reconfiguring folder"
-msgstr ""
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:843
-msgid "Closing current folder"
-msgstr ""
-
-#: mail/mail-local.c:875
-msgid "Renaming old folder and opening"
-msgstr ""
-
-#: mail/mail-local.c:893
-msgid "Creating new folder"
-msgstr "Luodaan uutta kansiota"
-
-#: mail/mail-local.c:907
-msgid "Copying messages"
-msgstr "Kopioidaan viestejД"
-
-#: mail/mail-local.c:924
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:963
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "Et voi kopioida viestejД tДstД roskakorista."
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "Aseta %s"
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:880
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr ""
 
-#: mail/mail-mt.c:862
-msgid "Evolution progress"
-msgstr ""
-
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "LДhetetДДn \"%s\""
 
-#: mail/mail-ops.c:603
-msgid "Sending message"
-msgstr "LДhetetДДn viestiД"
-
-#: mail/mail-ops.c:718
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "LДhetetДДn viestiД %d / %d"
 
-#: mail/mail-ops.c:737
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:739 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "Valmis."
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "SiirretДДn"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Kopioidaan"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1154
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "Roskakori"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "VДlitetyt viestit"
 
-#: mail/mail-ops.c:1195 mail/mail-ops.c:1333
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1262
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1449
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "Muistutukset"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "Luodaan uutta kansiota"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1498
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Haetaan viestiД %s"
 
-#: mail/mail-ops.c:1565
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Haetaan viestejД"
 
-#: mail/mail-ops.c:1575
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1649
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Tallennetaan viestejД"
 
-#: mail/mail-ops.c:1728
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1741
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: mail/mail-ops.c:1844
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1872
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "_Etsi"
-
-#: mail/mail-search.c:167
+#: mail/mail-ops.c:2101
 #, c-format
-msgid "Search \"%s\""
-msgstr "Etsi \"%s\""
+msgid "Disconnecting from %s"
+msgstr ""
+
+#: mail/mail-search.c:138
+#, fuzzy
+msgid "(Untitled Message)"
+msgstr "Etsi viestiД jolla ei ole aihetta"
 
-#: mail/mail-search.c:169
-msgid "Search Untitled Message"
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
 msgstr "Etsi viestiД jolla ei ole aihetta"
 
-#: mail/mail-search.c:184
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "Muokkaa viestiД"
+
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "Muokkaa viestiД"
+
+#: mail/mail-search.c:314
 msgid "Case Sensitive"
 msgstr "Kirjainkoolla on merkitystД"
 
-#: mail/mail-search.c:185
+#: mail/mail-search.c:315
 msgid "Search Forward"
 msgstr ""
 
-#: mail/mail-search.c:192
+#: mail/mail-search.c:332
 msgid "Find:"
 msgstr "Etsi:"
 
-#: mail/mail-send-recv.c:138
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "Polku:"
+
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Peruutetaan..."
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "LДhetД & Vastaanota postia"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "Otetaan vastaan"
 
-#: mail/mail-send-recv.c:285
+#: mail/mail-send-recv.c:302
 msgid "Updating..."
 msgstr "PДivitetДДn..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "LДhetetДДn"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "Peruutettu."
 
-#: mail/mail-summary.c:110
-msgid "Incomplete message written on pipe!"
-msgstr ""
-
-#: mail/mail-summary.c:468
-msgid "Mail Summary"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-tools.c:188
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (vДlitetty viesti)"
-
-#: mail/mail-tools.c:198
-msgid "Fwd: (no subject)"
-msgstr ""
-
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "VДlitetty viesti - %s"
 
-#: mail/mail-tools.c:217
-msgid "Forwarded message (no subject)"
-msgstr "VДlitetty viesti (ei aihetta)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "VДlitetyt viestit"
 
-#: mail/mail-tools.c:415
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "VДlitetyt viestit"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr ""
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:64
-msgid "Reply"
-msgstr "Vastaa"
-
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:70
-msgid "Reply to the sender of this message"
-msgstr "Vastaa tДmДn viestin lДhettДjДlle"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:65
-msgid "Reply to All"
-msgstr "Vastaa kaikille"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:68
-msgid "Reply to all recipients of this message"
-msgstr "Vastaa kaikille tДmДn viestin vastaanottajille"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:25
-msgid "Forward"
-msgstr "VДlitД"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:29
-msgid "Forward this message"
-msgstr "VДlitД tДmД viesti"
-
-#: mail/message-browser.c:200 ui/evolution-mail.xml.h:61
-msgid "Print the selected message"
-msgstr "Tulosta valittu viesti"
-
-#: mail/message-browser.c:203 ui/evolution-mail.xml.h:13
-msgid "Delete this message"
-msgstr "Poista tДmД viesti"
-
-#: mail/message-browser.c:208 ui/evolution-event-editor.xml.h:33
-#: ui/evolution-mail.xml.h:54 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Edellinen"
-
-#: mail/message-browser.c:208
-msgid "Previous message"
-msgstr "Edellinen viesti"
-
-#: mail/message-browser.c:211 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:50
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Seuraava"
-
-#: mail/message-browser.c:211
-msgid "Next message"
-msgstr "Seuraava viesti"
-
-#: mail/message-list.c:682
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "NДhty"
 
-#: mail/message-list.c:683
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "NДkemДttД"
 
-#: mail/message-list.c:684
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Vastattu"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:686
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:690
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "Matalin"
 
-#: mail/message-list.c:691
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "Matalampi"
 
-#: mail/message-list.c:695
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: mail/message-list.c:696
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "Korkein"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:953
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "TДnДДn %l:%M %p"
 
-#: mail/message-list.c:962
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l:%M %p"
 
-#: mail/message-list.c:974
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:982
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:984
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1086
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Tallennetaan viestejД"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1087
-msgid "From"
-msgstr "LДhettДjД"
-
-#: mail/message-list.c:1087
-msgid "Date"
-msgstr "PДivДys"
-
-#: mail/message-list.c:1087
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Otettu vastaan"
 
-#: mail/message-list.c:1088
-msgid "To"
-msgstr "Vastaanottaja"
-
-#: mail/message-list.c:1088
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "Koko"
 
-#: mail/mail-session.c:161
-msgid "User canceled operation."
-msgstr ""
-
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:47
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Kansio"
 
@@ -6740,42 +7765,1461 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr ""
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr ""
+
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr ""
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+msgid "Appointments"
+msgstr "Tapaamiset"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "NДytД tapaamiset"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%I:%M%p"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%a %l:%M %p"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Ei kuvausta"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "%s - Evolution %s"
+
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Virhe ladattaessa kalenteria</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "NДytД tehtДvДt"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "Muistutukset"
+
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A, %e %B %Y"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "Viestin tulostus epДonnistui"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): Bonobon alustus epДonnistui"
+
+#: my-evolution/metar.c:44
+msgid "Clear sky"
+msgstr ""
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
+
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "Variable"
+msgstr "дlД kДytД"
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "Portti:"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+msgid "Northeast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "LiitД"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "LДhteet"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "kuukausi"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "Matalin"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Ke"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "Matalin"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "NДytД"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+msgid "Rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Drifting rain"
+msgstr "Kuvaus sisДltДД"
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "Etsi uudelleen"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "nyt"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Moderate snow"
+msgstr "PДivitД heti"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+#, fuzzy
+msgid "Drifting snow grains"
+msgstr "Kuvaus sisДltДД"
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "SДhkЖposti"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "NДytД kaikki"
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "Ensisijainen sДhkЖposti"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "Tuleva posti"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Shallow small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Showers of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown precipitation"
+msgstr "Tuntematon todennustila."
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "Tuntematon virhe"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Freezing precipitation"
+msgstr ""
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "Neiti"
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "Pysty"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Drifting mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "Sulje tДmД ikkuna"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+msgid "Smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "NДytД tehtДvДt"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "Sulje tДmД ikkuna"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "LДhetД"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "YlДtunniste:"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "pДivДД"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "Elokuu"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Raging tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Thunderous tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "Vastattu"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Kansiot"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "LisДД toiminto"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Luonnoskansio:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "NДytД asetukset"
+
+#: my-evolution/my-evolution.glade.h:8
+msgid "Displayed feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "Perjantai"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "Keskiviikko"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "kuukausi"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr " 1 viikko"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+msgid "Schedule"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "NДytД tehtДvДt"
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "Show full path for folders"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "NДytД tehtДvДt"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "TehtДvДt"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
+msgstr ""
+"\n"
+"  YksikkЖ: "
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Muut"
+
+#: my-evolution/my-evolution.glade.h:26
+msgid "Weather settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "Huhtikuu"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr ""
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "Yksityiskohtaiset"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "Peruuta tapaaminen"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Erikoiskansiot"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr ""
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr ""
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "TДmД nДyttДisi olevan ensimmДinen kerta kun kДytДt Evolutionia."
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Paina \"OK\" asentaaksesi Evolutionin kДyttДjДkohtaiset tiedostot kohteeseen"
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6786,14 +9230,14 @@ msgstr ""
 "%s\n"
 "Virhe: %s"
 
-#: shell/e-setup.c:230
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
-msgstr ""
+msgstr "Virhe luettaessa tiedostoa."
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6801,7 +9245,16 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6809,320 +9262,481 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell.c:388
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "Kansion hakeminen ei onnistu: %s: %s"
+
+#: shell/e-shell-folder-commands.c:162
+msgid "Cannot copy a folder over itself."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
 #, c-format
-msgid "Cannot set up local storage -- %s"
+msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell.c:1273
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "Kopioi kansioon"
+
+#: shell/e-shell-folder-commands.c:313
 #, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "SiirrД kansioon"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "Poista %s:n pДivДn kuluttua"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "Haluatko todella poistaa tehtДvДn '%s'?"
+
+#: shell/e-shell-folder-commands.c:422
+#, c-format
+msgid "Rename folder '%s'"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:321
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Uusi..."
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(NimetЖn)"
 
-#: shell/e-shell-view.c:148
-msgid "(No folder displayed)"
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
 msgstr ""
 
-#: shell/e-shell-view.c:1203
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
 #, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
 
-#: shell/e-shell-view.c:1205
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
 #, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:383
+#, c-format
+msgid "Error starting %s"
+msgstr "Virhe %s:n kДynnistyksessД"
+
+#: shell/e-shell-importer.c:402
+#, c-format
+msgid "Error loading %s"
+msgstr "Virhe %s:n lataamisessa"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr ""
+
+#: shell/e-shell-importer.c:538
+msgid "Filename:"
+msgstr "Tiedostonimi:"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "Valitse tiedosto"
+
+#: shell/e-shell-importer.c:553
+msgid "File type:"
+msgstr "Tiedoston tyyppi:"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "Valitse tiedosto"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug budday ei lЖytynyt $PATH:istasi."
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Bug buddya ei voitu ajaa."
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Siirry kansioon..."
 
-#: shell/e-shell-view-menu.c:562
-msgid "Work online"
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Luo uusi kontakti"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
 msgstr "TyЖskentele linjoilla"
 
-#: shell/e-shell-view-menu.c:574 shell/e-shell-view-menu.c:586
-msgid "Work offline"
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
 msgstr "TyЖskentele poissa linjoilta"
 
-#: shell/e-shortcuts.c:381
-msgid "Error saving shortcuts."
-msgstr "Virhe tallennettaessa oikoteitД."
+#: shell/e-shell-view.c:175
+msgid "(No folder displayed)"
+msgstr ""
+
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1411
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
+
+#: shell/e-shell-view.c:1413
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr ""
+
+#: shell/e-shell.c:1311
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "RyhmДn nimi:"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "дlД poista"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "_Piilota oikotiepalkki"
+
+#: shell/e-shortcuts-view.c:301
+msgid "Rename selected shortcut group to:"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "_Pienet kuvakkeet"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "_Suuret kuvakkeet"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_Uusi ryhmД..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "_Poista tДmД ryhmД..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "_Poista tДmД ryhmД..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "Poista tДmД oikotie oikotiepalkista"
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "_Piilota oikotiepalkki"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Piilota oikotiepalkki"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "Aktivoi"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "Piilota oikotiepalkki"
+
+#: shell/e-shortcuts-view.c:462
+msgid "Rename selected shortcut to:"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Avaa"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr "Avaa uudessa ikkunassa"
+
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Avaa valittu viesti uudessa ikkunassa"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "SДДnnЖn nimi: "
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "Piilota oikotiepalkki"
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Poista tДmД oikotie oikotiepalkista"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:585
+msgid "Error saving shortcuts."
+msgstr "Virhe tallennettaessa oikoteitД."
+
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "_Oikotiepalkki"
+
+#: shell/e-shortcuts.c:984
+msgid "Inbox"
+msgstr ""
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "_Kontakti"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Ei nimeД)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Ei virhettД"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Yleinen virhe"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "I/O-virhe"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr ""
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage-set-view.c:650 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:46
-msgid "_View"
-msgstr "_NДytД"
-
-#: shell/e-storage-set-view.c:650
-msgid "View the selected folder"
-msgstr ""
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Kansion nimi:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
-msgstr "Kansion tyyppi:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr ""
-
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
+#: shell/e-task-widget.c:168
 #, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
+msgid "%s (...)"
 msgstr ""
 
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
+#: shell/e-task-widget.c:173
+msgid "%s (%d%% complete)"
 msgstr ""
 
-#: shell/importer/importer.c:351
-msgid "Importing"
-msgstr ""
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "MikД tahansa kenttД sisДltДД"
 
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
 msgstr ""
 
-#: shell/importer/importer.c:372
-#, c-format
-msgid "Error starting %s"
-msgstr "Virhe %s:n kДynnistyksessД"
-
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
-msgstr "Virhe %s:n lataamisessa"
-
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "IsДntДpalvelin:"
 
-#: shell/importer/importer.c:473
-msgid "Automatic"
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
 msgstr ""
 
-#: shell/importer/importer.c:523
-msgid "Filename:"
-msgstr "Tiedostonimi:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
-msgstr "Valitse tiedosto"
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Kansion nimi:"
 
-#: shell/importer/importer.c:538
-msgid "File type:"
-msgstr "Tiedoston tyyppi:"
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder type:"
+msgstr "Kansion tyyppi:"
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Specify where to create the folder:"
 msgstr ""
 
 #: shell/importer/import.glade.h:1
@@ -7144,32 +9758,41 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:143
+#: shell/importer/intelligent.c:191
+msgid "Importers"
+msgstr ""
+
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "дlД poista"
+
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "дlД kysy tДtД enДД uudelleen"
 
-#: shell/main.c:82
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
 #, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:107
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7177,236 +9800,321 @@ msgstr ""
 "Kiitos\n"
 "The Evolution Team\n"
 
-#: shell/main.c:138
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+msgid "Cannot access the Evolution shell."
 msgstr ""
 
-#: shell/main.c:184
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:185
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:217
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobon komponenttijДrjestelmДn alustus epДonnistui"
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Kopioi"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
+msgstr "Kopioi valinta"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "Luo uusi kontakti"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Poista kontakti"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "Luo uusi kontakti"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Etsi"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Leikkaa"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Etsi kontakti"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr "Leikkaa valinta"
+
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "Poista kontakti"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Uusi kontakti"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:53
-msgid "Previews the message to be printed"
-msgstr "Esikatsele tulostettavaa viestiД"
-
 #: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+#, fuzzy
+msgid "New list"
+msgstr "Uusi sДhkЖposti"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "LiitД"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "LiitД leikepЖytД"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
+msgstr "Esikatselee tulostettavaa kalenteria"
+
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "Tulosta kontaktit"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:84
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "Valitse kaikki"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "Poista kontakti"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "PysДytД"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "PysДytД lataaminen"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "NДytД kaikki"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "NДytД kaikki kontaktit"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "_Osoitekirjan lДhteet..."
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "_Kontakti"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "_Kontakti"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "T_ulosta..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "_Etsi kontakteja"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:117
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:45
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
+msgstr "Valitse k_aikki"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "T_yЖkalut"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 pДivДД"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Muuta asetuksia"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a new all day Event"
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "Luo uusi koko pДivДn tapahtuma"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Luo uusi tapaaminen"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Luo uusi kalenteri"
+msgid "Create a new appointment"
+msgstr "Luo uusi tapaaminen"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "PДivД"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Siirry"
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Go back in time"
-msgstr ""
-
 #: ui/evolution-calendar.xml.h:10
-msgid "Go forward in time"
+msgid "Go back in time"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:11
-msgid "Go to _Date"
+msgid "Go forward in time"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
+msgid "Go to _Date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Siirry nykyiseen aikaan"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "Kuukausi"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "Avaa kalenteri"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr ""
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Uusi tapaaminen"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Esikatselee tulostettavaa kalenteria"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Tulosta kalenteri"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Tulosta tДmД kalenteri"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Tallenna nimellД"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "Pakolliset tiedot"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "NДytД 1 pДivД"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "NДytД 1 kuukausi"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "NДytД 1 viikko"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "NДytД tyЖviikko"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
-msgid "Today"
-msgstr "TДnДДn"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "TyЖviikk_o"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "Viikko"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "_Tapaaminen"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "_SДhkЖpostiasetukset..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "_PДivД"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "_Kuukausi"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:41
-msgid "_New"
-msgstr "_Uusi"
-
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "_Avaa kalenteri"
-
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "_Viikko"
 
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Sulje"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "Sulje tДmД tapaaminen"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "Poista tДmД tapaaminen"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "Esikatsele tulostettavaa viestiД"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "Tulostuksen esikatselu"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "Tulostusasetukset"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Tulosta tДmД kohta"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "Tulosta..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "Tallenna ja sulje"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "Tallenna tapaaminen ja sulje tapaamisikkuna"
+
+#: ui/evolution-comp-editor.xml.h:17
+msgid "Save this item to disk"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr "Muuta nykyisen tulostimesi sivuasetuksia"
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "T_oiminnot"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "_Tiedosto"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Poista tДmД kohta"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "Poista..."
 
@@ -7418,27 +10126,12 @@ msgstr "Ohje"
 msgid "Print En_velope..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Tulosta tДmД kohta"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:62 ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Tulosta..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Tallenna _nimellД..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Tallenna ja sulje"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Tallenna kontakti ja sulje ikkuna"
@@ -7455,883 +10148,993 @@ msgstr ""
 msgid "Send _message to contact..."
 msgstr "LДhetД _viesti kontaktille..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:33
-msgid "_File"
-msgstr "_Tiedosto"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Tallenna"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Tietoja tДstД sovelluksesta"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "Poista tДmД kohta"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Tietoja..."
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "Tallenna tehtДvД ja sulje ikkuna"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "T_oiminnot"
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "LДhetД _viesti kontaktille..."
+
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "LДhetД _viesti kontaktille..."
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "_Osoitekirja..."
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "Peruuta tapaaminen"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+msgid "Cancel the meeting for this item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "L_eikkaa"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Forward as i_Calendar"
+msgstr "Ladataan kalenteria"
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr ""
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "VДlitД tДmД viesti"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr ""
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr "Peruuta tapaaminen"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Sulje tДmД tapaaminen"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "Kopioi kansioon..."
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+msgid "Schedule a meeting for this item"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Kopioi"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "T_oiminnot"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Kopioi valinta"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "%s - Evolution %s"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Leikkaa"
+#: ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "Peruutettu"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Leikkaa valinta"
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "Tallenna nykyinen tiedosto"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Poista tДmД tapaaminen"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "Kirjoita"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr ""
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Kirjoita uusi viesti"
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "Siirry seuraavaan kohtaan"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "_Unohda salasanat"
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Siirry edelliseen kohtaan"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "_Seuraava"
+#: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "SiirrД valitut viestit toiseen kansioon"
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "LiitД"
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send / Receive"
+msgstr "LДhetД / Vastaanota"
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "LiitД leikepЖytД"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "LДhetД jonossa olevat viestit ja hae uudet viestit"
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "_Edellinen"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "Tulostuksen esikatselu"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "Tulost_usasetukset"
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Tulostusasetukset"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
+msgstr "S_uodattimet..."
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:241
-msgid "Save"
-msgstr "Tallenna"
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "Tallenna tapaaminen ja sulje tapaamisikkuna"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "_SДhkЖpostiasetukset..."
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "Tallenna nykyinen tiedosto"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "Esikatselu:"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr ""
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
+msgstr "_LДhetД / Vastaanota"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "Valitse kaikki"
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "Poista valitut viestit"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "Merkitsee kaikki valituksi"
+#: ui/evolution-mail-list.xml.h:5
+#, fuzzy
+msgid "Cut selected messages"
+msgstr "Poista valitut viestit"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "Muuta nykyisen tulostimesi sivuasetuksia"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "Piilota valitut vi_estit"
+
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "Piilota _poistetut viestit"
+
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
+msgstr "Piilota _luetut viestit"
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "_Tietoja..."
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "Merkitse ka_ikki luetuksi"
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:30
-msgid "_Close"
-msgstr "_Sulje"
+#: ui/evolution-mail-list.xml.h:11
+#, fuzzy
+msgid "Mark all visible messages as read"
+msgstr "Merkitse valitut viestit luetuiksi"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:31
-msgid "_Contact (FIXME)"
-msgstr "_Kontakti"
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "LiitД leikepЖytД"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_Kopioi"
+#: ui/evolution-mail-list.xml.h:14
+#, fuzzy
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "SiirrД valitut viestit toiseen kansioon"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr ""
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "Valitse _kaikki"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:37
-msgid "_Help"
-msgstr "_Ohje"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "Valitse _sДie"
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr ""
+#: ui/evolution-mail-list.xml.h:19
+#, fuzzy
+msgid "Select all visible messages"
+msgstr "Poista valitut viestit"
+
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "NДytД k_aikki"
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "_SiirrД kansioon..."
+#: ui/evolution-mail-list.xml.h:22
+#, fuzzy
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Merkitse valitut viestit luetuiksi"
+
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "Poista valitut viestit"
+
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "SДikeistetty viesti-ikkuna"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "L_iitД"
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Kansio"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:109
-#: ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_KДДnnД valinta"
+
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Properties..."
 msgstr "_Ominaisuudet..."
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "Valitse k_aikki"
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "SДikeistetty viesti-ikkuna"
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:44
-msgid "_Task (FIXME)"
-msgstr "_TehtДvД"
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "Apply filter rules to the selected messages"
+msgstr "Poista valitut viestit"
+
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "Vastaa kaikille tДmДn viestin vastaanottajille"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "LisДД palvelu"
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Vastaa tДmДn viestin lДhettДjДlle"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:6
+msgid "Copy selected messages to another folder"
+msgstr "Kopioi valitut viestit uuteen kansioon"
 
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Luo uusi sДhkЖposti"
+#: ui/evolution-mail-message.xml.h:7
+msgid "Create _Virtual Folder From Message"
+msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Uusi sДhkЖposti"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:3
-msgid "Change the properties of this folder"
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:4
-msgid "Compose"
-msgstr "Kirjoita"
+#: ui/evolution-mail-message.xml.h:12
+msgid "Create a virtual folder for these recipients"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
-msgstr "Kirjoita uusi viesti"
+#: ui/evolution-mail-message.xml.h:13
+msgid "Create a virtual folder for this mailing list"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:6
-msgid "Configure Folder..."
-msgstr "Kansion asetukset..."
+#: ui/evolution-mail-message.xml.h:14
+msgid "Create a virtual folder for this sender"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
-msgstr "Kopioi viesti uuteen kansioon"
+#: ui/evolution-mail-message.xml.h:15
+msgid "Create a virtual folder for this subject"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:9
-msgid "Copy selected messages to another folder"
-msgstr "Kopioi valitut viestit uuteen kansioon"
+#: ui/evolution-mail-message.xml.h:17
+#, fuzzy
+msgid "Display the next important message"
+msgstr "Vastaa tДmДn viestin lДhettДjДlle"
 
-#: ui/evolution-mail.xml.h:10
-msgid "Create _Virtual Folder From Message"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:18
+#, fuzzy
+msgid "Display the next message"
+msgstr "Siirry seuraavaan viestiin"
 
-#: ui/evolution-mail.xml.h:12
-msgid "Delete the selected messages"
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
 msgstr "Poista valitut viestit"
 
-#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:15
-msgid "Edit Message"
-msgstr "Muokkaa viestiД"
-
-#: ui/evolution-mail.xml.h:16
-msgid "Edit the current message"
-msgstr "Muokkaa valittua viestiД"
+#: ui/evolution-mail-message.xml.h:21
+#, fuzzy
+msgid "Display the previous important message"
+msgstr "Siirry edelliseen viestiin"
 
-#: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:22
+#, fuzzy
+msgid "Display the previous message"
+msgstr "Siirry edelliseen viestiin"
 
-#: ui/evolution-mail.xml.h:18
-msgid "Expunge"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:23
+#, fuzzy
+msgid "Display the previous unread message"
+msgstr "Siirry edelliseen viestiin"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Filter on Mailing _List"
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "Suodata post-ituslistan mukaan"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "Suodata _lДhettДjДn mukaan"
 
-#: ui/evolution-mail.xml.h:21
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "Suodata _aiheen mukaan"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Finaly remove all mails tagged for deletion"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:24
-msgid "Forget _Passwords"
-msgstr "_Unohda salasanat"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "VДlitД"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:27
-msgid "Forward inline"
+#: ui/evolution-mail-message.xml.h:31
+msgid "Forward _Attached"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:28
-msgid "Forward the selected mail to someone"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:30
-msgid "Forward this message in-line with your mail, so you can edit it"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:31
-msgid "Full _Headers"
-msgstr "TДydet _otsikkotiedot"
-
-#: ui/evolution-mail.xml.h:32
-msgid "Go to the next message"
-msgstr "Siirry seuraavaan viestiin"
-
-#: ui/evolution-mail.xml.h:33
-msgid "Go to the previous message"
-msgstr "Siirry edelliseen viestiin"
-
-#: ui/evolution-mail.xml.h:34
-msgid "Hide Deleted Messages"
-msgstr "Piilota poistetut viestit"
+#: ui/evolution-mail-message.xml.h:32
+#, fuzzy
+msgid "Forward _Inline"
+msgstr "VДlitД"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Hide S_elected Messages"
-msgstr "Piilota valitut vi_estit"
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Forward _Quoted"
+msgstr "VДlitД"
 
-#: ui/evolution-mail.xml.h:36
-msgid "Hide _Deleted Messages"
-msgstr "Piilota _poistetut viestit"
+#: ui/evolution-mail-message.xml.h:34
+#, fuzzy
+msgid "Forward the selected message in the body of a new message"
+msgstr "Merkitse valitut viestit luetuiksi"
 
-#: ui/evolution-mail.xml.h:37
-msgid "Hide _Read messages"
-msgstr "Piilota _luetut viestit"
+#: ui/evolution-mail-message.xml.h:35
+#, fuzzy
+msgid "Forward the selected message quoted like a reply"
+msgstr "Merkitse valitut viestit lukemattomiksi"
 
-#: ui/evolution-mail.xml.h:38
-msgid "Invert Selection"
-msgstr "KДДnnД valinta"
+#: ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward the selected message to someone"
+msgstr "SiirrД valitut viestit toiseen kansioon"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Manage _Subscriptions..."
-msgstr ""
+#: ui/evolution-mail-message.xml.h:37
+#, fuzzy
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Merkitse valitut viestit luetuiksi"
 
-#: ui/evolution-mail.xml.h:41
-msgid "Mark All as R_ead"
-msgstr "Merkitse ka_ikki luetuksi"
+#: ui/evolution-mail-message.xml.h:39
+#, fuzzy
+msgid "Load _Images"
+msgstr "VДlitetyt viestit"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Mark As Read"
-msgstr "Merkitse luetuksi"
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "Merkitse luke_mattomaksi"
 
-#: ui/evolution-mail.xml.h:43
-msgid "Mark As U_nread"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
 msgstr "Merkitse luke_mattomaksi"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "Merkitse valitut viestit luetuiksi"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "Merkitse valitut viestit luetuiksi"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "Merkitse valitut viestit lukemattomiksi"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Merkitse valitut viestit lukemattomiksi"
+
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "Merkitse valitut viestit luetuiksi"
+
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "SiirrД"
 
-#: ui/evolution-mail.xml.h:48
-msgid "Move message to a new folder"
-msgstr "SiirrД viesti uuteen kansioon"
-
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "SiirrД valitut viestit toiseen kansioon"
 
-#: ui/evolution-mail.xml.h:51
-msgid "Open in New Window"
-msgstr "Avaa uudessa ikkunassa"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "Seuraava"
 
-#: ui/evolution-mail.xml.h:52
-msgid "Open the current message in a new window"
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Seuraava viesti"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Seuraava viesti"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Valitse _sДie"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Seuraava viesti"
+
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Open the selected message in a new window"
 msgstr "Avaa valittu viesti uudessa ikkunassa"
 
-#: ui/evolution-mail.xml.h:58
-msgid "Print Preview of message..."
-msgstr "Tulostuksen esikatselu viestistД..."
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Open the selected message in the composer to re-send it"
+msgstr "Merkitse valitut viestit luetuiksi"
 
-#: ui/evolution-mail.xml.h:59
-msgid "Print message to the printer"
-msgstr "Tulosta viesti tulostimella"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "Esikatsele tulostettavaa viestiД"
 
-#: ui/evolution-mail.xml.h:60
-msgid "Print message..."
-msgstr "Tulosta viesti..."
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "Edellinen"
 
-#: ui/evolution-mail.xml.h:63
-msgid "Redirect (FIXME: implement me)"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Edellinen viesti"
 
-#: ui/evolution-mail.xml.h:67
-msgid "Reply to all"
-msgstr "Vastaa kaikille"
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Edellinen viesti"
 
-#: ui/evolution-mail.xml.h:69
-msgid "Reply to sender"
-msgstr "Vastaa lДhettДjДlle"
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Edellinen viesti"
 
-#: ui/evolution-mail.xml.h:71
-msgid "S_earch Message"
-msgstr "_Etsi viestiД"
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
+msgid "Print Message..."
+msgstr "Tulosta viesti..."
 
-#: ui/evolution-mail.xml.h:72
-msgid "S_ource"
-msgstr "_LДhde"
+#: ui/evolution-mail-message.xml.h:65
+#, fuzzy
+msgid "Print Preview..."
+msgstr "Tulostuksen esikatselu"
 
-#: ui/evolution-mail.xml.h:73
-msgid "Save the message into a new file"
-msgstr "Tallenna viesti uuteen tiedostoon"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "Tulosta viesti"
 
-#: ui/evolution-mail.xml.h:75 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Valitse _kaikki"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "Vastaa"
 
-#: ui/evolution-mail.xml.h:76
-msgid "Select _Thread"
-msgstr "Valitse _sДie"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "Vastaa kaikille"
 
-#: ui/evolution-mail.xml.h:77
-msgid "Send / Receive"
-msgstr "LДhetД / Vastaanota"
+#: ui/evolution-mail-message.xml.h:71
+msgid "S_earch Message"
+msgstr "_Etsi viestiД"
 
-#: ui/evolution-mail.xml.h:78
-msgid "Send a reply to the person who sent you this mail"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:72
+#, fuzzy
+msgid "Save the message as a text file"
+msgstr "Tallenna viesti uuteen tiedostoon"
 
-#: ui/evolution-mail.xml.h:79
-msgid "Send a single mail in reply to all the selected mail"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:80
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
+#: ui/evolution-mail-message.xml.h:74
+msgid "Show Email _Source"
 msgstr ""
-"lДhetД jonossa olevat viestit\n"
-"    ja hae uudet viestit"
 
-#: ui/evolution-mail.xml.h:82
-msgid "Send queued mail and retrieve new mail"
-msgstr "LДhetД jonossa olevat viestit ja hae uudet viestit"
+#: ui/evolution-mail-message.xml.h:75
+#, fuzzy
+msgid "Show Full _Headers"
+msgstr "TДydet _otsikkotiedot"
 
-#: ui/evolution-mail.xml.h:83
-msgid "Show _All"
-msgstr "NДytД k_aikki"
+#: ui/evolution-mail-message.xml.h:76
+#, fuzzy
+msgid "Show message in the normal style"
+msgstr "Ajan tulee olla muodossa: %s"
 
-#: ui/evolution-mail.xml.h:85
-msgid "Threaded Message list"
-msgstr "SДikeistetty viesti-ikkuna"
+#: ui/evolution-mail-message.xml.h:77
+#, fuzzy
+msgid "Show message with all email headers"
+msgstr "Etsi uusia viestejД kaikista kansioista"
+
+#: ui/evolution-mail-message.xml.h:78
+#, fuzzy
+msgid "Show the raw email source of the message"
+msgstr "LisДД viestiin liitetiedoston"
 
-#: ui/evolution-mail.xml.h:86
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "Peruuta valittujen viestien poistaminen"
 
-#: ui/evolution-mail.xml.h:87
-msgid "Undelete"
-msgstr "Palauta"
+#: ui/evolution-mail-message.xml.h:80
+#, fuzzy
+msgid "VFolder on Mailing _List..."
+msgstr "Suodata post-ituslistan mukaan"
 
-#: ui/evolution-mail.xml.h:92
-msgid "View Raw Message Source"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:81
+#, fuzzy
+msgid "VFolder on Se_nder..."
+msgstr "Suodata _lДhettДjДn mukaan"
 
-#: ui/evolution-mail.xml.h:93
-msgid "Virtual Folder _Editor..."
-msgstr ""
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "VFolder on _Recipients..."
+msgstr "Suodata _vastaanottajien mukaan"
+
+#: ui/evolution-mail-message.xml.h:83
+#, fuzzy
+msgid "VFolder on _Subject..."
+msgstr "Suodata _aiheen mukaan"
 
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:95
-msgid "_Attachment"
-msgstr "_Liite"
+#: ui/evolution-mail-message.xml.h:85
+#, fuzzy
+msgid "_Copy to Folder"
+msgstr "Kopioi kansioon"
 
-#: ui/evolution-mail.xml.h:97
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "_Luo viestistД suodatin"
 
-#: ui/evolution-mail.xml.h:99
-msgid "_Expunge"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:100
-msgid "_Filters..."
-msgstr "S_uodattimet..."
-
-#: ui/evolution-mail.xml.h:101 ui/evolution.xml.h:34
-msgid "_Folder"
-msgstr "_Kansio"
+#: ui/evolution-mail-message.xml.h:88
+#, fuzzy
+msgid "_Forward Message"
+msgstr "VДlitetyt viestit"
 
-#: ui/evolution-mail.xml.h:103
-msgid "_Inline"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Message Display"
+msgstr "Viestit"
 
-#: ui/evolution-mail.xml.h:104 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_KДДnnД valinta"
+#: ui/evolution-mail-message.xml.h:90
+#, fuzzy
+msgid "_Move to Folder"
+msgstr "SiirrД kansioon"
 
-#: ui/evolution-mail.xml.h:105
-msgid "_Mail Message"
+#: ui/evolution-mail-message.xml.h:91
+msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:106
-msgid "_Mail Settings..."
-msgstr "_SДhkЖpostiasetukset..."
+#: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Open Message"
+msgstr "LДhetД viestejД _uudelleen"
 
-#: ui/evolution-mail.xml.h:108
-msgid "_Open Selected Items"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:93
+#, fuzzy
+msgid "_Re-send Message"
+msgstr "LДhetД viestejД _uudelleen"
 
-#: ui/evolution-mail.xml.h:110
-msgid "_Quoted"
-msgstr ""
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Sulje tДmД ikkuna"
 
-#: ui/evolution-mail.xml.h:111
-msgid "_Reply"
-msgstr "_Vastaa"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr "Mukauta t_yЖkalupalkkeja..."
 
-#: ui/evolution-mail.xml.h:112
-msgid "_Resend Messages"
-msgstr "LДhetД viestejД _uudelleen"
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "Mukauta"
 
-#: ui/evolution-mail.xml.h:114
-msgid "_Save Message As..."
-msgstr "_Tallenna viesti nimellД..."
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "Mukauta tyЖkalupalkkeja"
 
-#: ui/evolution-mail.xml.h:115
-msgid "_Send / Receive"
-msgstr "_LДhetД / Vastaanota"
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "_Sulje"
 
-#: ui/evolution-mail.xml.h:116
-msgid "_Threaded"
-msgstr "_SДikeistys"
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "_NДytД"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "LiitД"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Sulje nykyinen tiedosto"
 
 #: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Delete all but signature"
+msgstr "Poista kontakti"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Salaa tДmД viesti PGP:llД"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "LiitД tekstitiedosto..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "LiitД tiedosto viestiin tekstinД"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "LiitД tekstitiedosto..."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Avaa tiedosto"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "PGP-salaus"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "PGP-allekirjoitus"
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr ""
+#, fuzzy
+msgid "S/MIME Encrypt"
+msgstr "PGP-salaus"
 
 #: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Tallenna _kansioon..."
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "Tallenna"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Tallenna nimellД"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Tallenna kansioon..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "Tallenna nykyinen tiedosto"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Tallenna tiedosto uudella nimellД"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Tallenna viesti johonkin tiettyyn kansioon"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "LДhetД"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "LДhetД _myЖhemmin"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "LДhetД _myЖhemmin"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "LДhetД viesti HTML-muodossa"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "LДhetД viesti myЖhemmin"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "LДhetД viesti heti"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "LДhetД viesti heti"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "NДytД / piilota liitetiedostot"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "NДytД _liitteet"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "NДytД liitteet"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "Allekirjoita viesti PGP-avaimellasi"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Allekirjoita viesti PGP-avaimellasi"
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "MДДrittДД nДytetДДnkЖ LДhettДjД-kenttД"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "MДДrittДД nДytetДДnkЖ Vastausosoite-kenttД"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "_Liite"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:45
-msgid "_From Field"
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Delete all"
+msgstr "_Poista"
+
+#: ui/evolution-message-composer.xml.h:50
+msgid "_From Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "Li_sДД"
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
-msgstr "_LiitД tekstitiedosto..."
-
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Avaa..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "_Vastausosoite-kenttД"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "Turvalli_suus"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "_Ohje"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Kansio"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Tilaa"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Poista tilaus"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Etsi uudelleen"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Tee uudelleen"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Tee kumottu toiminto uudelleen"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Korvaa"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Korvaa merkkijono"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "Vastaa kaiki_lle"
+#: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Task"
+msgstr "Uusi tehtДvД"
 
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr ""
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "Poista tehtДvД"
 
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
+#: ui/evolution-task-editor.xml.h:7
+msgid "Re_fresh Task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "Tallenna tehtДvД ja sulje ikkuna"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "Etsi uudelleen samaa merkkijonoa"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "Etsi merkkijonoa"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Kumoa"
-
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "Kumoa edellinen toiminto"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:29
-msgid "_Appointment (FIXME)"
-msgstr "_Tapaaminen"
-
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "_Vastaa"
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "Copy selected task"
+msgstr "Kopioi valinta"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Luo uusi tehtДvД"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "Poista tehtДvД"
+
+#: ui/evolution-tasks.xml.h:7
+#, fuzzy
+msgid "Delete selected tasks"
+msgstr "Poista tehtДvД"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Uusi tehtДvД"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "LiitД leikepЖytД"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "TehtДvДasetukset"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "_SДhkЖpostiasetukset..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_TehtДvД"
 
@@ -8339,146 +11142,218 @@ msgstr "_TehtДvД"
 msgid "About Evolution..."
 msgstr "Tietoja Evolutionista..."
 
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Sulje tДmД ikkuna"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
-msgstr "Mukauta t_yЖkalupalkkeja..."
+#: ui/evolution.xml.h:2
+#, fuzzy
+msgid "Add to _Shortcut Bar"
+msgstr "_Oikotiepalkki"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Mukauta"
+#: ui/evolution.xml.h:3
+msgid "Change the name of this folder"
+msgstr ""
 
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Mukauta tyЖkalupalkkeja"
+#, fuzzy
+msgid "Copy this folder"
+msgstr "Kopioi kansioon"
 
 #: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "Luodaan uutta kansiota"
+
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "Poista tДmД oikotie oikotiepalkista"
+
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Luodaan uutta kansiota"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "Poista tДmД kohta"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr ""
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_Poistu"
 
-#: ui/evolution.xml.h:9
-msgid "Evolution _Window"
-msgstr ""
+#: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
 
-#: ui/evolution.xml.h:10
-msgid "Evolution bar _shortcut"
+#: ui/evolution.xml.h:17
+msgid "Evolution _Window"
 msgstr ""
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Poistu ohjelmasta"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr ""
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr ""
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "SiirrД valitut viestit toiseen kansioon"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Open in New _Window"
+msgstr "Avaa uudessa ikkunassa"
+
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Open this folder in an other window"
+msgstr "Avaa valittu viesti uudessa ikkunassa"
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "LДhetД virheraportti"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "LДhetД _virheraportti"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "LДhetД virheraportti kДyttДen Bug Buddy:a."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:30
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "MДДritД, nДytetДДnkЖ kansiopalkki"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "MДДritД, nДytetДДnkЖ oikotiepalkki"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "MДДritД, tyЖskennellДДnkЖ poissa linjoilta."
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "_Kalenterin kДyttЖ"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr ""
 
-#: ui/evolution.xml.h:26
-msgid "Work Offline"
-msgstr "TyЖskentele poissa linjoilta"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr ""
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "_Tietoja Evolutionista..."
 
-#: ui/evolution.xml.h:28
-msgid "_Actions"
-msgstr "T_oiminnot"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "_Tapaaminen"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "_Kontakti"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Kopioi"
+
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "_Kansiopalkki"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Siirry kansioon..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr ""
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr ""
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr ""
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "SiirrД"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Uusi"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "_Uusi kansio"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Avaa..."
+
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "_Oikotiepalkki"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "_Oikotiepalkki"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "_TehtДvД"
+
+#: ui/evolution.xml.h:64
 msgid "_Work Offline"
 msgstr ""
 
-#: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
 msgstr ""
 
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "_SДhkЖpostiasetukset..."
+
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "Address Cards"
+msgstr "Osoite _2:"
+
 #: views/addressbook/galview.xml.h:2
 msgid "By Company"
 msgstr "Yrityksen mukaan"
@@ -8507,9 +11382,12 @@ msgstr "Viestit"
 msgid "With Category"
 msgstr "RyhmДn mukaan"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr ""
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
@@ -8583,69 +11461,138 @@ msgstr ""
 msgid "All Attendees"
 msgstr ""
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-#: widgets/menus/gal-view-menus.c:176
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "_Nykyinen nДkymД"
 
-#: widgets/menus/gal-view-menus.c:202
+#: widgets/menus/gal-view-menus.c:259
 msgid "Define Views"
 msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:422
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "MTKTPLS"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Nyt"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "TДnДДn"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Ajan tulee olla muodossa: %s"
 
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "viikko"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "Roskakori"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr ""
+"\n"
+"  Muut nimet: "
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "_Uusi"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Tuntematon virhe: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "Muut"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Kontaktinhallinta"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "Tallenna haku"
 
-#: widgets/misc/e-filter-bar.c:239
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "Edistynyt haku"
 
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "Tallenna nimellД..."
-
 #: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "NДytД kaikki"
 
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Muokkaa..."
-
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr ""
@@ -8658,6 +11605,10 @@ msgstr "Tiedoksi"
 msgid "Warning"
 msgstr "Varoitus"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Virhe"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Kysymys"
@@ -8694,3 +11645,342 @@ msgstr "init_corba(): GNOME:n alustus epДonnistui"
 #: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobon alustus epДonnistui"
+
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "Muuta asetuksia"
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "TehtДvДasetukset"
+
+#~ msgid "???"
+#~ msgstr "???"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "K_ontaktit..."
+
+#~ msgid "_Company:"
+#~ msgstr "_Yritys:"
+
+#~ msgid "Find..."
+#~ msgstr "Etsi..."
+
+#~ msgid "Open calendar"
+#~ msgstr "Avaa kalenteri"
+
+#~ msgid "Save calendar"
+#~ msgstr "Tallenna kalenteri"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>Virhe ladattaessa kalenteria:<br>Metodia ei tueta"
+
+#~ msgid "Colors"
+#~ msgstr "VДrit"
+
+#~ msgid "Highlight"
+#~ msgstr "Korosta"
+
+#~ msgid "Work week"
+#~ msgstr "TyЖviikko"
+
+#~ msgid "Edit Task"
+#~ msgstr "Muokkaa tehtДvДД"
+
+#~ msgid "Edit this task..."
+#~ msgstr "Muokkaa tДtД tehtДvДД..."
+
+#~ msgid "Edit the task"
+#~ msgstr "Muokkaa tehtДvДД"
+
+#~ msgid "Go to Today"
+#~ msgstr "Siirry tДhДn pДivДДn"
+
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "En pystynyt lataamaan kalenteritiedostoasi!\n"
+
+#~ msgid "I couldn't read your calendar file!\n"
+#~ msgstr "En pystynyt lukemaan kalenteritiedostoasi!\n"
+
+#~ msgid "Add to Calendar"
+#~ msgstr "LisДД kalenteriin"
+
+#~ msgid "Update Calendar"
+#~ msgstr "PДivitД kalenteri"
+
+#~ msgid "Attendee address"
+#~ msgstr "Osanottajan osoite"
+
+#~ msgid "Attendees: "
+#~ msgstr "Osanottajat: "
+
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr ""
+#~ "Peruuta\n"
+#~ "tapaaminen"
+
+#~ msgid "_Starting date:"
+#~ msgstr "_AlkamispДivД:"
+
+#~ msgid "Summary contains"
+#~ msgstr "Yhteenveto sisДltДД"
+
+#~ msgid "Comment contains"
+#~ msgstr "Kommentti sisДltДД"
+
+#~ msgid "Has category"
+#~ msgstr "SisДltДД ryhmДn"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "Se ei ole tavallinen tiedosto."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "Tiedosto vaikutti avattavalta, mutta avaaminen epДonnistui."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "Tiedosto on hyvin suuri (yli 100K).\n"
+#~ "Haluatko varmasti liittДД sen?"
+
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr "%I:%M:%S %p%n"
+
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "HTML-tiedostoa ei voitu avata:\n"
+#~ "%s"
+
+#~ msgid "Select a service"
+#~ msgstr "Valitse palvelu"
+
+#~ msgid "Run %s"
+#~ msgstr "Suorita %s"
+
+#~ msgid "Close %s"
+#~ msgstr "Sulje %s"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "SiirrД %s vasemmalle"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "SiirrД %s oikealle"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "SiirrД %s edelliselle riville"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "SiirrД %s seuraavalle riville"
+
+#~ msgid "Appearance"
+#~ msgstr "UlkonДkЖ"
+
+#~ msgid "Background:"
+#~ msgstr "Tausta:"
+
+#~ msgid "Test bonobo service"
+#~ msgstr "Testaa bonobo-palvelua"
+
+#~ msgid "Test service"
+#~ msgstr "Testaa palvelua"
+
+#~ msgid "Update automatically"
+#~ msgstr "PДivitД automaattisesti"
+
+#~ msgid "Forward to Address"
+#~ msgstr "VДlitД osoitteeseen"
+
+#~ msgid "Copying messages"
+#~ msgstr "Kopioidaan viestejД"
+
+#~ msgid "Search \"%s\""
+#~ msgstr "Etsi \"%s\""
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (vДlitetty viesti)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "VДlitetty viesti (ei aihetta)"
+
+#~ msgid "Print the selected message"
+#~ msgstr "Tulosta valittu viesti"
+
+#~ msgid "Activate"
+#~ msgstr "Aktivoi"
+
+#~ msgid "Find"
+#~ msgstr "Etsi"
+
+#~ msgid "Find a contact"
+#~ msgstr "Etsi kontakti"
+
+#~ msgid "View All"
+#~ msgstr "NДytД kaikki"
+
+#~ msgid "View all contacts"
+#~ msgstr "NДytД kaikki kontaktit"
+
+#~ msgid "5 Days"
+#~ msgstr "5 pДivДД"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Luo uusi kalenteri"
+
+#~ msgid "Day"
+#~ msgstr "PДivД"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Avaa kalenteri"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Avaa kalenteri"
+
+#~ msgid "About this application"
+#~ msgstr "Tietoja tДstД sovelluksesta"
+
+#~ msgid "About..."
+#~ msgstr "Tietoja..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "T_oiminnot"
+
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "_Osoitekirja..."
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "Kopioi kansioon..."
+
+#~ msgid "Go to the next item"
+#~ msgstr "Siirry seuraavaan kohtaan"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "Siirry edelliseen kohtaan"
+
+#~ msgid "N_ext"
+#~ msgstr "_Seuraava"
+
+#~ msgid "Pre_vious"
+#~ msgstr "_Edellinen"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "Tulost_usasetukset"
+
+#~ msgid "Select everything"
+#~ msgstr "Merkitsee kaikki valituksi"
+
+#~ msgid "_About..."
+#~ msgstr "_Tietoja..."
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "_SiirrД kansioon..."
+
+#~ msgid "Add Service"
+#~ msgstr "LisДД palvelu"
+
+#~ msgid "Create a new email"
+#~ msgstr "Luo uusi sДhkЖposti"
+
+#~ msgid "Configure Folder..."
+#~ msgstr "Kansion asetukset..."
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Kopioi viesti uuteen kansioon"
+
+#~ msgid "Edit the current message"
+#~ msgstr "Muokkaa valittua viestiД"
+
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "Piilota poistetut viestit"
+
+#~ msgid "Mark As Read"
+#~ msgstr "Merkitse luetuksi"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Merkitse luke_mattomaksi"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "SiirrД viesti uuteen kansioon"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Tulostuksen esikatselu viestistД..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Tulosta viesti tulostimella"
+
+#~ msgid "Reply to all"
+#~ msgstr "Vastaa kaikille"
+
+#~ msgid "Reply to sender"
+#~ msgstr "Vastaa lДhettДjДlle"
+
+#~ msgid "S_ource"
+#~ msgstr "_LДhde"
+
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr ""
+#~ "lДhetД jonossa olevat viestit\n"
+#~ "    ja hae uudet viestit"
+
+#~ msgid "_Reply"
+#~ msgstr "_Vastaa"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "_Tallenna viesti nimellД..."
+
+#~ msgid "_Threaded"
+#~ msgstr "_SДikeistys"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Tallenna _kansioon..."
+
+#~ msgid "Send the message now"
+#~ msgstr "LДhetД viesti heti"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_LiitД tekstitiedosto..."
+
+#~ msgid "Redo"
+#~ msgstr "Tee uudelleen"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Tee kumottu toiminto uudelleen"
+
+#~ msgid "Replace"
+#~ msgstr "Korvaa"
+
+#~ msgid "Replace a string"
+#~ msgstr "Korvaa merkkijono"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "Vastaa kaiki_lle"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "Etsi uudelleen samaa merkkijonoa"
+
+#~ msgid "Search for a string"
+#~ msgstr "Etsi merkkijonoa"
+
+#~ msgid "Undo"
+#~ msgstr "Kumoa"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Kumoa edellinen toiminto"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "_Vastaa"
diff --git a/po/fr.po b/po/fr.po
index 2b910af395..dba4a9b60c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.8\n"
-"POT-Creation-Date: 2001-04-14 08:51-0400\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-02-13 13:03+0100\n"
 "Last-Translator: Christophe Merlet (RedFox) <redfox@eikonex.org>\n"
 "Language-Team: GNOME French Team <gnomefr@gnomefr.traduc.org>\n"
@@ -14,11 +14,19 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Carte : "
 
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -26,7 +34,7 @@ msgstr ""
 "\n"
 "Nom : "
 
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -34,7 +42,7 @@ msgstr ""
 "\n"
 "  PrИfixe :     "
 
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -42,7 +50,7 @@ msgstr ""
 "\n"
 "  DonnИ :      "
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -50,7 +58,7 @@ msgstr ""
 "\n"
 "  Additionnel : "
 
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -58,7 +66,7 @@ msgstr ""
 "\n"
 "  Famille :     "
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -66,7 +74,7 @@ msgstr ""
 "\n"
 "  Suffixe :     "
 
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -74,7 +82,7 @@ msgstr ""
 "\n"
 "Date de naissance : "
 
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -82,7 +90,7 @@ msgstr ""
 "\n"
 "Addresse :"
 
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -90,7 +98,7 @@ msgstr ""
 "\n"
 "  Boite postale :  "
 
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -98,7 +106,7 @@ msgstr ""
 "\n"
 "  Ext :         "
 
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -106,7 +114,7 @@ msgstr ""
 "\n"
 "  Rue :      "
 
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -114,7 +122,7 @@ msgstr ""
 "\n"
 "  Ville :        "
 
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -122,7 +130,7 @@ msgstr ""
 "\n"
 "  RИgion :      "
 
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -130,7 +138,7 @@ msgstr ""
 "\n"
 "  Code postal : "
 
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -138,7 +146,7 @@ msgstr ""
 "\n"
 "  Pays :     "
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
@@ -146,7 +154,7 @@ msgstr ""
 "\n"
 "DИnomination : "
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -154,7 +162,7 @@ msgstr ""
 "\n"
 "TИlИphones :\n"
 
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -162,7 +170,7 @@ msgstr ""
 "\n"
 "TИlИphone :"
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -170,7 +178,7 @@ msgstr ""
 "\n"
 "Adresse Иlectronique :\n"
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -178,7 +186,7 @@ msgstr ""
 "\n"
 "Adresse Иlectronique 2 :"
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -186,7 +194,7 @@ msgstr ""
 "\n"
 "Messager : "
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -194,7 +202,7 @@ msgstr ""
 "\n"
 "Fuseau horaire : "
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -202,7 +210,7 @@ msgstr ""
 "\n"
 "Situation gИographique : "
 
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -210,7 +218,7 @@ msgstr ""
 "\n"
 "Profession : "
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -218,7 +226,7 @@ msgstr ""
 "\n"
 "Org : "
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -226,7 +234,7 @@ msgstr ""
 "\n"
 "  Nom :  "
 
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -234,7 +242,7 @@ msgstr ""
 "\n"
 "  UnitИ :  "
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -242,7 +250,7 @@ msgstr ""
 "\n"
 "  UnitИ 2 : "
 
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -250,7 +258,7 @@ msgstr ""
 "\n"
 "  UnitИ 3 : "
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -258,7 +266,7 @@ msgstr ""
 "\n"
 "  UnitИ 4 : "
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -266,7 +274,7 @@ msgstr ""
 "\n"
 "CatИgories : "
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -284,7 +292,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -292,7 +300,7 @@ msgstr ""
 "\n"
 "ChaНne unique : "
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -300,23 +308,25 @@ msgstr ""
 "\n"
 "ClИ publique : "
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:4037
+#, fuzzy
+msgid "Multiple VCards"
+msgstr "Messages multiple"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:4045
+#, fuzzy, c-format
+msgid "VCard for %s"
+msgstr "Entrer le mot de passe pour %s"
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:43
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Ne peut initialiser Bonobo"
 
@@ -329,14 +339,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook non chargИ\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Ne peut dИmarrer le serveur wombat"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Ne peut dИmarrer wombat"
 
@@ -345,740 +355,863 @@ msgstr "Ne peut dИmarrer wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Ne peut lire le bloc d'application Adresse du Pilot"
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#, fuzzy
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Utilitaire de configuration pour le conduit 'Contact' d'Evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Conduit 'Contact' d'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Cliquez ici pour le carnet d'adresses"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#, fuzzy
+msgid "Factory for the Addressbook's address popup"
+msgstr "Cliquez ici pour le carnet d'adresses"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution addressbook component."
+msgstr "Utilitaire de configuration pour le conduit 'Contact' d'Evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#, fuzzy
+msgid "Factory for the sample Addressbook control"
+msgstr "Cliquez ici pour le carnet d'adresses"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "Serveur LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Fichier"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Type de carnet d'adresses inconnu"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "Aucun (mode anonyme)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Mot de passe"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Type d'identification inconnu"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "Base"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "Un"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "Sous-arborescence"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr "Type de domaine inconnu"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Se souvenir de ce mot de passe"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "HТte :"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "Racine DN :"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Port :"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "Domaine de recherche :"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Identification :"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Chemin :"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "CrИer le chemin si il n'existe pas."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "иditer le carnet d'adresses"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "Ajouter un carnet d'adresses"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"SИlectionnez le type de carnet d'adresse que vous avez, et entrez les "
+"informations le concernant."
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Nom :"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Description :"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr ""
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "Ajouter"
+msgid "Addressbook Sources"
+msgstr "Sources du carnet d'adresses"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Supprimer"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Nom"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "_Ajouter"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "_иdition"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "Autres contacts"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "Entrer le mot de passe pour %s"
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Impossible d'ouvrir le carnet d'adresses"
+
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
+msgstr "N'importe quel champ contient"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "Le nom contient"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "L'e-mail contient"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "Le nom contient"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "L'URI que le navigateur de dossier affichera"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "E-mail principal"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "E-mail 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "E-mail 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "SИlectionner un fichier"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "CrИer un nouveau contact"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "иditer le carnet d'adresses"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "Autres contacts"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "Adresse Иlectronique :"
+
+#: addressbook/gui/component/e-address-widget.c:365
+#, fuzzy
+msgid "Disable Queries"
+msgstr "CatИgories disponibles : "
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr ""
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#, fuzzy
+msgid "Evolution's addressbook name selection interface."
+msgstr "Conduit 'Contact' d'Evolution"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Enlever"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+#, fuzzy
+msgid "Remove All"
+msgstr "Enlever"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "Envoie du message"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Autres contacts"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "Destinataires du message"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "SИlectionnez des noms"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "SИlectionnez un nom depuis :"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "CatИgorie :"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+#, fuzzy
+msgid "_Search"
+msgstr "Rechercher"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "Anni_verssaire :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "T_ravail"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "_Fax travail"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "C_ontacts..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ca_tИgories..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "иditeur de contacts"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "DИtails"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Classer comme :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "GИnИral"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Nouveau type de tИlИphone"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "No_tes :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Organisation :"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Types de tИlИphones"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
-msgstr "E-mail principal"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "Veut recevoir des messages _HTML"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Page Web :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
-msgstr "_Ajouter"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "_Adresse..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "Nom de l'_assistant :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "_Date de naissance :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Travail"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "So_ciИtИ :"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "_Contacts..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:91 ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Supprimer"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "_DИpartement :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "_Nom complet..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_Maison"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "_Profession :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "No_m du directeur :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_Mobile"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "Sur_nom :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "_Bureau :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_Profession :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "_Conjoint(e) :"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "_C'est l'adresse de la liste de diffusion"
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "Supprimer le contact ?"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 #, fuzzy
 msgid "This contact belongs to these categories:"
 msgstr "иlement(s) appartenant Ю ces catИgories : "
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Assistant"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Travail"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Travail 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Fax travail"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "RИpondeur"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Voiture"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "SociИtИ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Maison"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Maison 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Fax maison"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "RNIS"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Mobile"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Autre"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Fax autre"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
-msgid "Email 2"
-msgstr "E-mail 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
-msgid "Email 3"
-msgstr "E-mail 3"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:223
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:225
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 #, fuzzy
 msgid "Edit Full"
 msgstr "иditer les Filtres"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:262
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 #, fuzzy
 msgid "Full Name"
 msgstr "Nom complet :"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:268
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 #, fuzzy
 msgid "E-mail"
 msgstr "Adresse Иlec."
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresse _2 :"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Canada"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Verifier l'adresse"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Pa_ys :"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Finlande"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "USA"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Adresse :"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_Ville :"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "BoНte _postale :"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "иtat/_Province :"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "_Code postal :"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "VИrifier le nom complet"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 #, fuzzy
 msgid "I"
 msgstr "Si"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 #, fuzzy
 msgid "Miss"
 msgstr "est"
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_PrИnom :"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_Nom :"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "Second prИno_m :"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_Suffixe :"
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Titre :"
 
-#: addressbook/gui/component/addressbook.c:241
-msgid "As _Minicards"
-msgstr "Comme _minicartes"
-
-#: addressbook/gui/component/addressbook.c:247
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Comme _tableau"
-
-#: addressbook/gui/component/addressbook.c:399
-#, c-format
-msgid "Enter password for %s"
-msgstr "Entrer le mot de passe pour %s"
-
-#: addressbook/gui/component/addressbook.c:427
-msgid "Unable to open addressbook"
-msgstr "Impossible d'ouvrir le carnet d'adresses"
-
-#: addressbook/gui/component/addressbook.c:432
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Il nous est impossible d'ouvrir ce carnet d'adresses. Soit\n"
-"parce que vous avez entrez une URI incorrecte, soit\n"
-"parce que vous avez essayer d'accИder Ю un serveur LDAP\n"
-"et que le support LDAP n'a pas ИtИ compilИ. Si vous avez\n"
-"entrИ une URI, vИrifiez sa validitИ et rИentrez la. Sinon\n"
-"vous essayer probablement d'accИder Ю un serveur LDAP,\n"
-"vous devriez tИlИcharger et installer OpenLDAP, puis\n"
-"recompiler et installer Evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:555
-msgid "Show All"
-msgstr "Afficher tout"
-
-#: addressbook/gui/component/addressbook.c:557
-msgid "Advanced..."
-msgstr "AvancИe..."
-
-#: addressbook/gui/component/addressbook.c:587
-msgid "Any field contains"
-msgstr "N'importe quel champ contient"
-
-#: addressbook/gui/component/addressbook.c:588
-msgid "Name contains"
-msgstr "Le nom contient"
-
-#: addressbook/gui/component/addressbook.c:589
-msgid "Email contains"
-msgstr "L'e-mail contient"
-
-#: addressbook/gui/component/addressbook.c:732
-msgid "The URI that the Folder Browser will display"
-msgstr "L'URI que le navigateur de dossier affichera"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
-msgstr "Autres contacts"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "Serveur LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Fichier"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Type de carnet d'adresses inconnu"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "Aucun (mode anonyme)"
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
-msgid "Password"
-msgstr "Mot de passe"
-
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:170
-msgid "Unknown auth type"
-msgstr "Type d'identification inconnu"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "Base"
-msgstr "Base"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "One"
-msgstr "Un"
-
-#: addressbook/gui/component/addressbook-config.c:183
-msgid "Subtree"
-msgstr "Sous-arborescence"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Unknown scope type"
-msgstr "Type de domaine inconnu"
-
-#: addressbook/gui/component/addressbook-config.c:353
-msgid "Bind DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:354
-msgid "FIXME Bind DN Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
-msgstr "Se souvenir de ce mot de passe"
-
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
-msgid "Host:"
-msgstr "HТte :"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Host help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Port:"
-msgstr "Port :"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
-msgstr "Racine DN :"
-
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:435
-msgid "Search Scope:"
-msgstr "Domaine de recherche :"
-
-#: addressbook/gui/component/addressbook-config.c:489
-msgid "Authentication:"
-msgstr "Identification :"
-
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
-msgid "Path:"
-msgstr "Chemin :"
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "FIXME Path Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:513
-msgid "Create path if it doesn't exist."
-msgstr "CrИer le chemin si il n'existe pas."
-
-#: addressbook/gui/component/addressbook-config.c:647
-msgid "Edit Addressbook"
-msgstr "иditer le carnet d'adresses"
-
-#: addressbook/gui/component/addressbook-config.c:649
-msgid "Add Addressbook"
-msgstr "Ajouter un carnet d'adresses"
-
-#: addressbook/gui/component/addressbook-config.c:665
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"SИlectionnez le type de carnet d'adresse que vous avez, et entrez les "
-"informations le concernant."
-
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
-msgid "Name:"
-msgstr "Nom :"
-
-#: addressbook/gui/component/addressbook-config.c:672
-msgid "FIXME Name help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:674
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Description :"
-
-#: addressbook/gui/component/addressbook-config.c:675
-msgid "FIXME Description help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Sources du carnet d'adresses"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:8 mail/folder-browser.c:597
-#: mail/mail-config.glade.h:19 mail/mail-view.c:156
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Supprimer"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "иditer"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Nom"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/e-address-widget.c:365
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #, fuzzy
-msgid "Disable Queries"
-msgstr "CatИgories disponibles : "
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr ""
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
-msgstr ""
+msgid "List _name:"
+msgstr "Nom d'hТte :"
 
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
 #, fuzzy
-msgid "Add to Contacts"
-msgstr "Autres contacts"
+msgid "Members"
+msgstr "DИcembre"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
+msgstr "Enlever"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 #, fuzzy
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Utilitaire de configuration pour le conduit 'Contact' d'Evolution.\n"
+msgid "contact-list-editor"
+msgstr "иditeur de contacts"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
 #, fuzzy
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Conduit 'Contact' d'Evolution"
+msgid "Contact List Editor"
+msgstr "иditeur de contacts"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-#, fuzzy
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Cliquez ici pour le carnet d'adresses"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
 #, fuzzy
-msgid "Factory for the Addressbook's address popup"
-msgstr "Cliquez ici pour le carnet d'adresses"
+msgid "New Contact:"
+msgstr "Nouveau contact"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
 #, fuzzy
-msgid "Factory for the Evolution addressbook component."
-msgstr "Utilitaire de configuration pour le conduit 'Contact' d'Evolution.\n"
+msgid "Original Contact:"
+msgstr "Auteur originel : "
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-#, fuzzy
-msgid "Factory for the sample Addressbook control"
-msgstr "Cliquez ici pour le carnet d'adresses"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
+msgid ""
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
+msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
-msgid "Evolution's addressbook name selection interface."
-msgstr "Conduit 'Contact' d'Evolution"
+msgid "Changed Contact:"
+msgstr "Autres contacts"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:402
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
-msgstr "Enlever"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
 #, fuzzy
-msgid "Remove All"
-msgstr "Enlever"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Rechercher..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Destinataires du message"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "SИlectionnez des noms"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "SИlectionnez un nom depuis :"
+msgid "_Change Anyway"
+msgstr "Changer"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Rechercher"
 
@@ -1190,174 +1323,269 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "Enregistrer comme VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 #, fuzzy
 msgid "Send message to contact"
 msgstr "Envoie un _message au contact..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/folder-browser.c:572
-#: mail/mail-view.c:154 ui/evolution-addressbook.xml.h:9
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:50
-#: ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Imprimer"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Imprimer une en_veloppe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Supprimer"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "Erreur de chargement %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "Sources"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Erreur inconnue"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "Travail en cours"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "Permission refusИe"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "Fichier introuvable"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "OpИration non supportИe"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "AnnulИ"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "Erreur d'E/S"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "Erreur de chargement %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Erreur de chargement %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Erreur de chargement %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "Erreur de chargement %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr "Erreur de lecture du fichier de courrier : %s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* Cliquez ici pour ajouter un contact *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 #, fuzzy
 msgid "File As"
 msgstr "Classer comme :"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "Adresse Иlec."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 #, fuzzy
 msgid "Primary Phone"
 msgstr "Principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 #, fuzzy
 msgid "Assistant Phone"
 msgstr "Assistant"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 #, fuzzy
 msgid "Business Phone"
 msgstr "Travail 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 #, fuzzy
 msgid "Callback Phone"
 msgstr "RИpondeur"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 #, fuzzy
 msgid "Company Phone"
 msgstr "SociИtИ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 #, fuzzy
 msgid "Home Phone"
 msgstr "Maison 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 #, fuzzy
 msgid "Business Address"
 msgstr "Travail 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 #, fuzzy
 msgid "Home Address"
 msgstr "Verifier l'adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 #, fuzzy
 msgid "Mobile Phone"
 msgstr "Mobile"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 #, fuzzy
 msgid "Business Phone 2"
 msgstr "Travail 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "Maison 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 #, fuzzy
 msgid "Other Phone"
 msgstr "Autres contacts"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 #, fuzzy
 msgid "TTY"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 #, fuzzy
 msgid "Other Address"
 msgstr "Verifier l'adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Site Web"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "DИpartement"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Bureau"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "Titre"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Profession"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Gestionnaire"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Surnom"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "Conjoint(e)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Note"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "Fait"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "Chargement du calendrier"
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Enregistrer dans le carnet d'adresses"
 
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1401,7 +1629,8 @@ msgid "Dimensions:"
 msgstr "Dimensions :"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Police..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1461,7 +1690,6 @@ msgid "Margins"
 msgstr "Marges"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "Nombre de colonnes :"
 
@@ -1541,142 +1769,328 @@ msgstr "Type :"
 msgid "Width:"
 msgstr "Largeur :"
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Police..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Erreur lors de la communication avec le serveur de calendrier"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "Ne peut lire le bloc d'application Calendrier du Pilot"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "Ne peut lire le bloc d'application ╚ ю faire ╩ du Pilot"
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
-msgstr "Fichier introuvable"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#, fuzzy
+msgid "Evolution calendar executive summary component."
+msgstr "Ne peut initialiser le composant de rИsumИ de messages d'Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Conduite ╚ Calendrier ╩ d'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr ""
+"Utilitaire de configuration pour la conduite ╚ Calendrier ╩ d'Evolution.\n"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr ""
+"Utilitaire de configuration pour la conduite ╚ Calendrier ╩ d'Evolution.\n"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the alarm notification service"
+msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "Notification Ю propos de votre rendez-vous le %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "Notification Ю propos de votre rendez-vous le %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "Notification Ю propos de votre rendez-vous le %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "Notification Ю propos de votre rendez-vous le %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "Notification Ю propos de votre rendez-vous le %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "Notification Ю propos de votre rendez-vous le %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "Notification Ю propos de votre rendez-vous le %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "Afficher les informations concernant Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "Alarme le %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Fermer"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "Sieste"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "DurИe de la sieste (minutes)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "иditer le rendez-vous"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "Aucun rИsumИ disponible."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "Rappel de votre rendez-vous Ю "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "Sieste"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Valider"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
+#, c-format
+msgid ""
+"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+"know."
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+msgid "Could not initialize GNOME"
+msgstr "Ne peut initialiser GNOME"
+
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Ne peut initialiser Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
+#, fuzzy
+msgid "Could not create the alarm notify service factory"
+msgstr "Ne peut crИer de rИpertoire temporaire : %s"
+
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A %e %B %Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
-msgstr "Ouvrir le calendrier"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
-msgstr "Enregistrer le calendrier"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: calendar/gui/calendar-commands.c:468
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Ne peut crИer la vue du calendrier. Veuillez vИrifier votre configuration "
 "d'ORBit et d'OAF."
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "Public"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "PrivИ"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Confidentiel"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1592
-#: calendar/gui/event-editor.c:1619
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:660
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Haute"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
-#: calendar/gui/calendar-model.c:1569
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:659
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:658
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Basse"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Transparent"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Opaque"
 
-#: calendar/gui/calendar-model.c:635 calendar/gui/calendar-model.c:1173
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Non dИmarrИe"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1175
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "En cours"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1177
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "ComplИtИ"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1179
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
-#: camel/camel-service.c:586
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "AnnulИ"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:799
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1687,23 +2101,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:879
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:893 calendar/gui/calendar-model.c:1117
-#: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1129
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:430
-#: widgets/misc/e-dateedit.c:1339 widgets/misc/e-dateedit.c:1454
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Aucune"
 
-#: calendar/gui/calendar-model.c:967
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1713,141 +2131,299 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1007
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "La valeur de pourcentage doit Йtre comprise entre 0 et 100 inclus"
 
-#: calendar/gui/calendar-model.c:1048
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1061
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "IndИfini"
 
-#: calendar/gui/calendar-model.c:1102
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1571
+#: calendar/gui/calendar-model.c:1710
 #, fuzzy
 msgid "Recurring"
 msgstr "RИcurrence"
 
-#: calendar/gui/calendar-model.c:1573
+#: calendar/gui/calendar-model.c:1712
 #, fuzzy
 msgid "Assigned"
 msgstr "Assigner un score"
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 #, fuzzy
 msgid "No"
 msgstr "Maintenant"
 
-#: calendar/gui/calendar-summary.c:196
-msgid "%A, %e %B %Y"
-msgstr "%A %e %B %Y"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "Carte : "
 
-#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "Semaine de travail"
 
-#: calendar/gui/calendar-summary.c:437
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Erreur de chargement du calendrier</b>"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "Semaine"
 
-#: calendar/gui/calendar-summary.c:449
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Erreur de chargement du calendrier :<br>MИthode non supportИe"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "Mois"
 
-#: calendar/gui/calendar-summary.c:616
-msgid "Display"
-msgstr "Affichage"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "L'URI que le calendrier affichera"
 
-#: calendar/gui/calendar-summary.c:621
-msgid "Show appointments"
-msgstr "Afficher les rendez-vous"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "Alarmes auditives"
 
-#: calendar/gui/calendar-summary.c:629
-msgid "Show tasks"
-msgstr "Afficher les tБches"
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "Destinataires du message"
 
-#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Chargement du calendrier"
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "Options d'affichage"
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "L'URI que le calendrier affichera"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "Rappel de votre rendez-vous Ю "
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Sieste"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Valider"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "Nettoyer l'affichage des messages"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Heure de fin : "
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 #, fuzzy
-msgid "Factory for the alarm notification service"
-msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
+msgid "Run program:"
+msgstr "Lancer un programme"
 
-#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:52
-msgid "Could not initialize GNOME"
-msgstr "Ne peut initialiser GNOME"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:77
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "jours"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 #, fuzzy
-msgid "Could not create the alarm notify service factory"
-msgstr "Ne peut crИer de rИpertoire temporaire : %s"
+msgid "extra times every"
+msgstr "_Mettre Ю jour Libre/OccupИ"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarme le %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "heures"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Notification Ю propos de votre rendez-vous le %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "minutes"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
-msgstr "Aucun rИsumИ disponible."
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr " %d jours"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Fermer"
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr " 1 jour"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "иditer le rendez-vous"
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr " %d semaines"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "DurИe de la sieste (minutes)"
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr " 1 semaine"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr " %d heures"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr " 1 heure"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr " %d minutes"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr " 1 minute"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr " %d secondes"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr " 1 seconde"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "Affiche le message UID \"%s\""
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an email"
+msgstr "RИcupИration du courrier depuis %s"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr "Lancer un programme"
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr "CrИe un nouveau rendez-vous"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr "CrИe un nouveau rendez-vous"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr "Me rappeler de tous les rendez-vous"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr "CrИe un nouveau rendez-vous"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "Base"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "Date &amp; heure"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "Alarmes"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+#, fuzzy
+msgid "Summary:"
+msgstr "RИsu_mИ :"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_Options"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "aprИs"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "avant"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "jour(s)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+#, fuzzy
+msgid "end of appointment"
+msgstr "Me rappeler de tous les rendez-vous"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr "heure(s)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+msgid "minute(s)"
+msgstr "minute(s)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+#, fuzzy
+msgid "start of appointment"
+msgstr "иditer le rendez-vous"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
@@ -1878,36 +2454,40 @@ msgid "60 minutes"
 msgstr "60 minutes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Expiration des alarmes aprХs"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Alarmes auditives"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "Biper quand les fenЙtres d'alarme apparaissent."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "PrИfИrences du calendrier"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#, fuzzy
+msgid "Color for tasks due today"
+msgstr "иlИment 'ю faire' qui finit aujourd'hui :"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Couleurs"
+#, fuzzy
+msgid "Colors for Tasks"
+msgstr "Couleurs pour l'affichage"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+#, fuzzy
+msgid "Compress weekends in month view"
 msgstr "Compresser les week-ends"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+#, fuzzy
+msgid "Date Navigator"
 msgstr "Options du navigateur de date"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1915,439 +2495,937 @@ msgid "Defaults"
 msgstr "DИfauts"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Options d'affichage"
+#: mail/mail-config.glade.h:30
+msgid "Display"
+msgstr "Affichage"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
-msgstr "Date d'ИchИance"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Activer la sonnerie pour"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Fin de la journИe :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Premier jour de la semaine :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "Ven"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Vendredi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Mettre en Иvidence"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "иlИments s'achevant aujourd'hui"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "иlИments expirant aujourd'hui : "
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "иlИments pas encore expirИs"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "иlИments pas encore expirИs :"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Lundi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "иlИments en retard"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "иlИments en retard :"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
-msgstr "Choisissez une couleur"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "PrioritИ"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#, fuzzy
+msgid "Overdue tasks"
+msgstr "иlИments en retard"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Me rappeler de tous les rendez-vous"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Alarmes"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "Sam"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Samedi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Afficher"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "Afficher l'heure de fin des rendez-vous"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Afficher les numИros de semaine"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "DИbut de la journИe :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "Dim"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "TБchePad"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "TБches"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "иlИments s'achevant aujourd'hui"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "Jeu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "DurИe avant ИchИance"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "Time"
+msgstr "Horaire"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "Divisions du temps :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Format de date :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"Fuseau horaire : "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "Mar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Alarmes visuelles"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "Mer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
 msgstr "Semaine de travail"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "minutes avant leur dИbut."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
-msgid "seconds."
-msgstr "secondes."
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "йtes-vous sШr de vouloir supprimer cette tБche sans titre %s ?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "йtes-vous sШr de vouloir supprimer la tБche ╚ %s ╩ ?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "йtes-vous sШr de vouloir supprimer l'entrИe de journal ╚ %s ╩ ?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+#, fuzzy
+msgid " to "
+msgstr " pour "
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "ComplИtИ"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "ComplИtИ"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#, fuzzy
+msgid "Due "
+msgstr "Date d'ИchИance"
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "иditer le rendez-vous"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "Rendez-vous - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "TБche - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "EntrИe de journal - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Aucun rИsumИ"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "иcraser le fichier ?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Un fichier avec le mЙme nom existe.\n"
+"L'Иcraser ?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Enregistrer sous..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "йtes-vous sШr de vouloir supprimer le rendez-vous ╚ %s ╩ ?"
 
-#: calendar/gui/dialogs/delete-comp.c:73
+#: calendar/gui/dialogs/delete-comp.c:87
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "йtes-vous sШr de vouloir supprimer ce rendez-vous sans titre ?"
 
-#: calendar/gui/dialogs/delete-comp.c:79
+#: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "йtes-vous sШr de vouloir supprimer la tБche ╚ %s ╩ ?"
 
-#: calendar/gui/dialogs/delete-comp.c:82
+#: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "йtes-vous sШr de vouloir supprimer cette tБche sans titre %s ?"
 
-#: calendar/gui/dialogs/delete-comp.c:88
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "йtes-vous sШr de vouloir supprimer l'entrИe de journal ╚ %s ╩ ?"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "йtes-vous sШr de vouloir supprimer cet entrИe de journal sans titre ?"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Voulez-vous enregistrer les changements ?"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "йtes-vous sШr de vouloir supprimer le rendez-vous ╚ %s ╩ ?"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% Comp_lИtИ :"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "йtes-vous sШr de vouloir supprimer la tБche ╚ %s ╩ ?"
+
+#: calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "йtes-vous sШr de vouloir supprimer l'entrИe de journal ╚ %s ╩ ?"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "SИlectionner un fichier"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Sections :"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Fuseau horaire : "
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
+msgstr "Rendez-vous"
+
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
+msgstr "Alarme"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
+msgstr "RИcurrence"
+
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "Annuler la rИunion"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "_Toute la journИe"
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Classification"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 #, fuzzy
 msgid "Date & Time"
 msgstr "Date &amp; heure"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Date d'achХvement :"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Pri_vate"
 msgstr "Pri_vИ"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "En cours"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "Pu_blic"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Date de _dИbut :"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "RИsu_mИ :"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "TБche"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL :"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
 msgid "_Confidential"
 msgstr "_Confidentiel"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "_Contacts..."
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "Heure de _fin :"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "_Date d'expiration :"
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "Heure de _dИbut :"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_PrioritИ :"
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "_иtat :"
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Groupe %i"
 
-#: calendar/gui/dialogs/task-editor.c:697
-msgid "Edit Task"
-msgstr "иditer la tБche"
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Source"
 
-#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
-msgid "No summary"
-msgstr "Aucun rИsumИ"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
-#, c-format
-msgid "Appointment - %s"
-msgstr "Rendez-vous - %s"
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+#, fuzzy
+msgid "Chair"
+msgstr "Voiture"
 
-#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
-#, c-format
-msgid "Task - %s"
-msgstr "TБche - %s"
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+#, fuzzy
+msgid "Required Participant"
+msgstr "Personnes _nИcessaires"
 
-#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
-#, c-format
-msgid "Journal entry - %s"
-msgstr "EntrИe de journal - %s"
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
-msgstr "CatИgories"
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
 #, fuzzy
-msgid "Completion Date"
+msgid "Needs Action"
+msgstr "Supprimer l'action"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr "Accepter"
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr "Refuser"
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Essai"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "SupprimИ"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "En cours"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Chair Persons"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Personnes _nИcessaires"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Personnes _nИcessaires"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Personnes _nИcessaires"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "Vu"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "Supprimer..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#, fuzzy
+msgid "Attendee"
+msgstr "Tout les invitИs"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
 msgstr "ComplИtИe"
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "End Date"
-msgstr "Date de fin"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "SupprimИ"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Start Date"
-msgstr "Date de dИbut"
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "SupprimИ"
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
-msgstr "Emplacement gИographique"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "Gestionnaire"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
 #, fuzzy
-msgid "Percent complete"
-msgstr "Marque la tБche comme complИtИe"
+msgid "Member"
+msgstr "DИcembre"
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Summary"
-msgstr "RИsumИ"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
-msgstr "Transparence"
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
-msgstr "URL"
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "иtat"
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
-msgstr "Alarmes"
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Type"
 
-#: calendar/gui/e-calendar-table.c:170
-msgid "Click here to add a task"
-msgstr "Cliquez ici pour ajouter une tБche"
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+#, fuzzy
+msgid "Organizer:"
+msgstr "Organisation :"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Organisation :"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "_Inviter d'autres personnes..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Organisation :"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Ce rendez-vons contient des rИcurrences qu'Evolution ne peut Иditer."
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr "le"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "jour"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr "dans le"
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr "iХme"
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr "occurences"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
+msgstr "RИcurrence personnalisИe"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Tou(te)s les"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "Exceptions"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
+msgstr "Aucune rИcurrence"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
+msgstr "AperГu"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
+msgstr "RХgle de rИcurrence"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
+msgstr "RИcurrence simple"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "Modifier"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "pour"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "toujours"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "mois"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr "jusqu'Ю"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "semaine(s)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
+msgstr "annИe(s)"
+
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr "Voulez-vous enregistrer les changements ?"
+
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "Date d'achХvement :"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "SupprimИ"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "SupprimИ"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "Aucune"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
+msgstr "URL :"
+
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "TБche"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% Comp_lИtИ :"
+
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
+msgstr "En cours"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "Date de _dИbut :"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
+msgstr "_Date d'expiration :"
+
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
+msgstr "_PrioritИ :"
+
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
+msgstr "_иtat :"
+
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "Marquer comme terminИe"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+#, fuzzy
+msgid "_Open"
+msgstr "Ouvrir"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
-msgstr "Marque la tБche comme complИtИe"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "Co_uper"
 
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit this task..."
-msgstr "иditer cette tБche..."
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Copier"
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "иdite la tБche"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "_Coller"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "Marquer comme terminИe"
+
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Supprimer la tБche"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
+msgstr "Marquer comme terminИe"
+
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Supprime la tБche"
 
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "Cliquez ici pour ajouter une tБche"
+
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% Comp_lИtИ :"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Alarmes"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "CatИgories"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+#, fuzzy
+msgid "Complete"
+msgstr "ComplИtИ"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+#, fuzzy
+msgid "Completion Date"
+msgstr "ComplИtИe"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "Date d'ИchИance"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Date de fin"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "Emplacement gИographique"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "PrioritИ"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Date de dИbut"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "RИsumИ"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "TБches"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "Transparence"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
 #: calendar/gui/e-day-view-time-item.c:519
 #, c-format
 msgid "%02i minute divisions"
@@ -2355,162 +3433,157 @@ msgstr "%02i divisions de minute"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
+#: calendar/gui/e-day-view.c:3306
 #, fuzzy
-msgid "New Appointment"
+msgid "New _Appointment"
 msgstr "Nouveau rendez-vous"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
 #, fuzzy
-msgid "New All Day Event"
+msgid "New All Day _Event"
 msgstr "_Toute la journИe"
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
 #, fuzzy
-msgid "Go to Today"
+msgid "Go to _Today"
 msgstr "Aller Ю aujourd'hui"
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
 #, fuzzy
-msgid "Go to Date..."
+msgid "_Go to Date..."
 msgstr "Aller Ю la date"
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: mail/folder-browser.c:566 ui/evolution-calendar.xml.h:19
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Ouvrir"
-
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
 #, fuzzy
-msgid "Delete this Appointment"
+msgid "_Delete this Appointment"
 msgstr "Supprimer ce rendez-vous"
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-#, fuzzy
-msgid "Schedule Meeting"
-msgstr "SИlectionnez un Dossier"
-
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
 #, fuzzy
-msgid "Make this Occurrence Movable"
+msgid "Make this Occurrence _Movable"
 msgstr "Rendre ce rendez-vous dИplaГable"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
 #, fuzzy
-msgid "Delete this Occurrence"
+msgid "Delete this _Occurrence"
 msgstr "Supprimer cette occurence"
 
-#: calendar/gui/e-day-view.c:3179
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
 #, fuzzy
-msgid "Delete all Occurrences"
+msgid "Delete _All Occurrences"
 msgstr "Supprimer toutes les occurences"
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
-msgstr "Je ne peut mettre Ю jour votre fichier de calendrier !\n"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
+#: calendar/gui/e-itip-control.c:697
 #, fuzzy
-msgid "Component successfully updated."
-msgstr "Les fichiers d'Evolution sont correctement installИs."
+msgid "This is a meeting request."
+msgstr "_C'est l'adresse de la liste de diffusion"
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
-msgstr "Je ne peut ouvrir votre fichier de calendrier !\n"
-
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
-msgstr "Je ne peut charger votre fichier de calendrier !\n"
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
-msgstr "Je ne peut lire votre fichier de calendrier !\n"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:499
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 #, fuzzy
-msgid "I couldn't update your calendar store."
-msgstr "Ne peut crИer un calendrier dans `%s'"
+msgid "The message is not understandable."
+msgstr ""
+"Ce message n'a pas de sujet.\n"
+"Voulez-vous vraiment l'envoyer ?"
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-#, fuzzy
-msgid "Component successfully deleted."
-msgstr "Les fichiers d'Evolution sont correctement installИs."
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-msgid "I don't recognize this type of calendar component."
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
-msgstr "Ajouter au calendrier"
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
-#, fuzzy
-msgid " Accept "
-msgstr "Accepter"
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:815
-#, fuzzy
-msgid " Decline "
-msgstr "Refuser"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:834
 #, fuzzy
-msgid " Tentative "
-msgstr "Essai"
+msgid "The message does not appear to be properly formed"
+msgstr "Le dossier semble irrИmИdiablement corrompu"
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
-msgstr "Mettre Ю jour le calendrier"
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
-msgstr "Annuler la rИunion"
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr "Je ne peut mettre Ю jour votre fichier de calendrier !\n"
+
+#: calendar/gui/e-itip-control.c:1015
+#, fuzzy
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "Je ne peut ouvrir votre fichier de calendrier !\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, fuzzy, no-c-format
@@ -2526,31 +3599,25 @@ msgstr ""
 msgid "Calendar Message"
 msgstr "Calendrier"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
+#: calendar/gui/e-itip-control.glade.h:5
 #, fuzzy
 msgid "Date:"
 msgstr "Date"
 
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "Chargement du calendrier"
+
 #: calendar/gui/e-itip-control.glade.h:8
 #, fuzzy
 msgid "Loading calendar..."
 msgstr "Chargement du calendrier"
 
-#: calendar/gui/e-itip-control.glade.h:9
-#, fuzzy
-msgid "Organizer:"
-msgstr "Organisation :"
-
 #: calendar/gui/e-itip-control.glade.h:10
 #, fuzzy
 msgid "Server Message:"
 msgstr "Enregistrer le message sous..."
 
-#: calendar/gui/e-itip-control.glade.h:11
-#, fuzzy
-msgid "Summary:"
-msgstr "RИsu_mИ :"
-
 #: calendar/gui/e-itip-control.glade.h:12
 #, fuzzy
 msgid "date-end"
@@ -2560,104 +3627,21 @@ msgstr "Mettre Ю jour le calendrier"
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-#, fuzzy
-msgid "Attendee"
-msgstr "Tout les invitИs"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-#, fuzzy
-msgid "Attendee address"
-msgstr "Tout les invitИs"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-#, fuzzy
-msgid "Attendees: "
-msgstr "Tout les invitИs"
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-#, fuzzy
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr "Annuler la rИunion"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-#, fuzzy
-msgid "Chair"
-msgstr "Voiture"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-#, fuzzy
-msgid "Meeting Invitations"
-msgstr "Heure de _dИbut de la rИunion :"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-#, fuzzy
-msgid "Organizer: "
-msgstr "Organisation :"
-
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:18
-#, fuzzy
-msgid ""
-"Request\n"
-"Meeting"
-msgstr "SИlectionnez un Dossier"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-#, fuzzy
-msgid "Required Participant"
-msgstr "Personnes _nИcessaires"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid "Role"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:22
-#, fuzzy
-msgid ""
-"Schedule\n"
-"Time"
-msgstr "SИlectionnez un Dossier"
-
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:33
-#: mail/message-list.c:1052
-msgid "Status"
-msgstr "иtat"
-
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "Tous"
 
-#: calendar/gui/e-tasks.c:155
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "CatИgorie :"
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Ne peut charger la tБche dans ╚ %s ╩"
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "La mИthode requise pour charger ╚ %s ╩ n'est pas supportИe"
@@ -2665,303 +3649,22 @@ msgstr "La mИthode requise pour charger ╚ %s ╩ n'est pas supportИe"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
 #, fuzzy
-msgid "New Appointment..."
+msgid "New _Appointment..."
 msgstr "Nouveau rendez-vous..."
 
-#: calendar/gui/e-week-view.c:3314
-#, fuzzy
-msgid "Delete All Occurrences"
-msgstr "Supprimer toutes les occurences"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "_Toute la journИe"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Rendez-vous"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "Rendez-vous ИlИmentaires"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "RИcurrence personnalisИe"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Tou(te)s les"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Exceptions"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Modifier"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Aucune rИcurrence"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1579
-msgid "Play a sound"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "AperГu"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "RИcurrence"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "RХgle de rИcurrence"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Alarme"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1588
-msgid "Run a program"
-msgstr "Lancer un programme"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1585
-#, fuzzy
-msgid "Send an email"
-msgstr "RИcupИration du courrier depuis %s"
-
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "RИglages..."
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1582
-msgid "Show a dialog"
-msgstr "Afficher un dialogue"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "RИcurrence simple"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "Heure de _fin :"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "Heure de _dИbut :"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "Date de _dИbut :"
-
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:36
-msgid "after"
-msgstr "aprИs"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
-msgid "before"
-msgstr "avant"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "jour(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-#, fuzzy
-msgid "end of appointment"
-msgstr "Me rappeler de tous les rendez-vous"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "pour"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "toujours"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "heure(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
-msgid "minute(s)"
-msgstr "minute(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr "mois"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-#, fuzzy
-msgid "start of appointment"
-msgstr "иditer le rendez-vous"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "until"
-msgstr "jusqu'Ю"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "week(s)"
-msgstr "semaine(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "year(s)"
-msgstr "annИe(s)"
-
-#: calendar/gui/event-editor.c:373
-msgid "Edit Appointment"
-msgstr "иditer le rendez-vous"
-
-#: calendar/gui/event-editor.c:451
-msgid "on"
-msgstr "le"
-
-#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
-msgid "day"
-msgstr "jour"
-
-#: calendar/gui/event-editor.c:603
-msgid "on the"
-msgstr "dans le"
-
-#: calendar/gui/event-editor.c:610
-msgid "th"
-msgstr "iХme"
-
-#: calendar/gui/event-editor.c:756
-msgid "occurrences"
-msgstr "occurences"
-
-#: calendar/gui/event-editor.c:873
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Ce rendez-vons contient des rИcurrences qu'Evolution ne peut Иditer."
-
-#: calendar/gui/event-editor.c:1534
-#, c-format
-msgid " %d days"
-msgstr " %d jours"
-
-#: calendar/gui/event-editor.c:1536
-msgid " 1 day"
-msgstr " 1 jour"
-
-#: calendar/gui/event-editor.c:1539
-#, c-format
-msgid " %d weeks"
-msgstr " %d semaines"
-
-#: calendar/gui/event-editor.c:1541
-msgid " 1 week"
-msgstr " 1 semaine"
-
-#: calendar/gui/event-editor.c:1544
-#, c-format
-msgid " %d hours"
-msgstr " %d heures"
-
-#: calendar/gui/event-editor.c:1546
-msgid " 1 hour"
-msgstr " 1 heure"
-
-#: calendar/gui/event-editor.c:1549
-#, c-format
-msgid " %d minutes"
-msgstr " %d minutes"
-
-#: calendar/gui/event-editor.c:1551
-msgid " 1 minute"
-msgstr " 1 minute"
-
-#: calendar/gui/event-editor.c:1554
-#, c-format
-msgid " %d seconds"
-msgstr " %d secondes"
-
-#: calendar/gui/event-editor.c:1556
-msgid " 1 second"
-msgstr " 1 seconde"
-
-#: calendar/gui/event-editor.c:1603
-#, fuzzy
-msgid " before start of appointment"
-msgstr "CrИe un nouveau rendez-vous"
-
-#: calendar/gui/event-editor.c:1605
-#, fuzzy
-msgid " after start of appointment"
-msgstr "CrИe un nouveau rendez-vous"
-
-#: calendar/gui/event-editor.c:1613
-#, fuzzy
-msgid " before end of appointment"
-msgstr "Me rappeler de tous les rendez-vous"
-
-#: calendar/gui/event-editor.c:1615
-#, fuzzy
-msgid " after end of appointment"
-msgstr "CrИe un nouveau rendez-vous"
-
-#: calendar/gui/event-editor.c:3123 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-#, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr "Ne peut initialiser le composant de rИsumИ de messages d'Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#, fuzzy
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Conduite ╚ Calendrier ╩ d'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr ""
-"Utilitaire de configuration pour la conduite ╚ Calendrier ╩ d'Evolution.\n"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:700
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Ne peut ouvrir le dossier dans ╚ %s ╩"
 
-#: calendar/gui/gnome-cal.c:711
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "La mИthode requise pour charger ╚ %s ╩ n'est pas supportИe"
@@ -2987,236 +3690,256 @@ msgid "Go To Date"
 msgstr "Aller Ю la date"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Aller Ю aujourd'hui"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Janvier"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "Juillet"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "Juin"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "Mars"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "Mai"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "Novembre"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "Octobre"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Septembre"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Aller Ю aujourd'hui"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1er"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2Хme"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3Хme"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4Хme"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5Хme"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6Хme"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7Хme"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8Хme"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9Хme"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10Хme"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11Хme"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12Хme"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13Хme"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14Хme"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15Хme"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16Хme"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17Хme"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18Хme"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19Хme"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20Хme"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21Хme"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22Хme"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23Хme"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24Хme"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25Хme"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26Хme"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27Хme"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28Хme"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29Хme"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30Хme"
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31Хme"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Di"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Je"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "Sa"
 
-#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "TБches"
 
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "Jour en cours (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1104
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Semaine en cours (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Mois en cours (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "AnnИe en cours (%Y)"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Imprimer le Calendrier"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1342
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:52
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "AperГu Avant Impression"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Imprime cet ИlИment"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "Configuration de l'impression"
+
+#: calendar/gui/tasks-control.c:126
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "L'URI que le calendrier affichera"
@@ -3253,94 +3976,113 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "DLMMJVS"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 #, fuzzy
 msgid "Signing is not supported by this cipher"
 msgstr "Le type spИcifiИ n'est pas supportИ dans cet entrepot"
 
-#: camel/camel-cipher-context.c:207
+#: camel/camel-cipher-context.c:211
 #, fuzzy
 msgid "Clearsigning is not supported by this cipher"
 msgstr "Le type spИcifiИ n'est pas supportИ dans cet entrepot"
 
-#: camel/camel-cipher-context.c:245
+#: camel/camel-cipher-context.c:251
 #, fuzzy
 msgid "Verifying is not supported by this cipher"
 msgstr "Le type spИcifiИ n'est pas supportИ dans cet entrepot"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:294
 #, fuzzy
 msgid "Encryption is not supported by this cipher"
 msgstr "Le type spИcifiИ n'est pas supportИ dans cet entrepot"
 
-#: camel/camel-cipher-context.c:326
+#: camel/camel-cipher-context.c:336
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "Le type spИcifiИ n'est pas supportИ dans cet entrepot"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 #, fuzzy
 msgid "Syncing folders"
 msgstr "Synchronisation du dossier"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Impossible d'ouvrir le carnet d'adresses"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr ""
 "Ne peut enregistrer le dossier ╚ %s ╩ :\n"
 "%s"
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 #, fuzzy
 msgid "Getting message %d (%d%%)"
 msgstr "иcriture du message %d du %d"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, fuzzy, c-format
-msgid "Failed message %d"
+msgid "Failed on message %d"
 msgstr "_Message Иlectronique (FIXME)"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 #, fuzzy
 msgid "Cannot open message"
 msgstr "Ne peut obtenir le message : %s"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Synchronisation du dossier"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-#, fuzzy
-msgid "Complete"
-msgstr "ComplИtИ"
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "иcriture du message %d du %d"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "иcriture du message %d du %d"
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
@@ -3376,14 +4118,33 @@ msgstr ""
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Ne peut crИer le tube : %s"
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Ne peut obtenir le rИpertoire : %s : %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "Ne peut cloner : %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Ne peut crИer le fichier de verrouillage pour %s : %s"
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3400,113 +4161,108 @@ msgstr "Impossible d'obtenir le verrou avec fcntl(2) : %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Impossible d'obtenir le verrou avec flock(2) : %s"
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Ne peut vИrifier le fichier de courrier %s : %s"
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Ne peut ouvrir le fichier de courrier %s : %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Ne peut ouvrir le fichier de courrier temporaire %s : %s"
 
-#: camel/camel-movemail.c:199
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Ne peut tester le fichier de verrouillage pour %s : %s"
-
-#: camel/camel-movemail.c:245
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Erreur de lecture du fichier de courrier : %s"
-
-#: camel/camel-movemail.c:256
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Erreur d'Иcriture du fichier temporaire de courrier : %s"
-
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "иchec du stockage du courrier dans le fichier temporaire %s : %s"
 
-#: camel/camel-movemail.c:306
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Ne peut crИer le tube : %s"
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Ne peut cloner : %s"
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "иchec du programme movemail : %s"
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Erreur inconnue)"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Erreur de lecture du fichier de courrier : %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Erreur d'Иcriture du fichier temporaire de courrier : %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, fuzzy, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Erreur d'Иcriture du fichier temporaire de courrier : %s"
 
-#: camel/camel-pgp-context.c:186
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Veuillez saisir votre %s phrase de passe pour %s"
 
-#: camel/camel-pgp-context.c:189
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Veuillez saisir votre %s phrase de passe"
 
-#: camel/camel-pgp-context.c:509
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
-#: camel/camel-pgp-context.c:1021 camel/camel-pgp-context.c:1235
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Aucun mot de passe fournit."
 
-#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
-#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1028
-#: camel/camel-pgp-context.c:1242
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Ne peut crИer le tube vers GPG/PGP : %s"
 
-#: camel/camel-pgp-context.c:681
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:871
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr ""
 
-#: camel/camel-pgp-context.c:888
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Ne peut crИer de fichier temporaire : %s"
 
-#: camel/camel-pgp-context.c:1011
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr ""
 
-#: camel/camel-pgp-context.c:1037
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "Aucun destinataires spИcifiИs"
 
-#: camel/camel-pgp-context.c:1227
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -3525,37 +4281,37 @@ msgstr "Ne peut charger %s : %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ne peut charger %s : Aucun code d'initialisation dans le module."
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s serveur %s"
 
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s service pour %s sur %s"
 
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr "Connexion annulИe"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Ne peut se connecter Ю %s (port %d) : %s"
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr "(hТte inconnu)"
 
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:264
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "OpИration annulИe"
 
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:489
 #, fuzzy
 msgid "Server unexpectedly disconnected"
 msgstr "Serveur dИconnectИ."
@@ -3672,72 +4428,81 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:417
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "Mauvaise rИponse d'identification du serveur."
 
-#: camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
+msgstr ""
+
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 #, fuzzy
 msgid "This option will connect to the server using a simple password."
 msgstr ""
 "Cette option vous connectera au serveur IMAP en utilisant un mots de passe "
 "en clair."
 
-#: camel/camel-search-private.c:110
+#: camel/camel-sasl-login.c:127
+#, fuzzy
+msgid "Unknown authentication state."
+msgstr "Identification"
+
+#: camel/camel-search-private.c:111
 #, fuzzy, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Echec d'Иcriture dans la boite Ю lettres temporaire : %s : %s"
 
-#: camel/camel-service.c:152
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "L'URL ╚ %s ╩ a besoin du composant ╚ nom d'utilisateur ╩"
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "L'URL ╚ %s ╩ a besoin du composant ╚ hТte ╩"
 
-#: camel/camel-service.c:168
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "L'URL ╚ %s ╩ a besoin du composant ╚ chemin ╩"
 
-#: camel/camel-service.c:554
+#: camel/camel-service.c:548
 #, fuzzy, c-format
 msgid "Resolving: %s"
 msgstr "Test de \"%s\""
 
-#: camel/camel-service.c:581
+#: camel/camel-service.c:575
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:606
+#: camel/camel-service.c:600
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:608
+#: camel/camel-service.c:602
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:57
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr "Founisseur de dossier de courrier virtuel"
 
-#: camel/camel-session.c:59
+#: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 "Pour la lecture de courrier comme requЙte a un autre ensemble de dossiers"
 
-#: camel/camel-session.c:274 camel/camel-session.c:364
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Aucun fournisseur disponible pour le protocole ╚ %s ╩"
 
-#: camel/camel-session.c:462
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3746,12 +4511,73 @@ msgstr ""
 "Ne peut crИer le rИpertoire %s :\n"
 "%s"
 
-#. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:994 mail/mail-ops.c:1001
-#: mail/mail-ops.c:1019 mail/mail-ops.c:1020
+#: camel/camel-smime-context.c:173
+#, fuzzy, c-format
+msgid "Please enter your password for %s"
+msgstr "Veuillez saisir votre %s phrase de passe pour %s"
+
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "Ce fichier n'existe pas."
+
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "Ce fichier n'existe pas."
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, fuzzy, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "иchec d'envoi du nom d'utilisateur au serveur"
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
 #, fuzzy
-msgid "Trash"
-msgstr "TБche"
+msgid "Failed to decode message."
+msgstr "_Message Иlectronique (FIXME)"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
+#, fuzzy, c-format
+msgid ""
+"Issuer: %s\n"
+"Subject: %s"
+msgstr "Cacher le sujet \"%s\""
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
 
 #: camel/camel-url.c:289
 #, fuzzy, c-format
@@ -3760,68 +4586,95 @@ msgstr ""
 "Impossible d'ouvrir le fichier ╚ %s ╩ :\n"
 "%s"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "Aucun message correspondant"
 
-#: camel/camel-vee-folder.c:545
+#: camel/camel-vee-folder.c:547
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "Aucun message correspondant"
 
-#: camel/providers/imap/camel-imap-command.c:209
+#: camel/camel-vtrash-folder.c:109
+#, fuzzy
+msgid "You cannot copy messages from this trash folder."
+msgstr ""
+"Vous ne pouvez Иditer des messages que\n"
+"lorsqu'ils sont dans le dossier Brouillons."
+
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "RИponse innatendue du serveur IMAP : %s"
 
-#: camel/providers/imap/camel-imap-command.c:217
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "иchec de la commande IMAP : %s"
 
-#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Erreur inconnue"
-
-#: camel/providers/imap/camel-imap-command.c:272
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "La rИponse du serveur s'est terminИe trop tot."
 
-#: camel/providers/imap/camel-imap-command.c:456
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "La rИponse du serveur IMAP ne contient pas l'information %s"
 
-#: camel/providers/imap/camel-imap-command.c:490
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "RИponse OK innatendue du serveur IMAP : %s"
 
-#: camel/providers/imap/camel-imap-folder.c:172
+#: camel/providers/imap/camel-imap-folder.c:192
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr "Ne peut crИer le rИpertoire %s : %s"
+
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Ne peut charger le rИsumИ pour %s"
 
-#: camel/providers/imap/camel-imap-folder.c:351
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
+msgstr ""
+
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
 #, fuzzy
-msgid "Scanning IMAP folder"
-msgstr "Scrutation des dossiers dans ╚ %s ╩"
+msgid "Scanning for changed messages"
+msgstr "Enregistrement des changements dans le message..."
 
-#: camel/providers/imap/camel-imap-folder.c:986
-#: camel/providers/imap/camel-imap-folder.c:1197
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 #, fuzzy
 msgid "This message is not currently available"
 msgstr ""
 "Ce message n'a pas de sujet.\n"
 "Voulez-vous vraiment l'envoyer ?"
 
-#: camel/providers/imap/camel-imap-folder.c:1016
-#: camel/providers/imap/camel-imap-folder.c:1231
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Enregistre les messages"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "Ne peut trouver le corps du message dans la rИponse FETCH."
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, fuzzy, c-format
+msgid "Could not open cache directory: %s"
+msgstr "Ne peut crИer le rИpertoire %s : %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 #, fuzzy
 msgid "Checking for new mail"
 msgstr "CrИe une nouveau contact"
@@ -3831,7 +4684,7 @@ msgstr "CrИe une nouveau contact"
 msgid "Check for new messages in all folders"
 msgstr "Marquage des messages du dossier \"%s\""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:484
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Dossiers"
 
@@ -3867,30 +4720,30 @@ msgstr ""
 "Cette option vous connectera au serveur IMAP en utilisant un mots de passe "
 "en clair."
 
-#: camel/providers/imap/camel-imap-store.c:440
+#: camel/providers/imap/camel-imap-store.c:463
 #, fuzzy, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "Impossible de se connecter au serveur POP.\n"
 "Aucun support pour le mИcanisme d'identification demandИ."
 
-#: camel/providers/imap/camel-imap-store.c:450
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Aucune identification requise"
 
-#: camel/providers/imap/camel-imap-store.c:475
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVeuillez entrer le mot de passe IMAP pour %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:490
-#: camel/providers/smtp/camel-smtp-transport.c:403
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3901,104 +4754,116 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:865
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, fuzzy, c-format
-msgid "%s is not a selectable folder"
-msgstr "Voir le sИlecteur de dossier"
-
-#: camel/providers/imap/camel-imap-store.c:879
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Ne peut crИer le rИpertoire %s : %s"
+msgid "No such folder %s"
+msgstr "Aucun dossier ╚ %s ╩."
 
-#: camel/providers/imap/camel-imap-store.c:1382
-msgid "You must be working online to complete this operation"
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/local/camel-local-provider.c:40
 #, fuzzy
 msgid "MH-format mail directories"
 msgstr "RИpertoires de courrier au format UNIX MH (version CamelLocal)"
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr ""
 "Pour stocker le courrier local dans des rИpertoires de courrier au format MH"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr "Pour stocker le courrier local au format standard mbox"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 #, fuzzy
 msgid "Qmail maildir-format mail files"
 msgstr "Fichiers de courrier au format UNIX qmail maildir"
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 "Pour stocker le courrier local dans des rИpertoires de courrier au format "
 "qmail"
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-provider.c:70
+#, fuzzy
+msgid "Unix mbox spool-format mail files"
+msgstr "Fichiers de courrier au format UNIX mbox (version CamelLocal)"
+
+#: camel/providers/local/camel-local-provider.c:71
+#, fuzzy
+msgid "For storing local mail in standard Unix spool directories"
+msgstr ""
+"Pour stocker le courrier local dans des rИpertoires de courrier au format "
+"qmail"
+
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "La racine de stockage %s n'est pas un chemin absolu"
 
-#: camel/providers/local/camel-local-store.c:136
+#: camel/providers/local/camel-local-store.c:134
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "La racine de stockage %s n'est pas un rИpertoire normal"
 
-#: camel/providers/local/camel-local-store.c:144
-#: camel/providers/local/camel-local-store.c:160
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ne peut obtenir le rИpertoire : %s : %s"
 
-#: camel/providers/local/camel-local-store.c:175
+#: camel/providers/local/camel-local-store.c:173
 #, fuzzy
 msgid "Local stores do not have an inbox"
 msgstr "Le stockage local n'a pas de rИpertoire racine"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fichier de courrier local %s"
 
-#: camel/providers/local/camel-local-store.c:241
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Impossible de renommer le dossier %s vers %s : %s"
 
-#: camel/providers/local/camel-local-store.c:283
+#: camel/providers/local/camel-local-store.c:279
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Impossible de supprimer le fichier de rИsumИ de dossier ╚ %s ╩ : %s"
 
-#: camel/providers/local/camel-local-store.c:293
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Impossible de supprimer le fichier d'index de dossier ╚ %s ╩ : %s"
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
+msgid "Unable to add message to summary: unknown reason"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Impossible de concatИner le message au dossier maildir : %s : %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4007,18 +4872,19 @@ msgstr ""
 "Impossible d'obtenir le message : %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "Aucun message correspondant"
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr "Contenu de message invalide"
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4028,14 +4894,14 @@ msgstr ""
 "Ne peut ouvrir le dossier ╚ %s ╩ :\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Le dossier ╚ %s ╩ n'existe pas."
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4045,28 +4911,43 @@ msgstr ""
 "Ne peut crИer le dossier ╚ %s ╩ :\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "╚ %s ╩ n'est pas un rИpertoire maildir."
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Impossible de supprimer le dossier ╚ %s ╩ : %s"
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "n'est pas un rИpertoire maildir"
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"Ne peut crИer le dossier ╚ %s ╩ :\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
+#, fuzzy, c-format
+msgid "Cannot open maildir directory path: %s: %s"
+msgstr "Ne peut ouvrir la boНte Ю lettres : %s : %s\n"
+
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ne peut obtenir le rИpertoire : %s : %s"
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Ne peut ouvrir la boНte Ю lettres : %s : %s\n"
@@ -4076,9 +4957,12 @@ msgstr "Ne peut ouvrir la boНte Ю lettres : %s : %s\n"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Impossible de concatИner le message au fichier mbox : %s : %s"
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4087,11 +4971,13 @@ msgstr ""
 "Impossible d'obtenir le message : %s du dossier %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Le dossier semble irrИmИdiablement corrompu"
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -4136,86 +5022,103 @@ msgstr "Le dossier ╚ %s ╩ n'est pas vide. Non supprimИ."
 
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 #, fuzzy
 msgid "Summarising folder"
 msgstr "Synchronisation du dossier"
 
-#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 "Impossible d'ouvrir le dossier : %s : rИsume depuis la position %ld : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 "Erreur fatale d'analyse du courrier prИs de la position %ld dans le dossier "
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Ne peut rИsumer le dossier : %s :%s"
 
-#: camel/providers/local/camel-mbox-summary.c:501
-#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Synchronisation du dossier"
 
-#: camel/providers/local/camel-mbox-summary.c:506
-#: camel/providers/local/camel-mbox-summary.c:707
+#: camel/providers/local/camel-mbox-summary.c:507
+#: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Ne peut ouvrir le dossier Ю rИsumer : %s : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:523
+#: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ne peut ouvrir la boНte Ю lettres temporaire : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:556
-#: camel/providers/local/camel-mbox-summary.c:745
-#: camel/providers/local/camel-mbox-summary.c:753
+#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:557
+#: camel/providers/local/camel-mbox-summary.c:746
+#: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 "Le rИsumИ et le dossier ne correspondent pas, meme aprИs une synchronisation"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Erreur d'Иcriture dans la boite Ю lettres temporaire : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:616
+#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Echec d'Иcriture dans la boite Ю lettres temporaire : %s : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:634
-#: camel/providers/local/camel-mbox-summary.c:803
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Impossible de fermer le dossier source %s : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:643
+#: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Impossible de fermer le dossier temporaire : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:654
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Impossible de renommer le dossier : %s"
 
 #: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erreur inconnue : %s"
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Impossible de concatИner le message au dossier mh : %s : %s"
@@ -4225,39 +5128,100 @@ msgstr "Impossible de concatИner le message au dossier mh : %s : %s"
 msgid "`%s' is not a directory."
 msgstr "╚ %s ╩ n'est pas un rИpertoire."
 
+#: camel/providers/local/camel-mh-summary.c:218
+#, fuzzy, c-format
+msgid "Cannot open MH directory path: %s: %s"
+msgstr "Ne peut ouvrir la boНte Ю lettres : %s : %s\n"
+
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "Impossible de concatИner le message au fichier mbox : %s : %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "╚ %s ╩ n'est pas un fichier normal."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "Le dossier ╚ %s ╩ n'existe pas."
+
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy
+msgid "Spool stores do not have an inbox"
+msgstr "Le stockage local n'a pas de rИpertoire racine"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Fichier de courrier local %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+#, fuzzy
+msgid "Spool folders cannot be renamed"
+msgstr "Les dossiers locaux ne peuvent Йtre encapsulИs."
+
+#: camel/providers/local/camel-spool-store.c:230
+#, fuzzy
+msgid "Spool folders cannot be deleted"
+msgstr "Les dossiers locaux ne peuvent Йtre encapsulИs."
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "Ne peut ouvrir le fichier de courrier temporaire %s : %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "Impossible de fermer le dossier source %s : %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Veuillez entrer le mot de passe NNTP pour %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "Le serveur a rejetИ le nom d'utilisateur"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "иchec d'envoi du nom d'utilisateur au serveur"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "Le serveur a rejetИ le nom d'utilisateur / mot de passe"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "Message %s non trouvИ."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "Ne peut obtenir la liste des grouges du serveur."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Inpossible de charger la liste des groupes du serveur pour %s : %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -4273,17 +5237,17 @@ msgstr ""
 "C'est un fournisseur pour la lecture et la publication dans les groupes de "
 "nouvelles USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:226
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Ne peut ouvrir le rИpertoire pour le serveur de nouvelles : %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:288
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "Nouvelles USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:295
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4291,8 +5255,8 @@ msgstr ""
 "Cette option vous identifiera auprИs du serveur NNTP en utilisant un mot de "
 "passe en clair."
 
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Incapable d'ouvrir ou de crИer un fichier .newsrc pour %s : %s"
@@ -4302,22 +5266,32 @@ msgstr "Incapable d'ouvrir ou de crИer un fichier .newsrc pour %s : %s"
 msgid "Retrieving POP summary"
 msgstr "RИcupИration des messages"
 
-#: camel/providers/pop3/camel-pop3-folder.c:192
+#: camel/providers/pop3/camel-pop3-folder.c:155
+#, fuzzy, c-format
+msgid "Could not check POP server for new messages: %s"
+msgstr "Ne peut se connecter au serveur POP sur %s."
+
+#: camel/providers/pop3/camel-pop3-folder.c:199
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 "Impossible d'ouvrir le dossier : la liste des messages Иtait incomplete."
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:292
 #, c-format
 msgid "No message with uid %s"
 msgstr "Aucun message avec l'uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:289
+#: camel/providers/pop3/camel-pop3-folder.c:296
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "RИcupИration du message %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:307
+#: camel/providers/pop3/camel-pop3-folder.c:303
+#, fuzzy, c-format
+msgid "Could not fetch message: %s"
+msgstr "Impossible d'envoyer le message : %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:320
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Ne pas rИcupИrer le message du serveur POP %s : %s"
@@ -4337,7 +5311,7 @@ msgstr "Ne pas effacer les messages du serveur"
 msgid "Delete after %s day(s)"
 msgstr "Supprime la tБche"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4375,22 +5349,27 @@ msgstr ""
 "Cela vous connectera au serveur POP et utilisera Kerberos 4 pour vous "
 "identifier."
 
-#: camel/providers/pop3/camel-pop3-store.c:207
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Ne peut vous identifier sur le serveur KPOP : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:319
+#: camel/providers/pop3/camel-pop3-store.c:215
+#, fuzzy, c-format
+msgid "Could not connect to server: %s"
+msgstr "Ne peut se connecter au serveur POP sur %s."
+
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Ne peut se connecter au serveur POP sur %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:358
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sVeuillez entrer le mot de passe POP3 pour %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:377
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4399,12 +5378,12 @@ msgstr ""
 "Impossible de se connecter au serveur POP.\n"
 "Erreur lors de l'envoi du nom d'utilisateur : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:380
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr "(Inconnu)"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4412,7 +5391,7 @@ msgstr ""
 "Impossible de se connecter au serveur POP.\n"
 "Aucun support pour le mИcanisme d'identification demandИ."
 
-#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4421,13 +5400,13 @@ msgstr ""
 "Impossible de se connecter au serveur POP.\n"
 "Erreur lors de l'envoi du mot de passe : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:483
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Aucun dossier ╚ %s ╩."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4482,7 +5461,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Livraison du courrier via le programme sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4493,130 +5472,130 @@ msgstr ""
 "Pour livrer le courrier en vous connectant Ю un distributeur distant "
 "utilisant SMTP."
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Commande non implИmentИe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "Message d'aide"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Service pret"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "иchec de la transaction"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "Aucun mot de passe fournit."
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 #, fuzzy
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 "Impossible de se connecter au serveur POP.\n"
 "Aucun support pour le mИcanisme d'identification demandИ."
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Aucune identification requise"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 #, fuzzy
 msgid "Authentication required"
 msgstr "Aucune identification requise"
 
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Erreur du message de bienvenur : %s : sШrement pas grave"
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 "Impossible de se connecter au serveur POP.\n"
 "Aucun support pour le mИcanisme d'identification demandИ."
 
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sVeuillez entrer le mot de passe IMAP pour %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4627,232 +5606,238 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:527
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "Serveur SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Livraison du courrier SMTP via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 "Ne peut envoyer le message : l'adresse de l'expИditeur n'est pas dИfini"
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Ne peut envoyer le message : l'adresse de l'expИditeur n'est pas valide"
 
-#: camel/providers/smtp/camel-smtp-transport.c:575
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "Envoie du message"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "Ne peut envoyer le message : aucun destinataire n'est dИfini."
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:721
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:736
 #: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Identification"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Ne peut exИcuter %s : courrier non envoyИ."
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:782
+#, fuzzy
+msgid "AUTH request failed."
+msgstr "Ne peut exИcuter %s : courrier non envoyИ."
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 #, fuzzy
 msgid "Bad authentication response from server.\n"
 msgstr "Mauvaise rИponse d'identification du serveur."
 
-#: camel/providers/smtp/camel-smtp-transport.c:824
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:843
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Ne peut crИer de tube vers sendmail : %s : courrier non envoyИ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:887
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, fuzzy, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Ne peut exИcuter %s : courrier non envoyИ."
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Ne peut exИcuter %s : courrier non envoyИ."
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:952
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, fuzzy, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "sendmail s'est terminИ avec le signal %s : courrier non envoyИ."
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 octet"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u octets"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fko"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fMo"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fGo"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "piХce-jointe"
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Joindre un fichier"
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "Supprimer les ИlИments sИlectionnИs de la liste des piХces-jointes"
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Ajouter une piХce-jointe..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "Joindre un fichier au message"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
-msgid "Attachment"
-msgstr "PiХce-jointe"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "PropriИtИs de la piХce-jointe"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Nom du fichier : "
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "piХce-jointe incorporИe"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "Type MIME :"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Envoyer comme :"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
+msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:321
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "Cliquez ici pour le carnet d'adresses"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "De :"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "RИpondre-Ю :"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Sujet :"
 
-#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "ю :"
 
-#: composer/e-msg-composer-hdrs.c:384
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "Entrez les destinataires du message"
 
-#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Cc :"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Entrez les adresses qui recevront une copie carbone de ce message"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Bcc :"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4860,41 +5845,102 @@ msgstr ""
 "Entrez les adresses qui recevront une copie carbone du message sans "
 "apparaitre dans la liste des destinataires du messages."
 
-#: composer/e-msg-composer.c:528
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Joindre un fichier"
+
+#: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
+"%s"
+msgstr ""
+"Ne peut ouvrir le fichier %s :\n"
+"%s"
+
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
 "%s"
 msgstr ""
-"Ne peut ouvrir le fichier de signature %s :\n"
+"Erreur durant le prИparation vers %s :\n"
 "%s"
 
-#: composer/e-msg-composer.c:716
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: composer/e-msg-composer.c:727
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "Avertissement"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erreur de chargement du fichier : %s"
 
-#: composer/e-msg-composer.c:819
+#: composer/e-msg-composer.c:997
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: composer/e-msg-composer.c:877 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
-msgstr "Evolution"
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Erreur d'enregistrement du fichier : %s"
+
+#: composer/e-msg-composer.c:1055
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "Ne pas rИcupИrer le message du serveur POP %s : %s"
+
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"Ne peut crИer le fichier de sortie : %s\n"
+" %s"
 
-#: composer/e-msg-composer.c:883
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"Ne peut crИer le fichier de sortie : %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"Erreur lors de l'enregistrement des messages vers : %s :\n"
+" %s"
+
+#: composer/e-msg-composer.c:1173
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4904,53 +5950,35 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer vos changements ?"
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Ouvrir un fichier"
 
-#: composer/e-msg-composer.c:1034
-msgid "That file does not exist."
-msgstr "Ce fichier n'existe pas."
-
-#: composer/e-msg-composer.c:1044
-msgid "That is not a regular file."
-msgstr "Ce n'est pas un fichier normal."
-
-#: composer/e-msg-composer.c:1054
-msgid "That file exists but is not readable."
-msgstr "Ce fichier existe mais n'est pas lisible."
-
-#: composer/e-msg-composer.c:1064
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Ce fichier apparait accessible mais l'ouverture 'open(2)' a ИchouИ."
-
-#: composer/e-msg-composer.c:1086
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"Ce fichier est trИs gros (plus de 100 ko).\n"
-"йtes-vous sШr de vouloir l'insИrer ?"
-
-#: composer/e-msg-composer.c:1107
-msgid "An error occurred while reading the file."
-msgstr "Une erreur est survenue durant la lecture du fichier."
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "EnsИrer un fichier texte..."
 
-#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Composer un message"
 
-#: composer/e-msg-composer.c:1829
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "Ne peut crИer la fenЙtre de composition."
 
-#: composer/evolution-composer.c:355
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:370
+#: composer/evolution-composer.c:374
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
@@ -4970,305 +5998,126 @@ msgid "calendar information"
 msgstr "Information utilisateur"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+#, fuzzy
+msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+#, fuzzy
+msgid "%H:%M:%S"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%m/%d/%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %m/%d/%Y"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:303
 #, fuzzy
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
+#: e-util/e-time-utils.c:312
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1257
-#: widgets/misc/e-dateedit.c:1316 widgets/misc/e-dateedit.c:1495
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-#, fuzzy
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S%n"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1260
-#: widgets/misc/e-dateedit.c:1319 widgets/misc/e-dateedit.c:1498
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-#, fuzzy
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p%n"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr ""
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the Evolution executive summary component."
-msgstr "Ne peut initialiser le composant de rИsumИ de messages d'Evolution."
-
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Ne peut initialiser le composant de rИsumИ de messages d'Evolution."
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "RИcupИration du courrier depuis %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Fermer %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "DИplacer vers le dossier"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, fuzzy, c-format
-msgid "Move %s into the previous row"
-msgstr "Va Ю la date actuelle"
-
-#: executive-summary/component/e-summary-url.c:79
-#, fuzzy, c-format
-msgid "Move %s into the next row"
-msgstr "Va Ю la date actuelle"
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "_Configuration du dossier..."
-
-#: executive-summary/component/e-summary.c:924
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Ne peut ouvrir le fichier %s :\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:938
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "Erreur de lecture du fichier de courrier : %s"
-
-#: executive-summary/component/e-summary.c:956
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr ""
-
-#: executive-summary/component/main.c:62
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-#, fuzzy
-msgid "RDF Summary"
-msgstr "RИsumИ"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the test component."
-msgstr "Marque la tБche comme complИtИe"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-#, fuzzy
-msgid "Test service"
-msgstr "Ajouter un service"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "Erreur"
-
-#: executive-summary/test-service/rdf-summary.c:768
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:778
-#, fuzzy
-msgid "Update now"
-msgstr "Mettre Ю jour le calendrier"
-
-#: executive-summary/test-service/rdf-summary.c:788
-#, fuzzy
-msgid "Update every "
-msgstr "_Mettre Ю jour Libre/OccupИ"
-
-#: executive-summary/test-service/rdf-summary.c:796
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "minutes"
-
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "an"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "annИes"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "mois"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "mois"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "semaine"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "semaines"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "jours"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "heure"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "heures"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "minute"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "seconde"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "secondes"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Oups. Vous avez oubliИ de choisir une date."
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Oups. Vous avez choisi une date invalide."
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -5277,7 +6126,7 @@ msgstr ""
 "La date du message sera comparИ Ю la date d'execution\n"
 "du filtre ou lorsque le dossier virtuel est ouvert."
 
-#: filter/filter-datespec.c:298
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5285,7 +6134,7 @@ msgstr ""
 "La date du message sera comparИ Ю la date\n"
 "que vous spИcifiez ici."
 
-#: filter/filter-datespec.c:338
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5296,28 +6145,37 @@ msgstr ""
 "╚ il y a une semaine ╩, par exemple."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "la date actuelle"
 
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "une date que vous spИcifiez"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "une date relative Ю la date en cours"
 
 #. The label
-#: filter/filter-datespec.c:432
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Comparer avec"
 
-#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "maintenant"
 
-#: filter/filter-datespec.c:706
+#: filter/filter-datespec.c:575
+#, fuzzy
+msgid " ago"
+msgstr "passИ"
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr "passИ"
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<cliquez ici pour sИlectionner une date>"
 
@@ -5326,11 +6184,11 @@ msgid "Filter Rules"
 msgstr "RХgles de Filtrage"
 
 #. and now for the action area
-#: filter/filter-filter.c:453
+#: filter/filter-filter.c:452
 msgid "Then"
 msgstr "Alors"
 
-#: filter/filter-filter.c:467
+#: filter/filter-filter.c:466
 msgid "Add action"
 msgstr "Ajouter l'action"
 
@@ -5340,20 +6198,20 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "SИlectionnez un Dossier"
 
-#: filter/filter-folder.c:247
+#: filter/filter-folder.c:250
 msgid "Enter folder URI"
 msgstr "Entrez l'URI du dossier"
 
-#: filter/filter-folder.c:293
+#: filter/filter-folder.c:296
 msgid "<click here to select a folder>"
 msgstr "<cliquez ici pour sИlectionner un dossier>"
 
-#: filter/filter-input.c:194
+#: filter/filter-input.c:193
 #, fuzzy, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -5362,7 +6220,7 @@ msgstr ""
 "Erreur durant le prИparation vers %s :\n"
 "%s"
 
-#: filter/filter-part.c:475
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr "Test"
 
@@ -5374,26 +6232,45 @@ msgstr "Nom de la rХgle : "
 msgid "Untitled"
 msgstr "SansTitre"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "ExИcuter les actions"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "si tous les critХres sont remplis"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "si un des critХres est rempli"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "Ajouter un critХre"
 
+#: filter/filter-rule.c:771
+msgid "incoming"
+msgstr "entrant"
+
+#: filter/filter-rule.c:771
+msgid "outgoing"
+msgstr "sortant"
+
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Ajouter"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "иditer"
+
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "иditer les Filtres"
@@ -5436,380 +6313,521 @@ msgstr ""
 msgid "with all local folders"
 msgstr "Enregistre le dossier local"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
+#: filter/libfilter-i18n.h:3
+#, fuzzy
+msgid "Assign Color"
 msgstr "Assigner une couleur"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Assigner un score"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 #, fuzzy
 msgid "Attachments"
 msgstr "PiХce-jointe"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "contient"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copier vers le dossier"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Date de rИception"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Date d'envoi"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "SupprimИ"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "ne contient pas"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "ne fini pas avec"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "n'existe pas"
+
+#: filter/libfilter-i18n.h:16
+msgid "does not sound like"
+msgstr "ne ressemble pas"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
+msgstr "ne commence pas par"
+
+#: filter/libfilter-i18n.h:18
 #, fuzzy
 msgid "Do Not Exist"
 msgstr "n'existe pas"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:19
 #, fuzzy
 msgid "Draft"
 msgstr "Date"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:20
+msgid "ends with"
+msgstr "fini avec"
+
+#: filter/libfilter-i18n.h:21
 #, fuzzy
 msgid "Exist"
 msgstr "Quitter"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:22
+msgid "exists"
+msgstr "existe"
+
+#: filter/libfilter-i18n.h:23
 msgid "Expression"
 msgstr "Expression"
 
-#: filter/libfilter-i18n.h:14
-msgid "Forward to Address"
-msgstr "Fait suivre Ю l'adresse"
-
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:24
 msgid "Important"
 msgstr "Important"
 
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "Is Not"
-msgstr "n'est pas"
+#: filter/libfilter-i18n.h:25
+msgid "is"
+msgstr "est"
 
-#: filter/libfilter-i18n.h:17
-#, fuzzy
-msgid "Is"
-msgstr "Si"
+#: filter/libfilter-i18n.h:26
+msgid "is greater than"
+msgstr "est plus que"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:27
+msgid "is less than"
+msgstr "est moins que"
+
+#: filter/libfilter-i18n.h:28
+msgid "is not"
+msgstr "n'est pas"
+
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "Mailing list"
 msgstr "liste de diffusion %s"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Corps du message"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "En-tЙte du message"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Le message a ИtИ reГu"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Le message a ИtИ envoyИ"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "DИplacer vers le dossier"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:35
+msgid "on or after"
+msgstr "sur ou aprИs"
+
+#: filter/libfilter-i18n.h:36
+msgid "on or before"
+msgstr "sur ou avant"
+
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Lu"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Destinataires"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "RИpondu Ю"
 
-#: filter/libfilter-i18n.h:28 filter/score-rule.c:203 filter/score-rule.c:205
-#: mail/message-list.c:1052
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Score"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "ExpИditeur"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "DИfinir l'Иtat"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Taille"
+
+#: filter/libfilter-i18n.h:45
+msgid "sounds like"
+msgstr "ressemble Ю"
+
+#: filter/libfilter-i18n.h:46
 #, fuzzy
 msgid "Source Account"
 msgstr "Compte"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr "En-tЙte spИcifique"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:48
+msgid "starts with"
+msgstr "DИbute avec"
+
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "ArrЙte le traitement"
 
-#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Sujet"
 
-#: filter/libfilter-i18n.h:38
-msgid "contains"
-msgstr "contient"
+#: filter/libfilter-i18n.h:52
+msgid "was after"
+msgstr "Иtait aprИs"
 
-#: filter/libfilter-i18n.h:39
-msgid "does not contain"
-msgstr "ne contient pas"
+#: filter/libfilter-i18n.h:53
+msgid "was before"
+msgstr "Иtait avant"
 
-#: filter/libfilter-i18n.h:40
-msgid "does not end with"
-msgstr "ne fini pas avec"
+#: filter/rule-editor.c:147
+#, fuzzy
+msgid "Rules"
+msgstr "mar"
 
-#: filter/libfilter-i18n.h:41
-msgid "does not exist"
-msgstr "n'existe pas"
+#: filter/rule-editor.c:240
+msgid "Add Rule"
+msgstr "Ajouter une rХgle"
 
-#: filter/libfilter-i18n.h:42
-msgid "does not sound like"
-msgstr "ne ressemble pas"
+#: filter/rule-editor.c:299
+#, fuzzy
+msgid "Edit Rule"
+msgstr "иditer les Filtres"
 
-#: filter/libfilter-i18n.h:43
-msgid "does not start with"
-msgstr "ne commence pas par"
+#: filter/score-editor.c:130
+#, fuzzy
+msgid "Score Rules"
+msgstr "иditer la rХgle de score"
 
-#: filter/libfilter-i18n.h:44
-msgid "ends with"
-msgstr "fini avec"
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
 
-#: filter/libfilter-i18n.h:45
-msgid "exists"
-msgstr "existe"
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
+msgstr "Importer"
 
-#: filter/libfilter-i18n.h:46
-msgid "is greater than"
-msgstr "est plus que"
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+msgid "Mail"
+msgstr "Courrier"
 
-#: filter/libfilter-i18n.h:47
-msgid "is less than"
-msgstr "est moins que"
+#: importers/elm-importer.c:498
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
 
-#: filter/libfilter-i18n.h:48
-msgid "is not"
-msgstr "n'est pas"
+#: importers/elm-importer.c:527
+#, fuzzy
+msgid "Elm mail"
+msgstr "Adresse Иlec."
 
-#: filter/libfilter-i18n.h:49
-msgid "is"
-msgstr "est"
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "Ajouter un carnet d'adresses"
 
-#: filter/libfilter-i18n.h:50
-msgid "on or after"
-msgstr "sur ou aprИs"
+#: importers/evolution-gnomecard-importer.c:253
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
 
-#: filter/libfilter-i18n.h:51
-msgid "on or before"
-msgstr "sur ou avant"
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "_RИglages"
 
-#: filter/libfilter-i18n.h:52
-msgid "sounds like"
-msgstr "ressemble Ю"
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
 
-#: filter/libfilter-i18n.h:53
-msgid "starts with"
-msgstr "DИbute avec"
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
 
-#: filter/libfilter-i18n.h:54
-msgid "was after"
-msgstr "Иtait aprИs"
+#: importers/pine-importer.c:691
+#, fuzzy
+msgid "Pine mail"
+msgstr "E-mail principal"
 
-#: filter/libfilter-i18n.h:55
-msgid "was before"
-msgstr "Иtait avant"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr ""
 
-#: filter/score-editor.c:130
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
 #, fuzzy
-msgid "Score Rules"
-msgstr "иditer la rХgle de score"
+msgid "Evolution mail composer."
+msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Evolution mail executive summary component."
+msgstr "Ne peut initialiser le composant de rИsumИ de messages d'Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Evolution mail folder display component."
+msgstr "Conduit Calendrier"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Evolution mail folder factory component."
+msgstr "Conduit Calendrier"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution composer."
+msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution mail component."
+msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "Configuration de la messagerie"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "_PropriИtИs..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "PropriИtИs de la Liste 'ю Faire'"
 
-#: mail/component-factory.c:329
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr "Ne peut enregistrer le stockage avec le shell"
 
-#: mail/folder-browser-factory.c:209
+#: mail/folder-browser-ui.c:254
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "PropriИtИs"
 
-#: mail/folder-browser-factory.c:211 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
+#: mail/folder-browser-ui.c:256
 msgid "Properties"
 msgstr "PropriИtИs"
 
-#: mail/folder-browser.c:225
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Ne peut crИer de rИpertoire temporaire : %s"
+
+#: mail/folder-browser.c:893
 #, fuzzy
 msgid "Store search as vFolder"
 msgstr "SИlectionnez un Dossier"
 
-#: mail/folder-browser.c:533
-msgid "VFolder on Subject"
+#: mail/folder-browser.c:1238
+#, fuzzy
+msgid "VFolder on _Subject"
 msgstr "Dossier virtuel sur le sujet"
 
-#: mail/folder-browser.c:536
-msgid "VFolder on Sender"
-msgstr "Dossier virtuel sur l'expИditeur"
+#: mail/folder-browser.c:1241
+msgid "VFolder on Se_nder"
+msgstr "Dossier virtuel sur l'e_xpИditeur"
 
-#: mail/folder-browser.c:539
-msgid "VFolder on Recipients"
-msgstr "Dossier virtuel sur les destinataires"
+#: mail/folder-browser.c:1244
+msgid "VFolder on _Recipients"
+msgstr "Dossier virtuel sur les de_stinataires"
 
-#: mail/folder-browser.c:542 mail/folder-browser.c:733
+#: mail/folder-browser.c:1247
 #, fuzzy
-msgid "VFolder on Mailing List"
+msgid "VFolder on Mailing _List"
 msgstr "Filtre sur la liste de diffusion"
 
-#: mail/folder-browser.c:548
-msgid "Filter on Subject"
+#: mail/folder-browser.c:1253
+#, fuzzy
+msgid "Filter on Sub_ject"
 msgstr "Filtre sur le sujet"
 
-#: mail/folder-browser.c:551
-msgid "Filter on Sender"
+#: mail/folder-browser.c:1256
+#, fuzzy
+msgid "Filter on Sen_der"
 msgstr "Filtre sur l'expИditeur"
 
-#: mail/folder-browser.c:554
-msgid "Filter on Recipients"
+#: mail/folder-browser.c:1259
+#, fuzzy
+msgid "Filter on Re_cipients"
 msgstr "Filtre sur les destinataires"
 
-#: mail/folder-browser.c:557 mail/folder-browser.c:732
-msgid "Filter on Mailing List"
+#: mail/folder-browser.c:1262
+#, fuzzy
+msgid "Filter on _Mailing List"
 msgstr "Filtre sur la liste de diffusion"
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:1273
 #, fuzzy
 msgid "Resend"
 msgstr "seconde"
 
-#: mail/folder-browser.c:570
-msgid "Save As..."
-msgstr "Enregistrer sous..."
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
+msgid "_Save As..."
+msgstr "Enregistrer _sous..."
+
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+msgid "_Print"
+msgstr "_Imprimer"
 
-#: mail/folder-browser.c:577
-msgid "Reply to Sender"
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#, fuzzy
+msgid "_Reply to Sender"
 msgstr "RИpondre Ю l'expИditeur"
 
-#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:60
-msgid "Reply to All"
-msgstr "RИpondre Ю tous"
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "RИpondre Ю _tous"
 
-#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:24
-msgid "Forward"
-msgstr "Faire suivre"
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+msgid "Reply to _All"
+msgstr "RИpondre Ю _tous"
 
-#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:26
-msgid "Forward inline"
-msgstr "Faire suire incorporИ"
+#: mail/folder-browser.c:1288
+msgid "_Forward"
+msgstr "_Faire suivre"
 
-#: mail/folder-browser.c:586
-msgid "Mark as Read"
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+#, fuzzy
+msgid "Mar_k as Read"
 msgstr "Marquer comme lu"
 
-#: mail/folder-browser.c:588
-msgid "Mark as Unread"
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+#, fuzzy
+msgid "Mark as U_nread"
 msgstr "Marquer comme non lu"
 
-#: mail/folder-browser.c:593
-msgid "Move to Folder..."
-msgstr "DИplacer vers le dossier..."
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "Important"
 
-#: mail/folder-browser.c:595
-msgid "Copy to Folder..."
-msgstr "Copier vers le dossier..."
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Marquer comme non lu"
 
-#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:81
-msgid "Undelete"
-msgstr "RИcupИrer"
+#: mail/folder-browser.c:1302
+msgid "_Move to Folder..."
+msgstr "_DИplacer vers le dossier..."
+
+#: mail/folder-browser.c:1304
+msgid "_Copy to Folder..."
+msgstr "_Copier vers le dossier..."
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+msgid "_Undelete"
+msgstr "_RИcupИrer"
+
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Ajouter un carnet d'adresses"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Appliquer les filtres"
 
-#: mail/folder-browser.c:613
-msgid "Create Rule From Message"
+#: mail/folder-browser.c:1322
+#, fuzzy
+msgid "Create Ru_le From Message"
 msgstr "CrИer une rХgle Ю partir du message"
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:1479
+msgid "Filter on Mailing List"
+msgstr "Filtre sur la liste de diffusion"
+
+#: mail/folder-browser.c:1480
+#, fuzzy
+msgid "VFolder on Mailing List"
+msgstr "Filtre sur la liste de diffusion"
+
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtre sur la liste de diffusion (%s)"
 
-#: mail/folder-browser.c:736
+#: mail/folder-browser.c:1483
 #, fuzzy, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Filtre sur la liste de diffusion (%s)"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
-msgid "Evolution mail composer."
+msgid "Factory to import mbox into Evolution"
 msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Evolution mail executive summary component."
-msgstr "Ne peut initialiser le composant de rИsumИ de messages d'Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#, fuzzy
-msgid "Evolution mail folder display component."
-msgstr "Conduit Calendrier"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#, fuzzy
-msgid "Evolution mail folder factory component."
-msgstr "Conduit Calendrier"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution composer."
-msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+msgid "Imports mbox files into Evolution"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the Evolution mail component."
-msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+msgid "Imports Outlook Express 4 files into Evolution"
 msgstr ""
 
 #: mail/local-config.glade.h:1
@@ -5845,44 +6863,75 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+msgid "You have not filled in all of the required information."
+msgstr ""
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Conduit 'ю faire' d'Evolution"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
+#, fuzzy
+msgid "Evolution Account Editor"
+msgstr "Conduit 'ю faire' d'Evolution"
+
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "Signature :"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Ce message n'a pas ИtИ envoyИ.\n"
+"\n"
+"Voulez-vous enregistrer vos changements ?"
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr " (dИfaut)"
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 #, fuzzy
 msgid "Disable"
 msgstr "DИsactiver."
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
 msgstr "йtes-vous sШr de vouloir supprimer cette tБche sans titre %s ?"
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "RИcupИrer"
+
+#: mail/mail-accounts.c:271
+msgid "Really delete account?"
+msgstr ""
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 #, fuzzy
 msgid "Are you sure you want to delete this news account?"
 msgstr "йtes-vous sШr de vouloir supprimer ce rendez-vous sans titre ?"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:536
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Gestionnaire de comptes Evolution"
 
-#: mail/mail-account-editor.c:105
-msgid "You have not filled in all of the required information."
-msgstr ""
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
-#, fuzzy
-msgid "Evolution Account Editor"
-msgstr "Conduit 'ю faire' d'Evolution"
-
 #: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
@@ -5903,11 +6952,11 @@ msgstr "Courrier de %s"
 msgid "%s mailing list"
 msgstr "liste de diffusion %s"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
 msgid "Add Filter Rule"
 msgstr "Ajouter une RХgle de Filtre"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5919,7 +6968,7 @@ msgstr ""
 "recevoir ou composer des courriers.\n"
 "Voulez-vous le configurer maintenant ?"
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5927,7 +6976,7 @@ msgstr ""
 "Vous devez configurer une identitИ\n"
 "avant de pouvoir composer un message."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5935,11 +6984,11 @@ msgstr ""
 "Vous devez configurez un transport de messagerie\n"
 "avant de pouvoir composer un message."
 
-#: mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr "Vous n'avez pas dИfini de mИthode de transport de courrier"
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5947,33 +6996,46 @@ msgstr ""
 "Ce message n'a pas de sujet.\n"
 "Voulez-vous vraiment l'envoyer ?"
 
-#: mail/mail-callbacks.c:308
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 "Vous devez spИcifier des destinataires afin de pouvoir envoyer ce message."
 
-#: mail/mail-callbacks.c:351
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr "Vous devez configurer un compte avant de pouvoir envoyer ce message."
 
-#: mail/mail-callbacks.c:591
-#, c-format
-msgid "On %s, %s wrote:\n"
+#: mail/mail-callbacks.c:653
+#, fuzzy, c-format
+msgid "On %s, %s wrote:"
 msgstr "Le %s, %s a Иcrit :\n"
 
-#: mail/mail-callbacks.c:773
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Message suivi :\n"
 
-#: mail/mail-callbacks.c:876
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "DИplacez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:878
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Copiez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:1019
+#: mail/mail-callbacks.c:1374
+#, fuzzy, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr "йtes-vous sШr de vouloir supprimer la tБche ╚ %s ╩ ?"
+
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5981,7 +7043,7 @@ msgstr ""
 "Vous ne pouvez Иditer des messages que\n"
 "lorsqu'ils sont dans le dossier Brouillons."
 
-#: mail/mail-callbacks.c:1056
+#: mail/mail-callbacks.c:1430
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
@@ -5990,27 +7052,25 @@ msgstr ""
 "Vous ne pouvez Иditer des messages que\n"
 "lorsqu'ils sont dans le dossier Brouillons."
 
-#: mail/mail-callbacks.c:1089 mail/mail-display.c:90
-msgid "Overwrite file?"
-msgstr "иcraser le fichier ?"
+#: mail/mail-callbacks.c:1442
+#, fuzzy, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "йtes-vous sШr de vouloir supprimer la tБche ╚ %s ╩ ?"
 
-#: mail/mail-callbacks.c:1093 mail/mail-display.c:94
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Un fichier avec le mЙme nom existe.\n"
-"L'Иcraser ?"
+#: mail/mail-callbacks.c:1463
+#, fuzzy
+msgid "No Message Selected"
+msgstr "Le message a ИtИ reГu"
 
-#: mail/mail-callbacks.c:1137
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Enregistrer le message sous..."
 
-#: mail/mail-callbacks.c:1139
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Enregistrer les messages sous..."
 
-#: mail/mail-callbacks.c:1253
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6019,15 +7079,60 @@ msgstr ""
 "Erreur de chargement des information du filtre :\n"
 "%s"
 
-#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:51
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "_Filtres de message..."
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Imprimer le message"
 
-#: mail/mail-callbacks.c:1349
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "иchec de l'impression du message"
 
-#: mail/mail-config.c:1043 mail/mail-config.c:1046
+#: mail/mail-callbacks.c:1966
+#, fuzzy, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr "йtes-vous sШr de vouloir supprimer ce rendez-vous sans titre ?"
+
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+
+#. set window title
+#: mail/mail-config-druid.c:466
+msgid "Evolution Account Wizard"
+msgstr ""
+
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Connexion au serveur"
@@ -6043,36 +7148,66 @@ msgid " color"
 msgstr "Couleurs"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Le type spИcifiИ n'est pas supportИ dans cet entrepot"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Compte"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Information du compte"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "Gestionnaire de comptes"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Accounts"
 msgstr "Compte"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "PiХce-jointe"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Identification"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Authentication Type: "
 msgstr "Type d'identification :"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "Composer"
+
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -6085,184 +7220,300 @@ msgstr ""
 "Votre configuration de la messagerie est maintenant complИtИe.\n"
 "Cliquez sur \"Terminer\" pour enregistrer vos nouveaux paramХtres."
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "De_fault"
 msgstr "DИfaut"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Fait"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid "Drafts"
 msgstr "Date"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Drafts folder:"
 msgstr "CrИation d'un nouveau dossier"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "иditer"
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "Adresse Иlectronique :"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "DИsactivИ"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Nom complet :"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
+msgstr ""
+
+#: mail/mail-config.glade.h:42
 #, fuzzy
-msgid "Highlight citations with "
+msgid "HTML Signature:"
+msgstr "Signature :"
+
+#: mail/mail-config.glade.h:43
+#, fuzzy
+msgid "Highlight citations with"
 msgstr "Mettre en Иvidence les ИlИments s'achevant aujourd'hui"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "IdentitИ"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Inline"
+msgstr "Voir en ligne"
+
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Kerberos "
 msgstr "Kerberos 4"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "Configuration de la messagerie"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Configuration de la messagerie"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:54
 #, fuzzy
-msgid "Mark messages as \"Read\" after:"
+msgid "Mark messages as Read after"
 msgstr "Marque les messages comme vus [ms] : "
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "Serveur :"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "Nouvelles"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Optional Information"
 msgstr "Pas d'information"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organisation :"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 #, fuzzy
 msgid "PGP binary path:"
 msgstr "Encrypter avec PGP"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "Choisissez une couleur"
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Prompt when sending messages with an empty subject"
+msgstr "Adjoint un message sans sujet"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "Ne peut envoyer le message : aucun destinataire n'est dИfini."
+
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "maildir"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "Note"
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "RИception des messages"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "RИception des messages"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Receiving Options"
 msgstr "RИception des messages"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Required Information"
 msgstr "Information utilisateur"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "Secure MIME"
+msgstr "IMAPv4"
+
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Security"
+msgstr "_SИcuritИ"
+
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "Select PGP binary"
 msgstr "SИlectionner un fichier"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 #, fuzzy
 msgid "Send mail in HTML format by default."
 msgstr "Envoie le message au format HTML"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "Envoie du message"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Envoie du message"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 #, fuzzy
 msgid "Sent"
 msgstr "Vu"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Calendrier"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "Joints les messages du dossier \"%s\""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Configuration du serveur"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Type de serveur : "
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Le serveur nИcessite une identification"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Fichier de signature :"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+msgid "Source"
+msgstr "Source"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Pas d'information"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Sources"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Special Folders"
 msgstr "Dossiers Virtuels"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Type"
-msgstr "Type"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "Use secure connection (SSL)"
 msgstr "Ce serveur nИcessite une connexion sИcurisИ (SSL)"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Nom d'utilisateur :"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
@@ -6270,201 +7521,248 @@ msgid ""
 "Click \"Next\" to begin. "
 msgstr "Configuration de la messagerie Evolution"
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
-msgid "_Edit"
-msgstr "_иdition"
+#: mail/mail-config.glade.h:112
+#, fuzzy
+msgid "newswindow1"
+msgstr "fenЙtre2"
 
-#: mail/mail-config-druid.c:99
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config-druid.c:101
-msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what kind of server you use, contact your system administrator or "
-"Internet Service Provider."
-msgstr ""
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr "secondes."
 
-#: mail/mail-config-druid.c:105
-msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know which protocol you use, contact your system administrator or "
-"Internet Service Provider."
-msgstr ""
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "Ne peut crИer la boНte de dialogue"
 
-#: mail/mail-config-druid.c:107
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
-msgstr ""
+#: mail/mail-crypto.c:86
+#, fuzzy
+msgid "Could not create a PGP verification context."
+msgstr "Ne peut crИer la boНte de dialogue"
 
-#. set window title
-#: mail/mail-config-druid.c:445
-msgid "Evolution Account Wizard"
-msgstr ""
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr "Ne peut crИer la boНte de dialogue"
+
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
+msgstr "Ne peut crИer la boНte de dialogue"
+
+#: mail/mail-crypto.c:177
+#, fuzzy
+msgid "Could not create a S/MIME signature context."
+msgstr "Ne peut crИer la boНte de dialogue"
+
+#: mail/mail-crypto.c:209
+#, fuzzy
+msgid "Could not create a S/MIME certsonly context."
+msgstr "Ne peut crИer la boНte de dialogue"
+
+#: mail/mail-crypto.c:240
+#, fuzzy
+msgid "Could not create a S/MIME encryption context."
+msgstr "Ne peut crИer la boНte de dialogue"
+
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "Ne peut crИer la boНte de dialogue"
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr "Ne peut crИer la boНte de dialogue"
 
-#: mail/mail-display.c:194
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Enregistrer la piХce-jointe"
 
-#: mail/mail-display.c:234
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Ne peut crИer de rИpertoire temporaire : %s"
-
-#: mail/mail-display.c:295
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Enregistrer sur le disque..."
 
-#: mail/mail-display.c:297
-#, c-format
-msgid "Open in %s..."
-msgstr "Ouvrir dans %s..."
-
-#: mail/mail-display.c:299
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "Voir en ligne"
 
-#: mail/mail-display.c:334
-msgid "External Viewer"
-msgstr "Visualiseur externe"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "Ouvrir dans %s..."
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Voir en ligne (via %s)"
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Cacher"
 
-#: mail/mail-display.c:1102
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "Visualiseur externe"
+
+#: mail/mail-display.c:1048
 #, fuzzy
-msgid "Open link in browser"
+msgid "Loading message content"
+msgstr "Contenu de message invalide"
+
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
 msgstr "Ouvrir dans une nouvelle fenЙtre"
 
-#: mail/mail-display.c:1104
+#: mail/mail-display.c:1406
 #, fuzzy
-msgid "Save as (FIXME)"
+msgid "Copy Link Location"
+msgstr "_Contact (FIXME)"
+
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
 msgstr "_TБche (FIXME)"
 
-#: mail/mail-display.c:1106
+#: mail/mail-display.c:1410
 #, fuzzy
-msgid "Copy location (FIXME)"
-msgstr "_Contact (FIXME)"
+msgid "Save Image as..."
+msgstr "Enregistrer sous..."
+
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
 
-#: mail/mail-format.c:518
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr " %d secondes"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "piХce-jointe %s"
 
-#: mail/mail-format.c:560
+#: mail/mail-format.c:662
 #, fuzzy
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Impossible d'ouvrir le dossier : la liste des messages Иtait incomplete."
 
-#: mail/mail-format.c:742
+#: mail/mail-format.c:746
+msgid "Date"
+msgstr "Date"
+
+#: mail/mail-format.c:842
 #, fuzzy
-msgid "Loading message content"
-msgstr "Contenu de message invalide"
+msgid "Bad Address"
+msgstr "Adresse Иlectronique :"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr "De"
 
-#: mail/mail-format.c:1046
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "RИpondre-Ю :"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "ю"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Cc :"
+
+#: mail/mail-format.c:1291
+#, fuzzy
+msgid "No GPG/PGP program configured."
+msgstr "Aucun programme GPG/PGP disponible."
+
+#: mail/mail-format.c:1307
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "Nettoyer l'affichage des messages"
 
-#: mail/mail-format.c:1052
+#: mail/mail-format.c:1318
 #, fuzzy
 msgid "Encrypted message"
 msgstr "иditer le message"
 
-#: mail/mail-format.c:1053
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1137 mail/mail-format.c:1526
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1145 mail/mail-format.c:1534
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1747
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1759
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1763
+#: mail/mail-format.c:2065
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Filtre sur la liste de diffusion (%s)"
 
-#: mail/mail-format.c:1797
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Filtre sur la liste de diffusion (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1802
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:337
-#, fuzzy, c-format
-msgid "No such folder %s"
-msgstr "Aucun dossier ╚ %s ╩."
-
-#: mail/mail-local.c:509
+#: mail/mail-local.c:458
 #, fuzzy, c-format
 msgid "Opening '%s'"
 msgstr "Ouvrir dans %s..."
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Changement du dossier ╚ %s ╩ vers le format ╚ %s ╩"
 
-#: mail/mail-local.c:791
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Change de dossier ╚ %s ╩ vers le format ╚ %s ╩"
-
-#: mail/mail-local.c:815
-msgid "Reconfiguring folder"
-msgstr "Reconfiguration du dossier"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:844
-msgid "Closing current folder"
-msgstr "Fermeture du dossier en cours"
-
-#: mail/mail-local.c:876
-msgid "Renaming old folder and opening"
-msgstr "Renommage du vieus dossier et ouverture"
-
-#: mail/mail-local.c:894
-msgid "Creating new folder"
-msgstr "CrИation d'un nouveau dossier"
-
-#: mail/mail-local.c:908
-msgid "Copying messages"
-msgstr "Copie du message"
-
-#: mail/mail-local.c:925
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6473,7 +7771,7 @@ msgstr ""
 "Ne peut enregistrer les meta-info du dossier; vous n'allez probablement plus "
 "pouvoir ouvrir ce dossier : %s"
 
-#: mail/mail-local.c:964
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6481,7 +7779,16 @@ msgstr ""
 "Si vous ne pouvez plus ouvrir cette boНte aux lettres, alors\n"
 "vous aurez besoin de la rИparer manuellement."
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+msgid "You cannot change the format of a non-local folder."
+msgstr ""
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "_Configuration du dossier..."
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6490,7 +7797,7 @@ msgstr ""
 "Erreur durant ╚ %s ╩ :\n"
 "%s"
 
-#: mail/mail-mt.c:192
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6499,43 +7806,30 @@ msgstr ""
 "Erreur durant l'exИcution de l'opИration :\n"
 "%s"
 
-#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Travail en cours"
 
-#: mail/mail-mt.c:679 mail/session.c:98
-msgid "Do you accept?"
-msgstr ""
-
-#: mail/mail-mt.c:873
-#, fuzzy
-msgid "Evolution progress"
-msgstr "Evolution"
-
-#: mail/mail-ops.c:587
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "ExpИdition de ╚ %s ╩"
 
-#: mail/mail-ops.c:589
-msgid "Sending message"
-msgstr "Envoie du message"
-
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:698
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "иcriture du message %d du %d"
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:717
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "Marque le message %d du %d"
 
-#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "ComplИtИ."
 
-#: mail/mail-ops.c:811
+#: mail/mail-ops.c:805
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Joints les messages du dossier \"%s\""
@@ -6550,56 +7844,69 @@ msgstr "DИplacez le(s) message(s) vers"
 msgid "Copying messages to %s"
 msgstr "Copie du message"
 
-#: mail/mail-ops.c:900
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "DИplacement"
 
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Duplication"
 
-#: mail/mail-ops.c:978
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scrutation des dossiers dans ╚ %s ╩"
 
-#: mail/mail-ops.c:1139
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#, fuzzy
+msgid "Trash"
+msgstr "TБche"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "Messages suivis"
 
-#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ouverture du dossier %s"
 
-#: mail/mail-ops.c:1247
+#: mail/mail-ops.c:1297
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Ouverture du dossier %s"
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "Ouverture du dossier %s"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "Reconfiguration du dossier"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "Nettoyage du dossier"
 
-#: mail/mail-ops.c:1483
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "RИcupИration du message %s"
 
-#: mail/mail-ops.c:1550
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "RИcupИration des messages"
 
-#: mail/mail-ops.c:1560
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "RИcupИration du message numИro %d de %d (uid ╚ %s ╩)"
-
-#: mail/mail-ops.c:1634
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Enregistre les messages"
 
-#: mail/mail-ops.c:1713
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6608,12 +7915,7 @@ msgstr ""
 "Ne peut crИer le fichier de sortie : %s\n"
 " %s"
 
-#: mail/mail-ops.c:1726
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Enregistrement du message %d sur %d (uid ╚ %s ╩)"
-
-#: mail/mail-ops.c:1740
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6622,12 +7924,12 @@ msgstr ""
 "Erreur lors de l'enregistrement des messages vers : %s :\n"
 " %s"
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1987
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Enregistrer la piХce-jointe"
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:2003
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6636,204 +7938,204 @@ msgstr ""
 "Ne peut crИer le fichier de sortie : %s\n"
 " %s"
 
-#: mail/mail-ops.c:1857
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ne peut Иcrire les donnИes : %s"
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-ops.c:2101
+#, fuzzy, c-format
+msgid "Disconnecting from %s"
+msgstr "RИcupИration du courrier depuis %s"
+
+#: mail/mail-search.c:138
 #, fuzzy
-msgid "_Search"
-msgstr "Rechercher"
+msgid "(Untitled Message)"
+msgstr "(Sans titre)"
+
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Messages multiple"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "_иditer le message"
+
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "_иditer le message"
 
-#: mail/mail-send-recv.c:138
-msgid "Cancelling ..."
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
 msgstr ""
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-search.c:315
+#, fuzzy
+msgid "Search Forward"
+msgstr "Faire suivre"
+
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
+msgstr "Rechercher"
+
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "Chemin :"
+
+#: mail/mail-send-recv.c:141
+#, fuzzy
+msgid "Cancelling..."
+msgstr "AnnulИ."
+
+#: mail/mail-send-recv.c:250
 #, fuzzy
 msgid "Send & Receive mail"
 msgstr "RИception des messages"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 #, fuzzy
 msgid "Receiving"
 msgstr "RИception des messages"
 
-#: mail/mail-send-recv.c:285
-msgid "Updating ..."
-msgstr ""
+#: mail/mail-send-recv.c:302
+#, fuzzy
+msgid "Updating..."
+msgstr "RИglages..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
-msgid "Waiting ..."
-msgstr ""
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#, fuzzy
+msgid "Waiting..."
+msgstr "RИglages..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 #, fuzzy
 msgid "Sending"
 msgstr "ExpИdition de ╚ %s ╩"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "AnnulИ."
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
-msgstr "Message incomplИ Иcrit dans le conduit !"
+#: mail/mail-session.c:171
+#, fuzzy
+msgid "User canceled operation."
+msgstr "L'utilisateur a annulИ la requЙte"
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Ne peut crИer de mbox temporaire ╚ %s ╩ : %s"
 
-#: mail/mail-tools.c:188
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (message suivi)"
-
-#: mail/mail-tools.c:198
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (pas de sujet)"
-
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Message suivi - %s"
 
-#: mail/mail-tools.c:217
-msgid "Forwarded message (no subject)"
-msgstr "Message suivi (pas de sujet)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Messages suivis"
 
-#: mail/mail-tools.c:414
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Faire suivre le message"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "Dossiers virtuels"
 
-#: mail/mail-vfolder.c:427
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Nouveau dossier virtuel"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:59
-msgid "Reply"
-msgstr "RИpondre"
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:65
-msgid "Reply to the sender of this message"
-msgstr "RИpond Ю l'expИditeur du message"
-
-#: mail/mail-view.c:147 ui/evolution-mail.xml.h:63
-msgid "Reply to all recipients of this message"
-msgstr "RИpond Ю l'expИditeur et Ю tous les destinataires du message"
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:28
-msgid "Forward this message"
-msgstr "Fait suivre le message"
-
-#: mail/mail-view.c:154 ui/evolution-mail.xml.h:56
-msgid "Print the selected message"
-msgstr "Imprime le message sИlectionnИ"
-
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
-msgid "Delete this message"
-msgstr "Supprime le message"
-
-#: mail/message-list.c:648
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "Non vu"
 
-#: mail/message-list.c:649
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "Vu"
 
-#: mail/message-list.c:650
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "RИpondu"
 
-#: mail/message-list.c:651
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:652
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "Messages multiple"
 
-#: mail/message-list.c:656
+#: mail/message-list.c:621
 #, fuzzy
 msgid "Lowest"
 msgstr "Basse"
 
-#: mail/message-list.c:657
+#: mail/message-list.c:622
 #, fuzzy
 msgid "Lower"
 msgstr "Basse"
 
-#: mail/message-list.c:661
+#: mail/message-list.c:626
 #, fuzzy
 msgid "Higher"
 msgstr "Haute"
 
-#: mail/message-list.c:662
+#: mail/message-list.c:627
 #, fuzzy
 msgid "Highest"
 msgstr "Haute"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "Aujourd'hui %l:%M %p"
 
-#: mail/message-list.c:928
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "Hier %l:%M %p"
 
-#: mail/message-list.c:940
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1052
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Enregistre les messages"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1053
-msgid "From"
-msgstr "De"
-
-#: mail/message-list.c:1053
-msgid "Date"
-msgstr "Date"
-
-#: mail/message-list.c:1053
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "RИГu"
 
-#: mail/message-list.c:1054
-msgid "To"
-msgstr "ю"
-
-#: mail/message-list.c:1054
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "Taille"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Dossier"
 
@@ -6862,132 +8164,1455 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "DИsabonnement au dossier ╚ %s ╩"
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 #, fuzzy
 msgid "Manage Subscriptions"
 msgstr "GИrer les abonnements..."
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr ""
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
 #, fuzzy
-msgid "Folder name:"
-msgstr "Nom du fichier : "
+msgid "Factory for the Evolution executive summary component."
+msgstr "Ne peut initialiser le composant de rИsumИ de messages d'Evolution."
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: my-evolution/component-factory.c:140
 #, fuzzy
-msgid "Folder type:"
-msgstr "Type de fichier :"
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Ne peut initialiser le composant de rИsumИ de messages d'Evolution."
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
 #, fuzzy
-msgid "Specify where to create the folder:"
-msgstr "Pas suffisemment d'espace pour crИer le dossier"
+msgid "Appointments"
+msgstr "Rendez-vous"
 
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "Afficher les rendez-vous"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%I:%M%p"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%a %l:%M %p"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Aucun rИsumИ"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
 msgstr ""
 
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
+#: my-evolution/e-summary-preferences.c:869
+#, fuzzy
+msgid "Add a news feed"
+msgstr "Ajouter un serveur de news"
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: shell/importer/importer.c:341
-#, fuzzy, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr "Il n'y a pas de nouveaux messages sur %s."
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "Installation d'Evolution"
 
-#: shell/importer/importer.c:351
-msgid "Importing"
-msgstr "Importation"
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
+msgstr ""
 
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Erreur de chargement du calendrier</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "Afficher les tБches"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
 msgstr ""
 
-#: shell/importer/importer.c:372
-#, fuzzy, c-format
-msgid "Error starting %s"
-msgstr "Erreur de chargement %s"
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
 
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
-msgstr "Erreur de chargement %s"
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "Sections :"
 
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A %e %B %Y"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "иchec de l'impression du message"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "Ne peut initialiser Bonobo"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "Vider"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
 msgstr ""
 
-#: shell/importer/importer.c:473
-msgid "Automatic"
-msgstr "Automatique"
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
 
-#: shell/importer/importer.c:523
-msgid "Filename:"
-msgstr "Nom du fichier :"
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
-msgstr "SИlectionner un fichier"
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
 
-#: shell/importer/importer.c:538
-msgid "File type:"
-msgstr "Type de fichier :"
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
-msgstr "Importer"
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "Variable"
+msgstr "DИsactiver."
 
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "quatriХme"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
 msgstr ""
 
-#: shell/importer/import.glade.h:2
+#: my-evolution/metar.c:64
 #, fuzzy
-msgid "Evolution Import Utility"
-msgstr "Conduit 'ю faire' d'Evolution"
+msgid "Northeast"
+msgstr "No_tes :"
 
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
 msgstr ""
 
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "dernier"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "Sources"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "quatriХme"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "Basse"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Test"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "Basse"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
 msgstr ""
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "Afficher"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "Radio"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Heavy rain"
+msgstr "Horaires de travail"
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Drifting rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Freezing rain"
+msgstr ""
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "maintenant"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Moderate snow"
+msgstr "Mettre Ю jour le calendrier"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Drifting snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "Courrier"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+#, fuzzy
+msgid "Light hail"
+msgstr "huitiХme"
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "Afficher un dialogue"
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "E-mail principal"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "RИception des messages"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Shallow small hail"
+msgstr "Afficher tous les cachИs"
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Showers of small hail"
+msgstr "Afficher tous les cachИs"
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+msgid "Unknown precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "Erreur inconnue"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "Heure de _dИbut de la rИunion :"
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "est"
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "Portrait"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Drifting mist"
+msgstr "liste de diffusion %s"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "Ferme cette fenetre"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "Score"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "Afficher les tБches"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "Ferme cette fenetre"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "Envoyer"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "En-tЙte"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Light haze"
+msgstr "huitiХme"
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "jours"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "Aout"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Raging tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Thunderous tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "Ajouter un serveur de news"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Dossiers"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "Tout les invitИs"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Afficher les dossiers commenГant avec :"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "Options d'affichage"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "Affichage"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "Vendredi"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+#, fuzzy
+msgid "News Feeds"
+msgstr "Serveur de forums"
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "Mercredi"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "mois"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr " 1 semaine"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr "SИlectionnez un Dossier"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Afficher les tБches"
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "Show full path for folders"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "Afficher les tБches"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "TБches"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
+msgstr ""
+"\n"
+"  UnitИ :  "
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Autre"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "VИrifier les rИglages"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "Avril"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#, fuzzy
+msgid "The Evolution shell."
+msgstr "Ne peut initialiser le shell Evolution."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "DИtails"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "Annuler la rИunion"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Dossiers Virtuels"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Installation d'Evolution"
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6995,32 +9620,28 @@ msgstr ""
 "Cette nouvelle version d'Evolution a besoin d'installer des fichiers "
 "supplИmentaires dans votre rИpertoire personnel d'Evolution."
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Veuillez cliquez sur ╚ Valider ╩ pour installer les fichiers, ou ╚ Annuler ╩ "
 "pour quitter."
 
-#: shell/e-setup.c:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "Ne peut mettre Ю jour les fichiers correctement"
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr "Les fichiers d'Evolution sont correctement installИs."
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 #, fuzzy
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Il semble que c'est la premiХre fois que vous utilisez Evolution."
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Cliquez sur ╚ Valider ╩ pour installer les fichiers utilisateur d'Evolution "
 "sous"
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -7031,16 +9652,14 @@ msgstr ""
 "%s\n"
 "Erreur : %s"
 
-#: shell/e-setup.c:230
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
-msgstr ""
-"Ne peut copier les fichiers dans\n"
-"╚ %s ╩."
+msgstr "Une erreur est survenue durant la lecture du fichier."
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7051,7 +9670,16 @@ msgstr ""
 "DИplacez le afin de permettre l'installation\n"
 "des fichiers utilisateur d'Evolution."
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7062,7 +9690,58 @@ msgstr ""
 "d'Evolution. DИplacez le afin de permettre\n"
 "l'installation des fichiers utilisateur d'Evolution."
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "Ne peut obtenir le rИpertoire : %s : %s"
+
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"Ne peut copier les fichiers dans\n"
+"╚ %s ╩."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "Copier vers le dossier"
+
+#: shell/e-shell-folder-commands.c:313
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "DИplacer vers le dossier"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "Supprime la tБche"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "йtes-vous sШr de vouloir supprimer la tБche ╚ %s ╩ ?"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "Ouverture du dossier %s"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -7071,15 +9750,15 @@ msgstr ""
 "Ne peut crИer le dossier spИcifiИ :\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "Le nom de dossier spИcifiИ n'est pas valide."
 
-#: shell/e-shell-folder-creation-dialog.c:248
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - CrИez un nouveau dossier"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -7087,27 +9766,117 @@ msgstr ""
 "Le type du dossier sИlectionnИ n'est pas valide pour\n"
 "l'opИration demandИe."
 
-#: shell/e-shell-folder-selection-dialog.c:319
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Nouveau..."
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Sans titre)"
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+
+#: shell/e-shell-importer.c:352
+#, fuzzy, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr "Il n'y a pas de nouveaux messages sur %s."
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr "Importation"
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:383
+#, fuzzy, c-format
+msgid "Error starting %s"
+msgstr "Erreur de chargement %s"
+
+#: shell/e-shell-importer.c:402
+#, c-format
+msgid "Error loading %s"
+msgstr "Erreur de chargement %s"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr "Automatique"
+
+#: shell/e-shell-importer.c:538
+msgid "Filename:"
+msgstr "Nom du fichier :"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "SИlectionner un fichier"
+
+#: shell/e-shell-importer.c:553
+msgid "File type:"
+msgstr "Type de fichier :"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "SИlectionnez un Dossier"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy n'a pas ИtИ trouvИ dans votre $PATH."
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy ne peut Йtre exИcutИ."
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -7117,30 +9886,72 @@ msgstr ""
 "pour la messagerie, l'agenda, et la gestion de contacts\n"
 "Ю l'intИrieur de l'environnement de bureau Gnome."
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Aller au dossier..."
 
-#: shell/e-shell-view.c:148
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "CrИer un nouveau groupe de raccourcis"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
+msgstr "Travail en cours"
+
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+#, fuzzy
+msgid "Work Offline"
+msgstr "Travail en cours"
+
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr "(Aucun dossier affichИ)"
 
-#: shell/e-shell-view.c:1134
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1411
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1136
+#: shell/e-shell-view.c:1413
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell.c:378
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Ne peut activer l'entrepТt local -- %s"
 
-#: shell/e-shell.c:1248
+#: shell/e-shell.c:1311
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -7149,15 +9960,15 @@ msgstr ""
 "Ouups !  La vue pour ╚ %s ╩ est morte de maniХre inattendue.  :-(\n"
 "Cela signifie probablement que le composant %s a plantИ."
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "CrИer un nouveau groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Nom du groupe :"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -7166,147 +9977,271 @@ msgstr ""
 "Voulez-vous vraiment enlever le groupe\n"
 "╚ %s ╩ de la barre de raccourcis ?"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "Ne pas enlever"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "Supprime ce groupe de raccourcis"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "Supprime ce groupe de raccourcis"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "_Petites icones"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Affiche les raccourcis sous forme de petites icones"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "_Grandes icones"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Affiche les raccourcis sous forme de grandes icones"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_Nouveau groupe..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "CrИer un nouveau groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "_Supprimer ce groupe..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Supprime ce groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "_Supprimer ce groupe..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "Supprime ce groupe de raccourcis"
+
+#: shell/e-shortcuts-view.c:341
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "Afficher la barre de _raccourcis"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "Afficher la barre de _raccourcis"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "Activer"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "Supprime ce groupe de raccourcis"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "Supprime ce groupe de raccourcis"
+
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Ouvrir"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr "Ouvrir dans une nouvelle fenЙtre"
+
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Envoie le message maintenant"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
-msgstr "Active ce raccourci"
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "Nom de la rХgle : "
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "Supprime ce groupe de raccourcis"
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Supprime ce raccourci de la barre de raccourcis"
 
-#: shell/e-shortcuts.c:379
+#: shell/e-shortcuts.c:585
 msgid "Error saving shortcuts."
 msgstr "Erreur d'enregistrement des raccourcis."
 
-#: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
-msgid "_View"
-msgstr "_Vue"
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Afficher la barre de _raccourcis"
 
-#: shell/e-storage-set-view.c:649
-msgid "View the selected folder"
-msgstr "Voir le sИlecteur de dossier"
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "_Contacts"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Pas de nom)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Pas d'erreur"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Erreur gИnИrique"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "Un dossier avec le mЙme nom existe"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "Le type de dossier spИcifiИ n'est pas valide"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "Erreur d'E/S"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "Pas suffisemment d'espace pour crИer le dossier"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "Le dossier spИcifiИ n'a pas ИtИ trouvИ"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "La fonction n'est pas implИmentИ dans cet entrepot"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "Permission refusИe"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "OpИration non supportИe"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "Le type spИcifiИ n'est pas supportИ dans cet entrepot"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
+
+#: shell/e-task-widget.c:173
 #, fuzzy
-msgid "The Evolution shell."
-msgstr "Ne peut initialiser le shell Evolution."
+msgid "%s (%d%% complete)"
+msgstr "% Comp_lИtИ :"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "N'importe quel champ contient"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "HТte :"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+msgid "Folder name:"
+msgstr "Nom du fichier : "
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#, fuzzy
+msgid "Folder type:"
+msgstr "Type de fichier :"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Specify where to create the folder:"
+msgstr "Pas suffisemment d'espace pour crИer le dossier"
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+
+#: shell/importer/import.glade.h:2
+#, fuzzy
+msgid "Evolution Import Utility"
+msgstr "Conduit 'ю faire' d'Evolution"
+
+#: shell/importer/import.glade.h:3
+msgid "Evolution Importer Utility"
+msgstr ""
 
-#: shell/main.c:83
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+
+#: shell/importer/intelligent.c:191
+#, fuzzy
+msgid "Importers"
+msgstr "Importer"
+
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "Ne pas enlever"
+
+#: shell/importer/intelligent.c:199
+#, fuzzy
+msgid "Don't ask me again"
+msgstr "Ne plus afficher ce message."
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
 #, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
@@ -7333,7 +10268,7 @@ msgstr ""
 "Nous espИrons que vous apprИcierez le rИsultat de notre dur labeur,\n"
 "et nous attendons avec impatience vos contributions !\n"
 
-#: shell/main.c:108
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7341,260 +10276,336 @@ msgstr ""
 "Merci\n"
 "L'Иquipe d'Evolution\n"
 
-#: shell/main.c:139
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "Ne peut initialiser le shell Evolution."
 
-#: shell/main.c:185
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:186
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:219
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne peut initialiser le composant Bonobo"
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Copier"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
+msgstr "Copie la sИlection"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "CrИer un nouveau contact"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Supprimer le contact"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "CrИer un nouveau contact"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Rechercher"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Couper"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Rechercher un contact"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr "Coupe la sИlection"
+
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "Supprimer le contact"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Nouveau contact"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:49
-msgid "Previews the message to be printed"
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New list"
+msgstr "Nouvelles"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Coller"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "Colle le contenu du presse-papiers"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
 msgstr "Visualise le message a imprimer"
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "Imprimer les contacts"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:78
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "SИlectionner tout"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "Supprimer le contact"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "ArrЙter"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "ArrЙte le chargement"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "Tout voir"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "Voir tous les contacts"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "_Addressbook Sources..."
 msgstr "Sources du carnet d'adresses"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 #, fuzzy
 msgid "_Contact"
 msgstr "_Contacts"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "_Contacts"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "_Imprimer..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "_Rechercher des contacts"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:110
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:42
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
+msgstr "_SИlectionner tout"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_Outils"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 jours"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Modifier les prИfИrences"
+#: ui/evolution-calendar.xml.h:2
+#, fuzzy
+msgid "Configure the calendar's settings"
+msgstr "Configuration du conduit Adresses"
 
 #: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Create a new all day Event"
+msgid "Create a New All-Day _Event"
 msgstr "CrИe un nouveau calendrier"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "CrИe un nouveau rendez-vous"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "CrИe un nouveau calendrier"
+msgid "Create a new appointment"
+msgstr "CrИe un nouveau rendez-vous"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "Jour"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Go To"
 msgstr "Aller Ю"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Recule dans le temps"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Avance dans le temps"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 #, fuzzy
 msgid "Go to _Date"
 msgstr "Aller Ю la date"
 
-#: ui/evolution-calendar.xml.h:12
-#, fuzzy
-msgid "Go to _Today"
-msgstr "Aller Ю aujourd'hui"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Va Ю une date prИcise"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Va Ю la date actuelle"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "Mois"
-
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:16
 #, fuzzy
-msgid "New _Event"
-msgstr "Nouveau Ca_lendrier"
-
-#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Suivant"
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "Ouvrir un calendrier"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "PrИc"
+msgid "New Appointment"
+msgstr "Nouveau rendez-vous"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 #, fuzzy
 msgid "Previews the calendar to be printed"
 msgstr "Visualise le message a imprimer"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 #, fuzzy
 msgid "Print calendar"
 msgstr "Imprimer le Calendrier"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Imprimer ce calendrier"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Enregistrer sous"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "Information utilisateur"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "Enregistrer le calendrier comme quelquechose d'autre"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Affiche une journИe"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Affiche un mois"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Affiche une semaine"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Affiche une semaine de travail"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
-#: widgets/misc/e-dateedit.c:422
-msgid "Today"
-msgstr "Aujourd'hui"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 #, fuzzy
 msgid "W_ork Week"
 msgstr "Semaine de travail"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "Semaine"
-
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 #, fuzzy
-msgid "_Appointment"
+msgid "_Appointment..."
 msgstr "Rendez-vous"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "RИglages..."
+
+#: ui/evolution-calendar.xml.h:32
 #, fuzzy
 msgid "_Day"
 msgstr "Jour"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 #, fuzzy
 msgid "_Month"
 msgstr "Mois"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
-msgid "_New"
-msgstr "_Nouveau"
+#: ui/evolution-calendar.xml.h:37
+#, fuzzy
+msgid "_Week"
+msgstr "Semaine"
 
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "_Ouvrir un calendrier"
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Fermer"
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:106
-#: ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "Enregistrer _sous..."
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "Ferme ce rendez-vous"
 
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "Supprimer ce rendez-vous"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "Barre d'outils principale"
+
+#: ui/evolution-comp-editor.xml.h:7
 #, fuzzy
-msgid "_Week"
-msgstr "Semaine"
+msgid "Preview the printed item"
+msgstr "Visualise le message a imprimer"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Print Pre_view"
+msgstr "AperГu Avant Impression"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "Configuration de l'impression"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Imprime cet ИlИment"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "Imprimer..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "Enregistrer et Quitter"
+
+#: ui/evolution-comp-editor.xml.h:16
+#, fuzzy
+msgid "Save the appointment and close the dialog box"
+msgstr "Enregistrer le contact et fermer la boНte de dialogue"
+
+#: ui/evolution-comp-editor.xml.h:17
+msgid "Save this item to disk"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "_Actions"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "_Fichier"
 
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Supprimer cet ИlИment"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "Supprimer..."
 
@@ -7606,27 +10617,12 @@ msgstr "Aide"
 msgid "Print En_velope..."
 msgstr "Imprimer une en_veloppe..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Imprime cet ИlИment"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:57 ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Imprimer..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Enregistrer _sous..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Enregistrer et Quitter"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Enregistrer le contact et fermer la boНte de dialogue"
@@ -7644,989 +10640,1031 @@ msgstr "Voir l'aide en ligne"
 msgid "Send _message to contact..."
 msgstr "Envoie un _message au contact..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
-msgid "_File"
-msgstr "_Fichier"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Enregistrer"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "ю propos de cette application"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "Supprimer cet ИlИment"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "ю propos..."
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "Enregistrer le contact et fermer la boНte de dialogue"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "Actio_ns"
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "_Inviter d'autres personnes..."
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "Envoie un _message au contact..."
+
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "Annuler la rИunion"
+
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+msgid "Cancel the meeting for this item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "_Vider"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Forward as i_Calendar"
+msgstr "Faire suivre"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "Co_uper"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "Fait suivre le message"
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:6
 #, fuzzy
-msgid "Chec_k Names (FIXME)"
-msgstr "_TБche (FIXME)"
+msgid "Re_fresh Meeting"
+msgstr "SИlectionnez un Dossier"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "Vider"
+#: ui/evolution-event-editor.xml.h:7
+#, fuzzy
+msgid "Schedule _Meeting"
+msgstr "SИlectionnez un Dossier"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "Vide la sИlection"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#, fuzzy
+msgid "Schedule a meeting for this item"
+msgstr "SИlectionnez un Dossier"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Ferme ce rendez-vous"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "_Actions"
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "Cop_ier vers le dossier... (FIXME)"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "%s - Evolution %s"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Copier"
+#: ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "AnnulИ"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Copie la sИlection"
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "la date actuelle"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Couper"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "Composer"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Coupe la sИlection"
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Compose un nouveau message"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Supprimer ce rendez-vous"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
+#: ui/evolution-mail-global.xml.h:8
 #, fuzzy
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "Enregistrer dans le _dossier... (FIXME)"
+msgid "Empty _Trash"
+msgstr "Jours vides :"
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-#, fuzzy
-msgid "For_ward (FIXME)"
-msgstr "_TБche (FIXME)"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "Oublier les _mots de passe"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
+#: ui/evolution-mail-global.xml.h:11
 #, fuzzy
-msgid "Go to the next item"
-msgstr "Va Ю la date actuelle"
+msgid "Manage _Subscriptions..."
+msgstr "GИrer les abonnements..."
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-#, fuzzy
-msgid "Go to the previous item"
-msgstr "Va Ю la date actuelle"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
+#: ui/evolution-mail-global.xml.h:13
 #, fuzzy
-msgid "In_complete Task (FIXME)"
-msgstr "_TБche (FIXME)"
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "DИplace le message vers un nouveau dossier"
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
+#: ui/evolution-mail-global.xml.h:14
 #, fuzzy
-msgid "Modify the file's properties"
-msgstr "PropriИtИs de la Liste 'ю Faire'"
-
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "_Suivant"
+msgid "Send / Receive"
+msgstr "RИception des messages"
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Coller"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "Envoie les messages en attente et rИcupХre les nouveaux messages"
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Colle le contenu du presse-papiers"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "_PrИcИdent"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "PrИcИdent"
+#: ui/evolution-mail-global.xml.h:18
+#, fuzzy
+msgid "Virtual Folder _Editor..."
+msgstr "иditeur de dossier _virtuel..."
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
+#: ui/evolution-mail-global.xml.h:19
 #, fuzzy
-msgid "Print Pre_view"
-msgstr "AperГu Avant Impression"
+msgid "_Filters..."
+msgstr "_Filtres de message..."
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "Configuration de l'impr_ession..."
+#: ui/evolution-mail-global.xml.h:20
+#, fuzzy
+msgid "_Mail Message"
+msgstr "_Message Иlectronique (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Configuration de l'impression"
+#: ui/evolution-mail-global.xml.h:21
+#, fuzzy
+msgid "_Mail Settings..."
+msgstr "RИglages..."
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
-msgid "Save"
-msgstr "Enregistrer"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "AperГu"
 
-#: ui/evolution-event-editor.xml.h:43
+#: ui/evolution-mail-global.xml.h:23
 #, fuzzy
-msgid "Save the appointment and close the dialog box"
-msgstr "Enregistrer le contact et fermer la boНte de dialogue"
+msgid "_Send / Receive"
+msgstr "RИception des messages"
+
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
+#: ui/evolution-mail-list.xml.h:3
 #, fuzzy
-msgid "Save the current file"
-msgstr "la date actuelle"
+msgid "Copy selected messages"
+msgstr "Imprime le message sИlectionnИ"
 
-#: ui/evolution-event-editor.xml.h:46
+#: ui/evolution-mail-list.xml.h:5
 #, fuzzy
-msgid "Schedule _Meeting"
-msgstr "SИlectionnez un Dossier"
+msgid "Cut selected messages"
+msgstr "Imprime le message sИlectionnИ"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr ""
+#: ui/evolution-mail-list.xml.h:6
+#, fuzzy
+msgid "Hide S_elected Messages"
+msgstr "Imprime le message sИlectionnИ"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:68
-#: ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "SИlectionner tout"
+#: ui/evolution-mail-list.xml.h:7
+#, fuzzy
+msgid "Hide _Deleted Messages"
+msgstr "Supprimer le message"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
+#: ui/evolution-mail-list.xml.h:8
 #, fuzzy
-msgid "Select everything"
-msgstr "SИlectionnez un Dossier"
+msgid "Hide _Read Messages"
+msgstr "Message suivi - %s"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
+#: ui/evolution-mail-list.xml.h:10
 #, fuzzy
-msgid "Task _Request (FIXME)"
-msgstr "_TБche (FIXME)"
+msgid "Mark All as R_ead"
+msgstr "Marquer comme lu"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "ю _propos..."
+#: ui/evolution-mail-list.xml.h:11
+#, fuzzy
+msgid "Mark all visible messages as read"
+msgstr "Imprime le message sИlectionnИ"
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
-msgid "_Close"
-msgstr "_Fermer"
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "Colle le contenu du presse-papiers"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:28
-msgid "_Contact (FIXME)"
-msgstr "_Contact (FIXME)"
+#: ui/evolution-mail-list.xml.h:14
+#, fuzzy
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "DИplace le message vers un nouveau dossier"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_Copier"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "SИlectionnez _tout"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_DИbog"
+#: ui/evolution-mail-list.xml.h:16
+#, fuzzy
+msgid "Select _Thread"
+msgstr "SИlectionnez _tout"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
-msgid "_Help"
-msgstr "_Aide"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-#, fuzzy
-msgid "_Item (FIXME)"
-msgstr "_TБche (FIXME)"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
+#: ui/evolution-mail-list.xml.h:19
 #, fuzzy
-msgid "_Journal Entry (FIXME)"
-msgstr "_Contact (FIXME)"
+msgid "Select all visible messages"
+msgstr "Imprime le message sИlectionnИ"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
+#: ui/evolution-mail-list.xml.h:20
 #, fuzzy
-msgid "_Last Item in Folder (FIXME)"
-msgstr "Enregistrer dans le _dossier... (FIXME)"
+msgid "Show _All"
+msgstr "Afficher tout"
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-#, fuzzy
-msgid "_Mail Message (FIXME)"
-msgstr "_Message Иlectronique (FIXME)"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
+#: ui/evolution-mail-list.xml.h:22
 #, fuzzy
-msgid "_Move to Folder... (FIXME)"
-msgstr "_DИplacer vers le dossier..."
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Imprime le message sИlectionnИ"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
+#: ui/evolution-mail-list.xml.h:23
 #, fuzzy
-msgid "_Note (FIXME)"
-msgstr "_Contact (FIXME)"
+msgid "Temporarily hide the selected messages"
+msgstr "Imprime le message sИlectionnИ"
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "_Coller"
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "Liste des messages par enfilade"
 
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "_Imprimer"
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "_Nettoyer"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:102
-#: ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Dossier"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_Inverser la sИlection"
+
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Properties..."
 msgstr "_PropriИtИs..."
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "_SИlectionner tout"
-
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:41
-msgid "_Task (FIXME)"
-msgstr "_TБche (FIXME)"
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "Liste des messages par enfilade"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
+#: ui/evolution-mail-message.xml.h:1
 #, fuzzy
-msgid "_Unread Item (FIXME)"
-msgstr "_Contact (FIXME)"
+msgid "Apply filter rules to the selected messages"
+msgstr "Imprime le message sИlectionnИ"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Ajouter un service"
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "RИpond Ю l'expИditeur et Ю tous les destinataires du message"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:3
+#: ui/evolution-mail-message.xml.h:4
 #, fuzzy
-msgid "Create a new email"
-msgstr "CrИe une nouveau contact"
+msgid "Compose a reply to the sender of the selected message"
+msgstr "RИpond Ю l'expИditeur du message"
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr ""
+#: ui/evolution-mail-message.xml.h:6
+#, fuzzy
+msgid "Copy selected messages to another folder"
+msgstr "Copie le message vers un nouveau dossier"
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Nouveau courrier"
+#: ui/evolution-mail-message.xml.h:7
+#, fuzzy
+msgid "Create _Virtual Folder From Message"
+msgstr "CrИer une rХgle Ю partir du message"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:3
-msgid "Change the properties of this folder"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:4
-msgid "Compose"
-msgstr "Composer"
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
-msgstr "Compose un nouveau message"
+#: ui/evolution-mail-message.xml.h:11
+#, fuzzy
+msgid "Create a rule to filter messages with this subject"
+msgstr "Envoie un message sans sujet"
 
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail-message.xml.h:12
 #, fuzzy
-msgid "Configure Folder..."
-msgstr "_Copier vers le dossier..."
+msgid "Create a virtual folder for these recipients"
+msgstr "CrИer une rХgle Ю partir du message"
 
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
-msgstr "Copie le message vers un nouveau dossier"
+#: ui/evolution-mail-message.xml.h:13
+#, fuzzy
+msgid "Create a virtual folder for this mailing list"
+msgstr "CrИer une rХgle Ю partir du message"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail-message.xml.h:14
 #, fuzzy
-msgid "Copy selected messages to another folder"
-msgstr "Copie le message vers un nouveau dossier"
+msgid "Create a virtual folder for this sender"
+msgstr "CrИer une rХgle Ю partir du message"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail-message.xml.h:15
 #, fuzzy
-msgid "Create _Virtual Folder From Message"
+msgid "Create a virtual folder for this subject"
 msgstr "CrИer une rХgle Ю partir du message"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail-message.xml.h:17
+#, fuzzy
+msgid "Display the next important message"
+msgstr "RИpond Ю l'expИditeur du message"
+
+#: ui/evolution-mail-message.xml.h:18
 #, fuzzy
-msgid "Delete the selected messages"
+msgid "Display the next message"
+msgstr "la date actuelle"
+
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
 msgstr "Imprime le message sИlectionnИ"
 
-#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:15
-#, fuzzy
-msgid "Edit Message"
-msgstr "_иditer le message"
+#: ui/evolution-mail-message.xml.h:21
+msgid "Display the previous important message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail-message.xml.h:22
 #, fuzzy
-msgid "Edit the current message"
-msgstr "la date actuelle"
+msgid "Display the previous message"
+msgstr "Supprime le message"
 
-#: ui/evolution-mail.xml.h:17
-#, fuzzy
-msgid "Empty _Trash"
-msgstr "Jours vides :"
+#: ui/evolution-mail-message.xml.h:23
+msgid "Display the previous unread message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail-message.xml.h:24
 #, fuzzy
-msgid "Expunge"
-msgstr "_Nettoyer"
+msgid "Filter on Mailing _List..."
+msgstr "Filtre sur la liste de diffusion"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail-message.xml.h:25
 #, fuzzy
-msgid "Filter on Se_nder"
+msgid "Filter on Se_nder..."
 msgstr "Filtre sur l'expИditeur"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail-message.xml.h:26
 #, fuzzy
-msgid "Filter on _Recipients"
+msgid "Filter on _Recipients..."
 msgstr "Filtre sur les destinataires"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail-message.xml.h:27
 #, fuzzy
-msgid "Filter on _Subject"
+msgid "Filter on _Subject..."
 msgstr "Filtre sur le sujet"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Finaly remove all mails tagged for deletion"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:23
-msgid "Forget _Passwords"
-msgstr "Oublier les _mots de passe"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "Faire suivre"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail-message.xml.h:30
 #, fuzzy
 msgid "Forward As"
 msgstr "Faire suivre"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Forward the selected mail to someone"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:31
+#, fuzzy
+msgid "Forward _Attached"
+msgstr "Faire suivre"
 
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail-message.xml.h:32
 #, fuzzy
-msgid "Forward this message in-line with your mail, so you can edit it"
-msgstr "Faire suivre un message sans sujet"
+msgid "Forward _Inline"
+msgstr "Faire suire incorporИ"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail-message.xml.h:33
 #, fuzzy
-msgid "Full _Headers"
-msgstr "Rechercher complХte"
+msgid "Forward _Quoted"
+msgstr "Faire suivre"
 
-#: ui/evolution-mail.xml.h:31
+#: ui/evolution-mail-message.xml.h:34
 #, fuzzy
-msgid "Hide Deleted Messages"
-msgstr "Supprimer le message"
+msgid "Forward the selected message in the body of a new message"
+msgstr "Imprime le message sИlectionnИ"
 
-#: ui/evolution-mail.xml.h:32
+#: ui/evolution-mail-message.xml.h:35
 #, fuzzy
-msgid "Hide S_elected Messages"
+msgid "Forward the selected message quoted like a reply"
 msgstr "Imprime le message sИlectionnИ"
 
-#: ui/evolution-mail.xml.h:33
+#: ui/evolution-mail-message.xml.h:36
 #, fuzzy
-msgid "Hide _Deleted Messages"
-msgstr "Supprimer le message"
+msgid "Forward the selected message to someone"
+msgstr "DИplace le message vers un nouveau dossier"
 
-#: ui/evolution-mail.xml.h:34
+#: ui/evolution-mail-message.xml.h:37
 #, fuzzy
-msgid "Hide _Read messages"
-msgstr "Message suivi - %s"
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Imprime le message sИlectionnИ"
 
-#: ui/evolution-mail.xml.h:35
+#: ui/evolution-mail-message.xml.h:39
 #, fuzzy
-msgid "Invert Selection"
-msgstr "_Inverser la sИlection"
+msgid "Load _Images"
+msgstr "Messages suivis"
 
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail-message.xml.h:41
 #, fuzzy
-msgid "Manage _Subscriptions..."
-msgstr "GИrer les abonnements..."
+msgid "Mark as I_mportant"
+msgstr "Important"
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail-message.xml.h:43
 #, fuzzy
-msgid "Mar_k as Read"
-msgstr "Marquer comme lu"
+msgid "Mark as Unimp_ortant"
+msgstr "Marquer comme non lu"
 
-#: ui/evolution-mail.xml.h:38
+#: ui/evolution-mail-message.xml.h:44
 #, fuzzy
-msgid "Mark All as R_ead"
-msgstr "Marquer comme lu"
+msgid "Mark the selected messages as having been read"
+msgstr "Imprime le message sИlectionnИ"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail-message.xml.h:45
 #, fuzzy
-msgid "Mark As Read"
-msgstr "_Marquer comme lus"
+msgid "Mark the selected messages as important"
+msgstr "Imprime le message sИlectionnИ"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Mark As U_nread"
-msgstr "Marquer comme _non lu"
+#: ui/evolution-mail-message.xml.h:46
+msgid "Mark the selected messages as not having been read"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail-message.xml.h:47
 #, fuzzy
-msgid "Mark as U_nread"
-msgstr "Marquer comme non lu"
+msgid "Mark the selected messages as unimportant"
+msgstr "Imprime le message sИlectionnИ"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
-msgid "Mark the selected messages as having been read"
+msgid "Mark the selected messages for deletion"
 msgstr "Imprime le message sИlectionnИ"
 
-#: ui/evolution-mail.xml.h:43
-msgid "Mark the selected messages as not having been read"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "DИplacer"
 
-#: ui/evolution-mail.xml.h:45
-msgid "Move message to a new folder"
-msgstr "DИplace le message vers un nouveau dossier"
-
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Move selected messages to another folder"
 msgstr "DИplace le message vers un nouveau dossier"
 
-#: ui/evolution-mail.xml.h:47
-msgid "Open in New Window"
-msgstr "Ouvrir dans une nouvelle fenЙtre"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "Suivant"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "RИpond Ю l'expИditeur du message"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Message"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "SИlectionnez _tout"
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
-msgid "Open the current message in a new window"
+msgid "Next Unread Message"
+msgstr "Messages multiple"
+
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Open the selected message in a new window"
 msgstr "Envoie le message maintenant"
 
-#: ui/evolution-mail.xml.h:53
-msgid "Print Preview of message..."
-msgstr "AperГu avant impression du message..."
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Open the selected message in the composer to re-send it"
+msgstr "Imprime le message sИlectionnИ"
 
-#: ui/evolution-mail.xml.h:54
-msgid "Print message to the printer"
-msgstr "Imprime le message vers l'imprimante"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "Visualise le message a imprimer"
 
-#: ui/evolution-mail.xml.h:55
-msgid "Print message..."
-msgstr "Imprimer le message..."
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "PrИcИdent"
 
-#: ui/evolution-mail.xml.h:58
-msgid "Redirect (FIXME: implement me)"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Imprimer le message"
 
-#: ui/evolution-mail.xml.h:61
-msgid "Reply to _All"
-msgstr "RИpondre Ю _tous"
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Imprimer le message"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
-msgid "Reply to all"
-msgstr "RИpondre Ю tous"
+msgid "Previous Unread Message"
+msgstr "Imprimer le message"
 
-#: ui/evolution-mail.xml.h:64
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
-msgid "Reply to sender"
-msgstr "RИpondre Ю l'expИditeur"
+msgid "Print Message..."
+msgstr "Imprimer le message..."
 
-#: ui/evolution-mail.xml.h:66
-msgid "S_ource"
-msgstr "S_ource"
+#: ui/evolution-mail-message.xml.h:65
+#, fuzzy
+msgid "Print Preview..."
+msgstr "AperГu Avant Impression"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
-msgid "Save the message into a new file"
-msgstr "Enregistrer le message dans un dossier spИcifiИ"
+msgid "Print this message"
+msgstr "Imprimer le message"
 
-#: ui/evolution-mail.xml.h:69 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "SИlectionnez _tout"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "RИpondre"
+
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "RИpondre Ю tous"
 
-#: ui/evolution-mail.xml.h:70
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
-msgid "Select _Thread"
-msgstr "SИlectionnez _tout"
+msgid "S_earch Message"
+msgstr "Enregistrer le message sous..."
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail-message.xml.h:72
 #, fuzzy
-msgid "Send / Receive"
-msgstr "RИception des messages"
+msgid "Save the message as a text file"
+msgstr "Enregistrer le message dans un dossier spИcifiИ"
 
-#: ui/evolution-mail.xml.h:72
-msgid "Send a reply to the person who sent you this mail"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:73
-msgid "Send a single mail in reply to all the selected mail"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:74
+#, fuzzy
+msgid "Show Email _Source"
+msgstr "Source de courrier"
 
-#: ui/evolution-mail.xml.h:74
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
-msgstr "Envoie les messages en attente et rИcupХre les nouveaux messages"
+msgid "Show Full _Headers"
+msgstr "Rechercher complХte"
 
-#: ui/evolution-mail.xml.h:76
-msgid "Send queued mail and retrieve new mail"
-msgstr "Envoie les messages en attente et rИcupХre les nouveaux messages"
+#: ui/evolution-mail-message.xml.h:76
+#, fuzzy
+msgid "Show message in the normal style"
+msgstr "Envoie les messages au format HTML"
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
-msgid "Show _All"
-msgstr "Afficher tout"
+msgid "Show message with all email headers"
+msgstr "Marquage des messages du dossier \"%s\""
 
-#: ui/evolution-mail.xml.h:79
-msgid "Threaded Message list"
-msgstr "Liste des messages par enfilade"
+#: ui/evolution-mail-message.xml.h:78
+#, fuzzy
+msgid "Show the raw email source of the message"
+msgstr "Joindre un fichier au message"
 
-#: ui/evolution-mail.xml.h:80
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Imprime le message sИlectionnИ"
 
-#: ui/evolution-mail.xml.h:82
-msgid "VFolder on Se_nder"
+#: ui/evolution-mail-message.xml.h:80
+#, fuzzy
+msgid "VFolder on Mailing _List..."
+msgstr "Filtre sur la liste de diffusion"
+
+#: ui/evolution-mail-message.xml.h:81
+#, fuzzy
+msgid "VFolder on Se_nder..."
 msgstr "Dossier virtuel sur l'e_xpИditeur"
 
-#: ui/evolution-mail.xml.h:83
-msgid "VFolder on _Recipients"
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "VFolder on _Recipients..."
 msgstr "Dossier virtuel sur les de_stinataires"
 
-#: ui/evolution-mail.xml.h:84
+#: ui/evolution-mail-message.xml.h:83
 #, fuzzy
-msgid "VFolder on _Subject"
+msgid "VFolder on _Subject..."
 msgstr "Dossier virtuel sur le sujet"
 
-#: ui/evolution-mail.xml.h:85
-msgid "View Raw Message Source"
-msgstr "Voir la source brut du message"
-
-#: ui/evolution-mail.xml.h:86
-#, fuzzy
-msgid "Virtual Folder _Editor..."
-msgstr "иditeur de dossier _virtuel..."
-
-#: ui/evolution-mail.xml.h:87
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_Appliquer les filtres"
 
-#: ui/evolution-mail.xml.h:88
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
-msgid "_Attachment"
-msgstr "PiХce-jointe"
-
-#: ui/evolution-mail.xml.h:89
-msgid "_Copy to Folder..."
-msgstr "_Copier vers le dossier..."
+msgid "_Copy to Folder"
+msgstr "Copier vers le dossier"
 
-#: ui/evolution-mail.xml.h:90
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "_Create Filter From Message"
 msgstr "CrИer une rХgle Ю partir du message"
 
-#: ui/evolution-mail.xml.h:92
-msgid "_Expunge"
-msgstr "_Nettoyer"
-
-#: ui/evolution-mail.xml.h:93
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
-msgid "_Filters..."
-msgstr "_Filtres de message..."
+msgid "_Forward Message"
+msgstr "Faire suivre le message"
 
-#: ui/evolution-mail.xml.h:94 ui/evolution.xml.h:31
-msgid "_Folder"
-msgstr "_Dossier"
-
-#: ui/evolution-mail.xml.h:95
-msgid "_Forward"
-msgstr "_Faire suivre"
-
-#: ui/evolution-mail.xml.h:96
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
-msgid "_Inline"
-msgstr "Voir en ligne"
-
-#: ui/evolution-mail.xml.h:97 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Inverser la sИlection"
+msgid "_Message Display"
+msgstr "Nettoyer l'affichage des messages"
 
-#: ui/evolution-mail.xml.h:98
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
-msgid "_Mail Message"
-msgstr "_Message Иlectronique (FIXME)"
+msgid "_Move to Folder"
+msgstr "DИplacer vers le dossier"
 
-#: ui/evolution-mail.xml.h:99
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
-msgid "_Mail Settings..."
-msgstr "RИglages..."
+msgid "_Normal Display"
+msgstr "_Affichage"
 
-#: ui/evolution-mail.xml.h:100
-msgid "_Move to Folder..."
-msgstr "_DИplacer vers le dossier..."
-
-#: ui/evolution-mail.xml.h:101
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
-msgid "_Open Selected Items"
-msgstr "Ouvrir la tБche"
+msgid "_Open Message"
+msgstr "_иditer le message"
 
-#: ui/evolution-mail.xml.h:103
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
-msgid "_Quoted"
-msgstr "Note"
+msgid "_Re-send Message"
+msgstr "_иditer le message"
 
-#: ui/evolution-mail.xml.h:104
-#, fuzzy
-msgid "_Reply"
-msgstr "RИpondre"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Ferme cette fenetre"
 
-#: ui/evolution-mail.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
 #, fuzzy
-msgid "_Resend Messages"
-msgstr "_иditer le message"
+msgid "Customi_ze Toolbars..."
+msgstr "Personnaliser la barre d'outils"
 
-#: ui/evolution-mail.xml.h:107
-msgid "_Save Message As..."
-msgstr "_Enregistrer le message sous..."
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "Personnaliser"
 
-#: ui/evolution-mail.xml.h:108
-#, fuzzy
-msgid "_Send / Receive"
-msgstr "RИception des messages"
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "Personnaliser la barre d'outils"
 
-#: ui/evolution-mail.xml.h:109
-msgid "_Threaded"
-msgstr "_Enfiler"
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "_Fermer"
 
-#: ui/evolution-mail.xml.h:111
-msgid "_Undelete"
-msgstr "_RИcupИrer"
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "_Vue"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Joindre"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Ferme le fichier en cours"
 
 #: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Delete all but signature"
+msgstr "SИlectionner un fichier de signature"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Encrypter le message avec PGP"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "F_ormat"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "EnsИrer un fichier texte..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "InsХre un fichier comme texte dans le message"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "EnsИrer un fichier texte..."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Ouvrir un fichier"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "Encrypter avec PGP"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "Signer avec PGP"
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "Enregistrer le _brouillon"
+#, fuzzy
+msgid "S/MIME Encrypt"
+msgstr "Encrypter avec PGP"
 
 #: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Enregistrer dans le _dossier... (FIXME)"
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "Enregistrer"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Enregistrer sous"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr "Enregistrer le _brouillon"
+
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Enregistrer dans le dossier..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+#, fuzzy
+msgid "Save the current file"
+msgstr "la date actuelle"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Enregistrer le fichier en cours avec un nom diffИrent"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Enregistrer le message dans un dossier spИcifiИ"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Envoyer"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Envoyer plus _tard"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Envoyer plus _tard"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Envoie le message au format HTML"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Envoie le message plus tard"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Envoie le message maintenant"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Envoyer ce message maintenant"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Afficher / Cacher les piХces-jointes"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Afficher les _piХces-jointes"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Afficher les piХces-jointes"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "Signer ce message avec votre clИ PGP"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Signer ce message avec votre clИ PGP"
+
+#: ui/evolution-message-composer.xml.h:38
 #, fuzzy
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Commute l'affichage de la barre de dossiers"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 #, fuzzy
 msgid "Toggles whether the CC field is displayed"
 msgstr "Commute l'affichage de la barre de dossiers"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 #, fuzzy
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Commute l'affichage de la barre de dossiers"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "PiХce-jointe"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "_DИbog"
+
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Delete all"
+msgstr "_Supprimer"
+
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Insertion"
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
-msgstr "_InsИrer un fichier texte... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Ouvrir..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 #, fuzzy
 msgid "_Reply-To Field"
 msgstr "RИpondre-Ю :"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "_SИcuritИ"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "_Aide"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Ajouter le dossier Ю votre liste de dossier abonnИs"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "D_ossier"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "RafraНchir la liste"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "RafraНchi la liste de dossiers"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Supprimer le dossier de votre liste de dossier abonnИs"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "S'abonner"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Se dИsabonner"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
+#: ui/evolution-task-editor.xml.h:1
 #, fuzzy
-msgid "Assig_n Task (FIXME)"
-msgstr "_TБche (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Refaire"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-#, fuzzy
-msgid "Redo the undone action"
-msgstr "Supprimer l'action"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Remplacer"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Remplace une chaНne"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-#, fuzzy
-msgid "Reply to A_ll (FIXME)"
-msgstr "RИpondre Ю tous"
+msgid "Cancel Task"
+msgstr "TБche"
 
-#: ui/evolution-task-editor-dialog.xml.h:48
+#: ui/evolution-task-editor.xml.h:3
 #, fuzzy
-msgid "S_end Status Report (FIXME)"
-msgstr "_Contact (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr ""
+msgid "Delegate Task"
+msgstr "Supprime la tБche"
 
-#: ui/evolution-task-editor-dialog.xml.h:54
+#: ui/evolution-task-editor.xml.h:7
 #, fuzzy
-msgid "Save the task and close the dialog box"
-msgstr "Enregistrer le contact et fermer la boНte de dialogue"
+msgid "Re_fresh Task"
+msgstr "RafraНchir la liste"
 
-#: ui/evolution-task-editor-dialog.xml.h:55
+#: ui/evolution-tasks.xml.h:2
 #, fuzzy
-msgid "Search again for the same string"
-msgstr "_Rechercher des contacts"
+msgid "Configure the task view's settings"
+msgstr "Configuration du conduit Adresses"
 
-#: ui/evolution-task-editor-dialog.xml.h:56
+#: ui/evolution-tasks.xml.h:3
 #, fuzzy
-msgid "Search for a string"
-msgstr "_Rechercher des contacts"
+msgid "Copy selected task"
+msgstr "Ouvrir la tБche"
 
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "DИfaire"
+#: ui/evolution-tasks.xml.h:4
+msgid "Create a new task"
+msgstr "CrИe une nouvelle tache"
 
-#: ui/evolution-task-editor-dialog.xml.h:62
+#: ui/evolution-tasks.xml.h:5
 #, fuzzy
-msgid "Undo the last action"
-msgstr "Supprimer l'action"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
-msgid "_Appointment (FIXME)"
-msgstr "_Rendez-vous (FIXME)"
+msgid "Cut selected task"
+msgstr "Supprime la tБche"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
-msgid "_Mark Complete (FIXME)"
-msgstr "Marquer comme terminИe"
-
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "_RИpondre (FIXME)"
-
-#: ui/evolution-tasks.xml.h:2
-msgid "Create a new task"
-msgstr "CrИe une nouvelle tache"
+msgid "Delete selected tasks"
+msgstr "Supprime la tБche"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:8
 #, fuzzy
 msgid "New Task"
 msgstr "TБche"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "Colle le contenu du presse-papiers"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Enregistrer la tache comme quelquechose d'autre"
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "PrИfИrences des taches..."
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "RИglages..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 #, fuzzy
 msgid "_Task"
 msgstr "TБche"
@@ -8635,244 +11673,367 @@ msgstr "TБche"
 msgid "About Evolution..."
 msgstr "ю propos d'Evolution..."
 
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Ferme cette fenetre"
-
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:2
 #, fuzzy
-msgid "Customi_ze Toolbars..."
-msgstr "Personnaliser la barre d'outils"
+msgid "Add to _Shortcut Bar"
+msgstr "Afficher la barre de _raccourcis"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Personnaliser"
+#: ui/evolution.xml.h:3
+msgid "Change the name of this folder"
+msgstr ""
 
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Personnaliser la barre d'outils"
+#, fuzzy
+msgid "Copy this folder"
+msgstr "Copier vers le dossier"
 
 #: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "_CrИer un nouveau dossier..."
+
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "Supprime ce raccourci de la barre de raccourcis"
+
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "CrИation d'un nouveau dossier"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "Supprimer cet ИlИment"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Afficher un dossier diffИrent"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_Quitter"
 
-#: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
-msgstr "Barre de _raccourcis d'Evolution"
+#: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:17
+#, fuzzy
+msgid "Evolution _Window"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Quitte le programme"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "PrЙt Ю _dИmarrer"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Importer un format de fichier externe"
 
-#: ui/evolution.xml.h:13
-msgid "Main toolbar"
-msgstr "Barre d'outils principale"
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "DИplace le message vers un nouveau dossier"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Open in New _Window"
+msgstr "Ouvrir dans une nouvelle fenЙtre"
+
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Open this folder in an other window"
+msgstr "Envoie le message maintenant"
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Afficher les informations concernant Evolution"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Transmettre un rapport d'anomalies"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "_Transmettre un rapport d'anomalies"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "Transmets un rapport d'anomalies en utilisant Bug Buddy."
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:30
+msgid "Toggle"
+msgstr ""
+
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Commute l'affichage de la barre de dossiers"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Commute l'affichage de la barre de raccourcis"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "Toggle whether we are working offline."
+msgstr "Commute l'affichage de la barre de dossiers"
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "Utilisation du gestionnaire de c_ontact"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "Utilisation du _calendrier"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "Utilisation de la _messagerie"
 
-#: ui/evolution.xml.h:23
-#, fuzzy
-msgid "Work Offline"
-msgstr "Travail en cours"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr "Voir le sИlecteur de dossier"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "ю _propos d'Evolution..."
 
-#: ui/evolution.xml.h:25
-msgid "_Actions"
-msgstr "_Actions"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "_Rendez-vous (FIXME)"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "_Contact (FIXME)"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Copier"
+
+#: ui/evolution.xml.h:49
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_Dossier"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Aller au dossier..."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "_Importer un fichier..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "_Index"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:54
 #, fuzzy
 msgid "_Mail message"
 msgstr "_Message Иlectronique (FIXME)"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "DИplacer"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Nouveau"
+
+#: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_New Folder"
 msgstr "Nouveau dossier virtuel"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Remplacer..."
+
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "Afficher la barre de _raccourcis"
+
+#: ui/evolution.xml.h:60
 #, fuzzy
 msgid "_Shortcut Bar"
 msgstr "Afficher la barre de _raccourcis"
 
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "_TБche (FIXME)"
+
+#: ui/evolution.xml.h:64
+#, fuzzy
+msgid "_Work Offline"
+msgstr "Travail en cours"
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "RИglages..."
+
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "Address Cards"
+msgstr "Adresse"
+
+#: views/addressbook/galview.xml.h:2
+#, fuzzy
+msgid "By Company"
+msgstr "SociИtИ"
+
+#: views/addressbook/galview.xml.h:3
+#, fuzzy
+msgid "Phone List"
+msgstr "Types de tИlИphones"
+
+#: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "By Sender"
+msgstr "ExpИditeur"
+
+#: views/mail/galview.xml.h:2
+#, fuzzy
+msgid "By Status"
+msgstr "иtat"
+
+#: views/mail/galview.xml.h:3
+#, fuzzy
+msgid "By Subject"
+msgstr "Sujet"
+
+#: views/mail/galview.xml.h:4
+#, fuzzy
+msgid "Messages"
+msgstr "Message"
+
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With Category"
+msgstr "CatИgorie :"
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
-msgid "Tentative"
-msgstr "Essai"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "OccupИ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "Hors du bureau"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr "Pas d'information"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr "_Inviter d'autres personnes..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 msgid "_Options"
 msgstr "_Options"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
 msgstr "Afficher _seulement les heures de travail"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr "Afficher _ZommИ arriХre"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
 msgstr "_Mettre Ю jour Libre/OccupИ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
 msgstr "_Choix automatique"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
 msgstr "_Toutes les personnes et ressources"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr "Toute les _personnes et une ressource"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
 msgstr "Personnes _nИcessaires"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
 msgstr "Personnes nИcessaires et _une ressource"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 msgid "Meeting _start time:"
 msgstr "Heure de _dИbut de la rИunion :"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 msgid "Meeting _end time:"
 msgstr "Heure de _fin de la rИunion :"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
 msgstr "Tout les invitИs"
 
-#: widgets/menus/gal-view-menus.c:177
+#: widgets/menus/gal-view-menus.c:218
 #, fuzzy
 msgid "_Current View"
 msgstr "la date actuelle"
 
-#: widgets/menus/gal-view-menus.c:196
+#: widgets/menus/gal-view-menus.c:259
 msgid "Define Views"
 msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "LMMJVSD"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Maintenant"
 
-#: widgets/misc/e-cell-date-edit.c:242
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Aujourd'hui"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:723
+#: widgets/misc/e-cell-date-edit.c:731
 #, fuzzy, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -8880,23 +12041,109 @@ msgstr ""
 "\n"
 "%s"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+#, fuzzy
+msgid "Chinese"
+msgstr "Changer"
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "semaine"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "TБche"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "Optionnel"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+msgid "New"
+msgstr "Nouveau"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Erreur inconnue : %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "Autre"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
+#: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "иditeur de contacts"
+
+#: widgets/misc/e-filter-bar.c:173
 #, fuzzy
 msgid "Save Search"
 msgstr "Rechercher"
 
-#: widgets/misc/e-filter-bar.c:237
+#: widgets/misc/e-filter-bar.c:241
 #, fuzzy
 msgid "Advanced Search"
 msgstr "AvancИe"
 
-#: widgets/misc/e-filter-bar.c:317
-#, fuzzy
-msgid "Advanced ..."
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "Afficher tout"
+
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
 msgstr "AvancИe..."
 
 #: widgets/misc/e-messagebox.c:152
@@ -8907,6 +12154,10 @@ msgstr "Information"
 msgid "Warning"
 msgstr "Avertissement"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Erreur"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Question"
@@ -8920,72 +12171,634 @@ msgstr "Message"
 msgid "Don't show this message again."
 msgstr "Ne plus afficher ce message."
 
-#: widgets/misc/e-search-bar.c:148
+#: widgets/misc/e-search-bar.c:155
 msgid "Sear_ch"
 msgstr "Recher_cher"
 
-#: views/addressbook/galview.xml.h:1
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
+msgid "The Personal Addressbook Server"
+msgstr ""
+
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
+msgid "The Personal Calendar Server; calendar factory"
+msgstr ""
+
+#: wombat/wombat.c:173
 #, fuzzy
-msgid "Adress Cards"
-msgstr "Adresse"
+msgid "setup_vfs(): could not initialize GNOME-VFS"
+msgstr "Ne peut initialiser GNOME"
 
-#: views/addressbook/galview.xml.h:2
+#: wombat/wombat.c:185
 #, fuzzy
-msgid "By Company"
-msgstr "SociИtИ"
+msgid "init_corba(): could not initialize GNOME"
+msgstr "Ne peut initialiser GNOME"
 
-#: views/addressbook/galview.xml.h:3
+#: wombat/wombat.c:198
 #, fuzzy
-msgid "Phone List"
-msgstr "Types de tИlИphones"
+msgid "init_bonobo(): could not initialize Bonobo"
+msgstr "Ne peut initialiser Bonobo"
 
-#: views/mail/galview.xml.h:1
 #, fuzzy
-msgid "By Sender"
-msgstr "ExpИditeur"
+#~ msgid "Set task view preferences"
+#~ msgstr "Modifier les prИfИrences"
 
-#: views/mail/galview.xml.h:2
 #, fuzzy
-msgid "By Status"
-msgstr "иtat"
+#~ msgid "TasksPreferences"
+#~ msgstr "PrИfИrences des taches..."
+
+#~ msgid "C_ontacts..."
+#~ msgstr "C_ontacts..."
+
+#~ msgid "_Company:"
+#~ msgstr "So_ciИtИ :"
+
+#~ msgid "As _Minicards"
+#~ msgstr "Comme _minicartes"
+
+#~ msgid "As _Table"
+#~ msgstr "Comme _tableau"
+
+#~ msgid ""
+#~ "We were unable to open this addressbook.  This either\n"
+#~ "means you have entered an incorrect URI, or have tried\n"
+#~ "to access an LDAP server and don't have LDAP support\n"
+#~ "compiled in.  If you've entered a URI, check the URI for\n"
+#~ "correctness and reenter.  If not, you probably have\n"
+#~ "attempted to access an LDAP server.  If you wish to be\n"
+#~ "able to use LDAP, you'll need to download and install\n"
+#~ "OpenLDAP and recompile and install Evolution.\n"
+#~ msgstr ""
+#~ "Il nous est impossible d'ouvrir ce carnet d'adresses. Soit\n"
+#~ "parce que vous avez entrez une URI incorrecte, soit\n"
+#~ "parce que vous avez essayer d'accИder Ю un serveur LDAP\n"
+#~ "et que le support LDAP n'a pas ИtИ compilИ. Si vous avez\n"
+#~ "entrИ une URI, vИrifiez sa validitИ et rИentrez la. Sinon\n"
+#~ "vous essayer probablement d'accИder Ю un serveur LDAP,\n"
+#~ "vous devriez tИlИcharger et installer OpenLDAP, puis\n"
+#~ "recompiler et installer Evolution.\n"
+
+#~ msgid "SASL"
+#~ msgstr "SASL"
+
+#~ msgid "Find..."
+#~ msgstr "Rechercher..."
+
+#~ msgid "Open calendar"
+#~ msgstr "Ouvrir le calendrier"
+
+#~ msgid "Save calendar"
+#~ msgstr "Enregistrer le calendrier"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>Erreur de chargement du calendrier :<br>MИthode non supportИe"
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "Expiration des alarmes aprХs"
+
+#~ msgid "Colors"
+#~ msgstr "Couleurs"
+
+#~ msgid "Enable snoozing for"
+#~ msgstr "Activer la sonnerie pour"
+
+#~ msgid "Highlight"
+#~ msgstr "Mettre en Иvidence"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "иlИments expirant aujourd'hui : "
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "иlИments pas encore expirИs"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "иlИments pas encore expirИs :"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "иlИments en retard :"
+
+#~ msgid "TaskPad"
+#~ msgstr "TБchePad"
+
+#~ msgid "Time Until Due"
+#~ msgstr "DurИe avant ИchИance"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Alarmes visuelles"
+
+#~ msgid "Work week"
+#~ msgstr "Semaine de travail"
+
+#~ msgid "Edit Task"
+#~ msgstr "иditer la tБche"
 
-#: views/mail/galview.xml.h:3
 #, fuzzy
-msgid "By Subject"
-msgstr "Sujet"
+#~ msgid "Percent complete"
+#~ msgstr "Marque la tБche comme complИtИe"
+
+#~ msgid "Mark the task complete"
+#~ msgstr "Marque la tБche comme complИtИe"
+
+#~ msgid "Edit this task..."
+#~ msgstr "иditer cette tБche..."
+
+#~ msgid "Edit the task"
+#~ msgstr "иdite la tБche"
 
-#: views/mail/galview.xml.h:4
 #, fuzzy
-msgid "Messages"
-msgstr "Message"
+#~ msgid "Go to Today"
+#~ msgstr "Aller Ю aujourd'hui"
 
-#: views/tasks/galview.xml.h:2
 #, fuzzy
-msgid "With Category"
-msgstr "CatИgorie :"
+#~ msgid "Schedule Meeting"
+#~ msgstr "SИlectionnez un Dossier"
 
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr ""
+#, fuzzy
+#~ msgid "Delete all Occurrences"
+#~ msgstr "Supprimer toutes les occurences"
 
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr ""
+#, fuzzy
+#~ msgid "Component successfully updated."
+#~ msgstr "Les fichiers d'Evolution sont correctement installИs."
+
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "Je ne peut charger votre fichier de calendrier !\n"
+
+#~ msgid "I couldn't read your calendar file!\n"
+#~ msgstr "Je ne peut lire votre fichier de calendrier !\n"
 
-#: wombat/wombat.c:173
 #, fuzzy
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "Ne peut initialiser GNOME"
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "Ne peut crИer un calendrier dans `%s'"
 
-#: wombat/wombat.c:185
 #, fuzzy
-msgid "init_corba(): could not initialize GNOME"
-msgstr "Ne peut initialiser GNOME"
+#~ msgid "Component successfully deleted."
+#~ msgstr "Les fichiers d'Evolution sont correctement installИs."
+
+#~ msgid "Add to Calendar"
+#~ msgstr "Ajouter au calendrier"
 
-#: wombat/wombat.c:198
 #, fuzzy
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "Ne peut initialiser Bonobo"
+#~ msgid " Tentative "
+#~ msgstr "Essai"
+
+#~ msgid "Update Calendar"
+#~ msgstr "Mettre Ю jour le calendrier"
+
+#, fuzzy
+#~ msgid "Attendee address"
+#~ msgstr "Tout les invitИs"
+
+#, fuzzy
+#~ msgid "Attendees: "
+#~ msgstr "Tout les invitИs"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr "Annuler la rИunion"
+
+#, fuzzy
+#~ msgid "Organizer: "
+#~ msgstr "Organisation :"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "Rendez-vous ИlИmentaires"
+
+#~ msgid "_Starting date:"
+#~ msgstr "Date de _dИbut :"
+
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "Ne peut tester le fichier de verrouillage pour %s : %s"
+
+#, fuzzy
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Scrutation des dossiers dans ╚ %s ╩"
+
+#, fuzzy
+#~ msgid "%s is not a selectable folder"
+#~ msgstr "Voir le sИlecteur de dossier"
+
+#~ msgid "Inline attachment"
+#~ msgstr "piХce-jointe incorporИe"
+
+#~ msgid "Send as:"
+#~ msgstr "Envoyer comme :"
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ne peut ouvrir le fichier de signature %s :\n"
+#~ "%s"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "Ce n'est pas un fichier normal."
+
+#~ msgid "That file exists but is not readable."
+#~ msgstr "Ce fichier existe mais n'est pas lisible."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "Ce fichier apparait accessible mais l'ouverture 'open(2)' a ИchouИ."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "Ce fichier est trИs gros (plus de 100 ko).\n"
+#~ "йtes-vous sШr de vouloir l'insИrer ?"
+
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr "%I:%M:%S %p%n"
+
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#, fuzzy
+#~ msgid "Send an email to %s"
+#~ msgstr "RИcupИration du courrier depuis %s"
+
+#~ msgid "Close %s"
+#~ msgstr "Fermer %s"
+
+#, fuzzy
+#~ msgid "Move %s to the left"
+#~ msgstr "DИplacer vers le dossier"
+
+#, fuzzy
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Va Ю la date actuelle"
+
+#, fuzzy
+#~ msgid "Move %s into the next row"
+#~ msgstr "Va Ю la date actuelle"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ne peut ouvrir le fichier %s :\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "RИsumИ"
+
+#, fuzzy
+#~ msgid "Factory for the test component."
+#~ msgstr "Marque la tБche comme complИtИe"
+
+#, fuzzy
+#~ msgid "Test service"
+#~ msgstr "Ajouter un service"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Fait suivre Ю l'adresse"
+
+#, fuzzy
+#~ msgid "Is Not"
+#~ msgstr "n'est pas"
+
+#, fuzzy
+#~ msgid "Is"
+#~ msgstr "Si"
+
+#~ msgid "VFolder on Subject"
+#~ msgstr "Dossier virtuel sur le sujet"
+
+#~ msgid "VFolder on Sender"
+#~ msgstr "Dossier virtuel sur l'expИditeur"
+
+#~ msgid "VFolder on Recipients"
+#~ msgstr "Dossier virtuel sur les destinataires"
+
+#~ msgid "Mark as Read"
+#~ msgstr "Marquer comme lu"
+
+#~ msgid "Move to Folder..."
+#~ msgstr "DИplacer vers le dossier..."
+
+#~ msgid "Copy to Folder..."
+#~ msgstr "Copier vers le dossier..."
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "Change de dossier ╚ %s ╩ vers le format ╚ %s ╩"
+
+#~ msgid "Closing current folder"
+#~ msgstr "Fermeture du dossier en cours"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Renommage du vieus dossier et ouverture"
+
+#~ msgid "Copying messages"
+#~ msgstr "Copie du message"
+
+#, fuzzy
+#~ msgid "Evolution progress"
+#~ msgstr "Evolution"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "RИcupИration du message numИro %d de %d (uid ╚ %s ╩)"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Enregistrement du message %d sur %d (uid ╚ %s ╩)"
+
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "Message incomplИ Иcrit dans le conduit !"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (message suivi)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Fwd: (pas de sujet)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Message suivi (pas de sujet)"
+
+#~ msgid "Print the selected message"
+#~ msgstr "Imprime le message sИlectionnИ"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Les fichiers d'Evolution sont correctement installИs."
+
+#~ msgid "Activate"
+#~ msgstr "Activer"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "Active ce raccourci"
+
+#~ msgid "Find a contact"
+#~ msgstr "Rechercher un contact"
+
+#~ msgid "View All"
+#~ msgstr "Tout voir"
+
+#~ msgid "View all contacts"
+#~ msgstr "Voir tous les contacts"
+
+#~ msgid "5 Days"
+#~ msgstr "5 jours"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "CrИe un nouveau calendrier"
+
+#~ msgid "Day"
+#~ msgstr "Jour"
+
+#, fuzzy
+#~ msgid "New _Event"
+#~ msgstr "Nouveau Ca_lendrier"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Ouvrir un calendrier"
+
+#~ msgid "Prev"
+#~ msgstr "PrИc"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Enregistrer le calendrier comme quelquechose d'autre"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Ouvrir un calendrier"
+
+#~ msgid "About this application"
+#~ msgstr "ю propos de cette application"
+
+#~ msgid "About..."
+#~ msgstr "ю propos..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "Actio_ns"
+
+#~ msgid "C_lear"
+#~ msgstr "_Vider"
+
+#, fuzzy
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "_TБche (FIXME)"
+
+#~ msgid "Clear the selection"
+#~ msgstr "Vide la sИlection"
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "Cop_ier vers le dossier... (FIXME)"
+
+#, fuzzy
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "Enregistrer dans le _dossier... (FIXME)"
+
+#, fuzzy
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "_TБche (FIXME)"
+
+#, fuzzy
+#~ msgid "Go to the next item"
+#~ msgstr "Va Ю la date actuelle"
+
+#, fuzzy
+#~ msgid "Go to the previous item"
+#~ msgstr "Va Ю la date actuelle"
+
+#, fuzzy
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "_TБche (FIXME)"
+
+#~ msgid "N_ext"
+#~ msgstr "_Suivant"
+
+#~ msgid "Pre_vious"
+#~ msgstr "_PrИcИdent"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "Configuration de l'impr_ession..."
+
+#, fuzzy
+#~ msgid "Select everything"
+#~ msgstr "SИlectionnez un Dossier"
+
+#, fuzzy
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "_TБche (FIXME)"
+
+#~ msgid "_About..."
+#~ msgstr "ю _propos..."
+
+#, fuzzy
+#~ msgid "_Item (FIXME)"
+#~ msgstr "_TБche (FIXME)"
+
+#, fuzzy
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "_Contact (FIXME)"
+
+#, fuzzy
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "Enregistrer dans le _dossier... (FIXME)"
+
+#, fuzzy
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "_Message Иlectronique (FIXME)"
+
+#, fuzzy
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "_DИplacer vers le dossier..."
+
+#, fuzzy
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_Contact (FIXME)"
+
+#, fuzzy
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "_Contact (FIXME)"
+
+#~ msgid "Add Service"
+#~ msgstr "Ajouter un service"
+
+#, fuzzy
+#~ msgid "Create a new email"
+#~ msgstr "CrИe une nouveau contact"
+
+#~ msgid "New Mail"
+#~ msgstr "Nouveau courrier"
+
+#, fuzzy
+#~ msgid "Configure Folder..."
+#~ msgstr "_Copier vers le dossier..."
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Copie le message vers un nouveau dossier"
+
+#, fuzzy
+#~ msgid "Expunge"
+#~ msgstr "_Nettoyer"
+
+#, fuzzy
+#~ msgid "Forward this message in-line with your mail, so you can edit it"
+#~ msgstr "Faire suivre un message sans sujet"
+
+#, fuzzy
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "Supprimer le message"
+
+#, fuzzy
+#~ msgid "Invert Selection"
+#~ msgstr "_Inverser la sИlection"
+
+#, fuzzy
+#~ msgid "Mark As Read"
+#~ msgstr "_Marquer comme lus"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Marquer comme _non lu"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "DИplace le message vers un nouveau dossier"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "AperГu avant impression du message..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Imprime le message vers l'imprimante"
+
+#, fuzzy
+#~ msgid "Reply to all"
+#~ msgstr "RИpondre Ю tous"
+
+#, fuzzy
+#~ msgid "Reply to sender"
+#~ msgstr "RИpondre Ю l'expИditeur"
+
+#~ msgid "S_ource"
+#~ msgstr "S_ource"
+
+#, fuzzy
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr "Envoie les messages en attente et rИcupХre les nouveaux messages"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "Voir la source brut du message"
+
+#, fuzzy
+#~ msgid "_Reply"
+#~ msgstr "RИpondre"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "_Enregistrer le message sous..."
+
+#~ msgid "_Threaded"
+#~ msgstr "_Enfiler"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Enregistrer dans le _dossier... (FIXME)"
+
+#~ msgid "Send the message now"
+#~ msgstr "Envoie le message maintenant"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_InsИrer un fichier texte... (FIXME)"
+
+#, fuzzy
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "_TБche (FIXME)"
+
+#~ msgid "Redo"
+#~ msgstr "Refaire"
+
+#, fuzzy
+#~ msgid "Redo the undone action"
+#~ msgstr "Supprimer l'action"
+
+#~ msgid "Replace"
+#~ msgstr "Remplacer"
+
+#~ msgid "Replace a string"
+#~ msgstr "Remplace une chaНne"
+
+#, fuzzy
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "RИpondre Ю tous"
+
+#, fuzzy
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "_Contact (FIXME)"
+
+#, fuzzy
+#~ msgid "Search again for the same string"
+#~ msgstr "_Rechercher des contacts"
+
+#, fuzzy
+#~ msgid "Search for a string"
+#~ msgstr "_Rechercher des contacts"
+
+#~ msgid "Undo"
+#~ msgstr "DИfaire"
+
+#, fuzzy
+#~ msgid "Undo the last action"
+#~ msgstr "Supprimer l'action"
+
+#, fuzzy
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "Marquer comme terminИe"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "_RИpondre (FIXME)"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Barre de _raccourcis d'Evolution"
+
+#, fuzzy
+#~ msgid "Advanced ..."
+#~ msgstr "AvancИe..."
 
 #, fuzzy
 #~ msgid "Click here to add a contact"
@@ -9015,10 +12828,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgstr "Le numИro de port dans l'URL ╚ %s ╩ n'est pas numИrique"
 
 #, fuzzy
-#~ msgid "Secure IMAPv4"
-#~ msgstr "IMAPv4"
-
-#, fuzzy
 #~ msgid "For reading and storing mail on IMAP servers over an SSL connection."
 #~ msgstr "Pour la lecture et le stockage du courrier sur des serveurs IMAP."
 
@@ -9050,15 +12859,9 @@ msgstr "Ne peut initialiser Bonobo"
 #~ "Cette option vous connectera au serveur SMTP sans utiliser d'identification. "
 #~ "Cela devrait Йtre suffisant pour se connecter Ю la plupart des serveurs SMTP."
 
-#~ msgid "Remove action"
-#~ msgstr "Supprimer l'action"
-
 #~ msgid "Remove criterion"
 #~ msgstr "Supprimer le critХre"
 
-#~ msgid "Source"
-#~ msgstr "Source"
-
 #, fuzzy
 #~ msgid "Unspecified"
 #~ msgstr "IndИfini"
@@ -9066,18 +12869,12 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Advanced"
 #~ msgstr "AvancИe"
 
-#~ msgid "Check settings"
-#~ msgstr "VИrifier les rИglages"
-
 #~ msgid "Email address:"
 #~ msgstr "Adresse Иlectronique :"
 
 #~ msgid "Evolution Mail Configuration"
 #~ msgstr "Configuration de la messagerie Evolution"
 
-#~ msgid "Hostname:"
-#~ msgstr "Nom d'hТte :"
-
 #, fuzzy
 #~ msgid "IMAP"
 #~ msgstr "IMAPv4"
@@ -9088,18 +12885,12 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Kerberos"
 #~ msgstr "Kerberos"
 
-#~ msgid "Mail"
-#~ msgstr "Courrier"
-
 #~ msgid "Mail Account"
 #~ msgstr "Compte de messagerie"
 
 #~ msgid "Mail Configuration Druid"
 #~ msgstr "Assistant de configuration de messagerie"
 
-#~ msgid "Optional"
-#~ msgstr "Optionnel"
-
 #~ msgid "Password:"
 #~ msgstr "Mot de passe :"
 
@@ -9119,16 +12910,10 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Save password"
 #~ msgstr "Enregistrer le mot de passe"
 
-#~ msgid "Select signature file"
-#~ msgstr "SИlectionner un fichier de signature"
-
 #, fuzzy
 #~ msgid "Server type:"
 #~ msgstr "Type de serveur : "
 
-#~ msgid "Signature:"
-#~ msgstr "Signature :"
-
 #, fuzzy
 #~ msgid "Transport"
 #~ msgstr "Transparent"
@@ -9159,13 +12944,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "<unknown>"
 #~ msgstr "<inconnu>"
 
-#~ msgid "No GPG/PGP program available."
-#~ msgstr "Aucun programme GPG/PGP disponible."
-
-#, fuzzy
-#~ msgid "Message _Display"
-#~ msgstr "Nettoyer l'affichage des messages"
-
 #, fuzzy
 #~ msgid "_Compose"
 #~ msgstr "Composer"
@@ -9174,9 +12952,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "_Message Hiding"
 #~ msgstr "_Message"
 
-#~ msgid "Disabled"
-#~ msgstr "DИsactivИ"
-
 #~ msgid "Synchronize"
 #~ msgstr "Synchroniser"
 
@@ -9195,9 +12970,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "JP Rosevear <jpr@helixcode.com>"
 #~ msgstr "JP Rosevear <jpr@helixcode.com>"
 
-#~ msgid "Original Author:"
-#~ msgstr "Auteur originel : "
-
 #~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
 #~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
 
@@ -9237,9 +13009,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ "Une erreur est survenue durant la rИcupИration de\n"
 #~ "la liste des Pilot depuis le dИmon gnome-pilot"
 
-#~ msgid "Configure the address conduit"
-#~ msgstr "Configuration du conduit Adresses"
-
 #~ msgid "Evolution Address conduit "
 #~ msgstr "Conduit Adresses"
 
@@ -9275,10 +13044,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "The priority must be between 1 and 9, inclusive"
 #~ msgstr "La prioritИ doit Йtre comprise entre 1 et 9 inclus"
 
-#, fuzzy
-#~ msgid "Schedule meeting"
-#~ msgstr "SИlectionnez un Dossier"
-
 #~ msgid "Edit this appointment..."
 #~ msgstr "иditer ce rendez-vous..."
 
@@ -9294,9 +13059,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Enter the subject of the mail"
 #~ msgstr "Entrez le sujet du message"
 
-#~ msgid "Saving changes to message..."
-#~ msgstr "Enregistrement des changements dans le message..."
-
 #~ msgid "Save changes to message..."
 #~ msgstr "Enregistrer les changements dans le message..."
 
@@ -9307,15 +13069,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Edit Filter Rule"
 #~ msgstr "иditer la RХgle du Filtre"
 
-#~ msgid "incoming"
-#~ msgstr "entrant"
-
-#~ msgid "outgoing"
-#~ msgstr "sortant"
-
-#~ msgid "Add Rule"
-#~ msgstr "Ajouter une rХgle"
-
 #~ msgid "Add VFolder Rule"
 #~ msgstr "Ajouter une rХgle de dossier virtuel"
 
@@ -9347,9 +13100,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Account Properties"
 #~ msgstr "PropriИtИs du compte"
 
-#~ msgid "E-Mail Address:"
-#~ msgstr "Adresse Иlectronique :"
-
 #~ msgid "Incoming Mail Server"
 #~ msgstr "Serveur de courrier entrant"
 
@@ -9368,9 +13118,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Appending \"%s\""
 #~ msgstr "Adjation de ╚ %s ╩"
 
-#~ msgid "Appending a message without a subject"
-#~ msgstr "Adjoint un message sans sujet"
-
 #~ msgid "Moving messages from \"%s\" into \"%s\""
 #~ msgstr "DИplacement des messages de ╚ %s ╩ vers ╚ %s ╩"
 
@@ -9393,13 +13140,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgstr "Charge %s dossier pour %s"
 
 #~ msgid ""
-#~ "Error while preparing to %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Erreur durant le prИparation vers %s :\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error while `%s':\n"
 #~ "%s"
 #~ msgstr ""
@@ -9412,12 +13152,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Corrupted message from dispatching thread?"
 #~ msgstr "Message corrompu de l'enfilade envoyИe ?"
 
-#~ msgid "Could not create dialog box."
-#~ msgstr "Ne peut crИer la boНte de dialogue"
-
-#~ msgid "User cancelled query."
-#~ msgstr "L'utilisateur a annulИ la requЙte"
-
 #~ msgid ""
 #~ "Cannot open location `%s':\n"
 #~ "%s"
@@ -9477,9 +13211,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "_VFolder on Subject"
 #~ msgstr "_Dossier Virtuel sur le sujet"
 
-#~ msgid "New"
-#~ msgstr "Nouveau"
-
 #~ msgid "Customi_ze..."
 #~ msgstr "_Personnaliser..."
 
@@ -9489,9 +13220,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Show the _Shortcut Bar"
 #~ msgstr "Afficher la barre de raccourci_s"
 
-#~ msgid "_Settings"
-#~ msgstr "_RИglages"
-
 #~ msgid ""
 #~ "\n"
 #~ "Mr.\n"
@@ -9527,19 +13255,12 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Local stores do not have a default folder"
 #~ msgstr "La stockage local n'a pas de rИpertoire par dИfaut"
 
-#~ msgid "Local folders may not be nested."
-#~ msgstr "Les dossiers locaux ne peuvent Йtre encapsulИs."
-
 #~ msgid "Congratulations, your mail configuration is complete.\n"
 #~ msgstr "FИlicitations, votre configuration de messagerie est effectuИ.\n"
 
 #~ msgid "Copyright (C) 2000, Helix Code, Inc."
 #~ msgstr "Copyright (C) 2000, Helix Code, Inc."
 
-#, fuzzy
-#~ msgid "UNIX mbox-format mail files"
-#~ msgstr "Fichiers de courrier au format UNIX mbox (version CamelLocal)"
-
 #~ msgid ""
 #~ "For reading mail delivered by the local system, and for storing mail on "
 #~ "local disk."
@@ -9551,26 +13272,12 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Cannot initialize Evolution's notes component."
 #~ msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
 
-#, fuzzy
-#~ msgid "Notes Component: Could not initialize bonobo"
-#~ msgstr "Ne peut initialiser Bonobo"
-
 #~ msgid "Open..."
 #~ msgstr "Ouvrir..."
 
 #~ msgid "You have no Outbox configured"
 #~ msgstr "Vous n'avez pas de boНte de sortie configurИ"
 
-#~ msgid ""
-#~ "Could not open file %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ne peut ouvrir le fichier %s :\n"
-#~ "%s"
-
-#~ msgid "Fetching email from %s"
-#~ msgstr "RИcupИration du courrier depuis %s"
-
 #~ msgid "Fetch email from %s"
 #~ msgstr "RИcupХre le courrier depuis %s"
 
@@ -9683,10 +13390,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgstr "иditer le message"
 
 #, fuzzy
-#~ msgid "FIXME: Forward as _vCard"
-#~ msgstr "Faire suivre"
-
-#, fuzzy
 #~ msgid "FIXME: For_ward"
 #~ msgstr "Faire suivre"
 
@@ -9698,9 +13401,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "FIXME: Next"
 #~ msgstr "_Filtres de message..."
 
-#~ msgid "Group %i"
-#~ msgstr "Groupe %i"
-
 #~ msgid "<b>Error loading calendar:<br>Calendar in use."
 #~ msgstr ""
 #~ "<b>Erreur de chargement du calendrier :<br>Calendrier en cours d'utilisation"
@@ -9727,15 +13427,9 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Minutes"
 #~ msgstr "Minutes"
 
-#~ msgid "Time"
-#~ msgstr "Horaire"
-
 #~ msgid "_Audio"
 #~ msgstr "_Audio"
 
-#~ msgid "_Display"
-#~ msgstr "_Affichage"
-
 #~ msgid "_Mail"
 #~ msgstr "_Courrier"
 
@@ -9745,9 +13439,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "event-editor-dialog"
 #~ msgstr "event-editor-dialog"
 
-#~ msgid "Show all hidden"
-#~ msgstr "Afficher tous les cachИs"
-
 #~ msgid "Hide selected"
 #~ msgstr "Cacher sИlectionnИ"
 
@@ -9760,9 +13451,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Hide from Sender"
 #~ msgstr "Cacher de l'expИditeur"
 
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "Cacher le sujet \"%s\""
-
 #~ msgid "Hide from Sender <%s>"
 #~ msgstr "Cacher depuis l'expИditeur <%s>"
 
@@ -9772,9 +13460,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Reply-to:"
 #~ msgstr "RИpondre-Ю :"
 
-#~ msgid " for "
-#~ msgstr " pour "
-
 #~ msgid "Open a calendar"
 #~ msgstr "Ouvre un calendrier"
 
@@ -9789,9 +13474,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "_Redo"
 #~ msgstr "Radio"
 
-#~ msgid "_Replace..."
-#~ msgstr "_Remplacer..."
-
 #~ msgid "_Source"
 #~ msgstr "_Source"
 
@@ -9810,9 +13492,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Signature File"
 #~ msgstr "Fichier de signature"
 
-#~ msgid "Server:"
-#~ msgstr "Serveur :"
-
 #~ msgid "Mail source type:"
 #~ msgstr "Type de source de courrier :"
 
@@ -9856,9 +13535,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Edit Source"
 #~ msgstr "иditer source"
 
-#~ msgid "Add News Server"
-#~ msgstr "Ajouter un serveur de news"
-
 #~ msgid "Edit News Server"
 #~ msgstr "иditer le serveur de news"
 
@@ -9880,15 +13556,9 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Mail Transport"
 #~ msgstr "Transport de courrier"
 
-#~ msgid "News Servers"
-#~ msgstr "Serveur de forums"
-
 #~ msgid "News Sources"
 #~ msgstr "Sources de forums"
 
-#~ msgid "Send messages in HTML format"
-#~ msgstr "Envoie les messages au format HTML"
-
 #~ msgid "External Directories"
 #~ msgstr "Annuaires externes"
 
@@ -9913,9 +13583,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "To-Do item that is not yet due:"
 #~ msgstr "иlИment 'ю faire' qui n'est pas encore terminИ :"
 
-#~ msgid "To-Do item that is due today:"
-#~ msgstr "иlИment 'ю faire' qui finit aujourd'hui :"
-
 #~ msgid "To-Do item that is overdue:"
 #~ msgstr "иlИment 'ю faire' en retard : "
 
@@ -9940,15 +13607,9 @@ msgstr "Ne peut initialiser Bonobo"
 #~ "aller. Quand vous cliquez sur un jour, vous\n"
 #~ "y serez automatiquement amenИ."
 
-#~ msgid "Mail Source"
-#~ msgstr "Source de courrier"
-
 #~ msgid "Sending a message without a subject"
 #~ msgstr "ExpИdition d'un message sans sujet"
 
-#~ msgid "Send a message without a subject"
-#~ msgstr "Envoie un message sans sujet"
-
 #~ msgid "Expunge \"%s\""
 #~ msgstr "Nettoie \"%s\""
 
@@ -10001,9 +13662,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Clearing message display"
 #~ msgstr "Nettoie l'affichage des messages"
 
-#~ msgid "Display message UID \"%s\""
-#~ msgstr "Affiche le message UID \"%s\""
-
 #~ msgid "Opening messages from folder \"%s\""
 #~ msgstr "Ouverture des messages du dossier \"%s\""
 
@@ -10054,9 +13712,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "tuesday"
 #~ msgstr "mardi"
 
-#~ msgid "tues"
-#~ msgstr "mar"
-
 #~ msgid "wednesday"
 #~ msgstr "mercredi"
 
@@ -10096,9 +13751,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "today"
 #~ msgstr "aujourd'hui"
 
-#~ msgid "last"
-#~ msgstr "dernier"
-
 #~ msgid "this"
 #~ msgstr "ce"
 
@@ -10111,9 +13763,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "third"
 #~ msgstr "troisiХme"
 
-#~ msgid "fourth"
-#~ msgstr "quatriХme"
-
 #~ msgid "fifth"
 #~ msgstr "cinquiХme"
 
@@ -10123,9 +13772,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "seventh"
 #~ msgstr "septiХme"
 
-#~ msgid "eighth"
-#~ msgstr "huitiХme"
-
 #~ msgid "ninth"
 #~ msgstr "neuviХme"
 
@@ -10138,15 +13784,9 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "twelfth"
 #~ msgstr "douziХme"
 
-#~ msgid "ago"
-#~ msgstr "passИ"
-
 #~ msgid "BLARG\n"
 #~ msgstr "BLARG\n"
 
-#~ msgid "window2"
-#~ msgstr "fenЙtre2"
-
 #~ msgid "_Summary:"
 #~ msgstr "RИs_umИ : "
 
@@ -10225,9 +13865,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "End on "
 #~ msgstr "Fin le "
 
-#~ msgid "Change"
-#~ msgstr "Changer"
-
 #~ msgid "Create to-do item"
 #~ msgstr "CrИer un ИlИment 'Ю faire'"
 
@@ -10252,9 +13889,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Weeks start on"
 #~ msgstr "Les semaines dИbutent un"
 
-#~ msgid "Day range"
-#~ msgstr "Horaires de travail"
-
 #~ msgid ""
 #~ "Please select the start and end hours you want\n"
 #~ "to be displayed in the day view and week view.\n"
@@ -10269,12 +13903,6 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Day start:"
 #~ msgstr "Heure de dИbut : "
 
-#~ msgid "Day end:"
-#~ msgstr "Heure de fin : "
-
-#~ msgid "Colors for display"
-#~ msgstr "Couleurs pour l'affichage"
-
 #~ msgid "Show on TODO List:"
 #~ msgstr "Afficher dans la liste 'ю Faire' : "
 
@@ -10358,14 +13986,8 @@ msgstr "Ne peut initialiser Bonobo"
 #~ msgid "Don't know protocol to open URI `%s'"
 #~ msgstr "Ne connait pas le protocole pour ouvrir l'URI ╚ %s ╩"
 
-#~ msgid "Forward Message"
-#~ msgstr "Faire suivre le message"
-
 #~ msgid "Copy Message"
 #~ msgstr "Copier le message"
 
-#~ msgid "_Create New Folder..."
-#~ msgstr "_CrИer un nouveau dossier..."
-
 #~ msgid "_Unselect All"
 #~ msgstr "_DИselectionner tout"
diff --git a/po/ga.po b/po/ga.po
index 5a7b7436e9..b99a5b966b 100755
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution CVS\n"
-"POT-Creation-Date: 2001-04-14 08:51-0400\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2000-08-02 13:00:00-0000\n"
 "Last-Translator: Alastair McKinstry, <mckinstry@computer.org>\n"
 "Language-Team: Irish <ga@li.org>\n"
@@ -13,197 +13,205 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -219,24 +227,26 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:4037
+#, fuzzy
+msgid "Multiple VCards"
+msgstr "Post an sceАl seo"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
+#: addressbook/backend/ebook/e-card.c:4045
+#, c-format
+msgid "VCard for %s"
 msgstr ""
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
@@ -244,10 +254,10 @@ msgstr ""
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:43
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr ""
 
@@ -260,14 +270,14 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr ""
 
@@ -276,730 +286,850 @@ msgstr ""
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
-msgid "Anni_versary:"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
-msgid "B_usiness"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
-msgid "Business _Fax"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
-msgid "Ca_tegories..."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
-msgid "Contact Editor"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Details"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
-msgid "File As:"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
-msgid "General"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
-msgid "New phone type"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/component/addressbook-config.c:150
 #, fuzzy
-msgid "No_tes:"
-msgstr "_Nota"
+msgid "File"
+msgstr "_FillteАn"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
-msgid "Phone Types"
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:15
-msgid "Wants to receive _HTML mail"
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
-msgid "Web page address:"
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:18
-msgid "_Address..."
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
-msgid "_Assistant's name:"
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
-msgid "_Birthday:"
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
-msgid "_Business"
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-#, fuzzy
-msgid "_Company:"
-msgstr "Greamaigh"
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:91 ui/evolution-task-editor-dialog.xml.h:69
-#, fuzzy
-msgid "_Delete"
-msgstr "ScrМos"
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
-msgid "_Department:"
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
-msgid "_Full Name..."
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
-#, fuzzy
-msgid "_Home"
-msgstr "_Nota"
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
-msgid "_Job title:"
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
-msgid "_Manager's Name:"
+#: addressbook/gui/component/addressbook-config.c:411
+#, fuzzy
+msgid "Port:"
+msgstr "TosaМocht"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
-msgid "_Mobile"
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
-msgid "_Nickname:"
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
-msgid "_Office:"
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
-msgid "_Profession:"
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
-msgid "_Spouse:"
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
-msgid "_This is the mailing address"
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-#, fuzzy
-msgid "Delete Contact?"
-msgstr "ScrМos an sceal seo"
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:603
-msgid "This contact belongs to these categories:"
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
-msgid "Assistant"
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
-msgid "Business"
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
-msgid "Business 2"
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
-msgid "Business Fax"
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
-msgid "Callback"
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
-msgid "Car"
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "Addressbook Sources"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/component/addressbook-config.glade.h:2
 #, fuzzy
-msgid "Company"
-msgstr "Greamaigh"
+msgid "De_lete"
+msgstr "ScrМos"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
-msgid "Home"
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
-msgid "Home 2"
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
-msgid "Home Fax"
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
-msgid "ISDN"
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
-msgid "Mobile"
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
-msgid "Other"
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
-msgid "Other Fax"
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
-msgid "Pager"
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
-#, fuzzy
-msgid "Primary"
-msgstr "TosaМocht"
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
-msgid "Radio"
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
-msgid "Telex"
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
-msgid "TTY/TDD"
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
-msgid "Email 2"
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
-msgid "Email 3"
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "Abair"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:223
-msgid "Contact Quick-Add"
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:225
-#, fuzzy
-msgid "Edit Full"
-msgstr "_FillteАn"
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:262
-#: addressbook/gui/widgets/e-addressbook-view.c:643
-msgid "Full Name"
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:268
+#: addressbook/gui/component/e-address-popup.c:579
 #, fuzzy
-msgid "E-mail"
-msgstr "Post"
+msgid "Select an Action"
+msgstr "FillteАn _Nua"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr ""
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "ScrМos an sceal seo"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
-msgid "Canada"
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
-msgid "Check Address"
+#: addressbook/gui/component/e-address-popup.c:859
+msgid "Querying Addressbook..."
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
-msgid "Countr_y:"
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
-msgid "Finland"
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
-msgid "USA"
+#: addressbook/gui/component/e-address-popup.c:989
+msgid "Merge E-Mail Address"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
-msgid "_Address:"
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
-#, fuzzy
-msgid "_City:"
-msgstr "TosaМocht"
-
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "_PO Box:"
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "_State/Province:"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "_ZIP Code:"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:1
-msgid "Check Full Name"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "ScrМos"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+#, fuzzy
+msgid "Remove All"
+msgstr "ScrМos"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "Post"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "_Coinne"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:2
-msgid "Dr."
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:3
-msgid "Esq."
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+#, fuzzy
+msgid "Select Names"
+msgstr "FillteАn _Nua"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "FillteАn _Nua"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "TosaМocht"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+#, fuzzy
+msgid "_Search"
+msgstr "_FillteАn"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+msgid "Anni_versary:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:4
-msgid "I"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+msgid "B_usiness"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:5
-msgid "II"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+msgid "Business _Fax"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:6
-msgid "III"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
+msgid "Ca_tegories..."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:7
-msgid "Jr."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+msgid "Contact Editor"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:8
-msgid "Miss"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
+msgid "Details"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:9
-msgid "Mr."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+msgid "File As:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:10
-msgid "Mrs."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+msgid "General"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:11
-msgid "Ms."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+msgid "New phone type"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:12
-msgid "Sr."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#, fuzzy
+msgid "No_tes:"
+msgstr "_Nota"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid "Organi_zation:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:13
-msgid "_First:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+msgid "Phone Types"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:14
-msgid "_Last:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:15
-msgid "_Middle:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+msgid "Web page address:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:16
-msgid "_Suffix:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+msgid "_Address..."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:17
-msgid "_Title:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+msgid "_Assistant's name:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:241
-msgid "As _Minicards"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+msgid "_Birthday:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:247
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+msgid "_Business"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:399
-#, c-format
-msgid "Enter password for %s"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:427
-msgid "Unable to open addressbook"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
+#, fuzzy
+msgid "_Delete"
+msgstr "ScrМos"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+msgid "_Department:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:432
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+msgid "_Full Name..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:555
-msgid "Show All"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#, fuzzy
+msgid "_Home"
+msgstr "_Nota"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+msgid "_Job title:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:557
-msgid "Advanced..."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:587
-msgid "Any field contains"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+msgid "_Mobile"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:588
-msgid "Name contains"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+msgid "_Nickname:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:589
-msgid "Email contains"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+msgid "_Office:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:732
-msgid "The URI that the Folder Browser will display"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+msgid "_Profession:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+msgid "_Spouse:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+msgid "_This is the mailing address"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 #, fuzzy
-msgid "File"
-msgstr "_FillteАn"
+msgid "Delete Contact?"
+msgstr "ScrМos an sceal seo"
 
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
+msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
+msgid "Assistant"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
-msgid "Password"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
+msgid "Business"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
+msgid "Business 2"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:170
-msgid "Unknown auth type"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
+msgid "Business Fax"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "Base"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
+msgid "Callback"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "One"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
+msgid "Car"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:183
-msgid "Subtree"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
+#, fuzzy
+msgid "Company"
+msgstr "Greamaigh"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
+msgid "Home"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Unknown scope type"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+msgid "Home 2"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:353
-msgid "Bind DN:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
+msgid "Home Fax"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:354
-msgid "FIXME Bind DN Help text here"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
+msgid "ISDN"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
+msgid "Mobile"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
-msgid "Host:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
+msgid "Other"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Host help text here."
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
+msgid "Other Fax"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:409
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
+msgid "Pager"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 #, fuzzy
-msgid "Port:"
+msgid "Primary"
 msgstr "TosaМocht"
 
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
+msgid "Radio"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
+msgid "Telex"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
+msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:435
-msgid "Search Scope:"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:489
-msgid "Authentication:"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#, fuzzy
+msgid "Edit Full"
+msgstr "_FillteАn"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
+msgid "Full Name"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
-msgid "Path:"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#, fuzzy
+msgid "E-mail"
+msgstr "Post"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "FIXME Path Help text here"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Canada"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:513
-msgid "Create path if it doesn't exist."
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Check Address"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:647
-msgid "Edit Addressbook"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Countr_y:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:649
-msgid "Add Addressbook"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "Finland"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:665
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "USA"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
-msgid "Name:"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "_Address:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:672
-msgid "FIXME Name help text here"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#, fuzzy
+msgid "_City:"
+msgstr "TosaМocht"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+msgid "_PO Box:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:674
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "_State/Province:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:675
-msgid "FIXME Description help text here"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+msgid "_ZIP Code:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
+#: addressbook/gui/contact-editor/fullname.glade.h:1
+msgid "Check Full Name"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:8 mail/folder-browser.c:597
-#: mail/mail-config.glade.h:19 mail/mail-view.c:156
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "ScrМos"
+#: addressbook/gui/contact-editor/fullname.glade.h:2
+msgid "Dr."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
+#: addressbook/gui/contact-editor/fullname.glade.h:3
+msgid "Esq."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+msgid "I"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
+#: addressbook/gui/contact-editor/fullname.glade.h:5
+msgid "II"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
+#: addressbook/gui/contact-editor/fullname.glade.h:6
+msgid "III"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
+#: addressbook/gui/contact-editor/fullname.glade.h:7
+msgid "Jr."
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
+#: addressbook/gui/contact-editor/fullname.glade.h:8
+msgid "Miss"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
-msgid "Add to Contacts"
+#: addressbook/gui/contact-editor/fullname.glade.h:9
+msgid "Mr."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
+#: addressbook/gui/contact-editor/fullname.glade.h:10
+msgid "Mrs."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
+#: addressbook/gui/contact-editor/fullname.glade.h:11
+msgid "Ms."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
+#: addressbook/gui/contact-editor/fullname.glade.h:12
+msgid "Sr."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
+#: addressbook/gui/contact-editor/fullname.glade.h:13
+msgid "_First:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
+#: addressbook/gui/contact-editor/fullname.glade.h:14
+msgid "_Last:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
+#: addressbook/gui/contact-editor/fullname.glade.h:15
+msgid "_Middle:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
+#: addressbook/gui/contact-editor/fullname.glade.h:16
+msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
+#: addressbook/gui/contact-editor/fullname.glade.h:17
+msgid "_Title:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "FillteАn _Nua"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "Post"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
+msgstr "ScrМos"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+msgid "contact-list-editor"
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:402
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
-msgstr "ScrМos"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
+msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
 #, fuzzy
-msgid "Remove All"
-msgstr "ScrМos"
+msgid "New Contact:"
+msgstr "_Coinne"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-#, fuzzy
-msgid "Find..."
-msgstr "PriontАil"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+msgid "Original Contact:"
+msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
+msgid ""
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-#, fuzzy
-msgid "Select Names"
-msgstr "FillteАn _Nua"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-#, fuzzy
-msgid "Select name from:"
-msgstr "FillteАn _Nua"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
+msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr ""
 
@@ -1113,165 +1243,248 @@ msgstr ""
 msgid "z"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 #, fuzzy
 msgid "Send message to contact"
 msgstr "_Post sceАl"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/folder-browser.c:572
-#: mail/mail-view.c:154 ui/evolution-addressbook.xml.h:9
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:50
-#: ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "PriontАil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Post an sceАl seo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "ScrМos"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+msgid "Error modifying card"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+msgid "Success"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+msgid "Repository offline"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+msgid "Card not found"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+msgid "Protocol not supported"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "_FillteАn"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+msgid "Other error"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+msgid "Error adding list"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+msgid "Error adding card"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+msgid "Error modifying list"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+msgid "Error removing list"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+msgid "Error removing card"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 #, fuzzy
 msgid "File As"
 msgstr "_FillteАn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 #, fuzzy
 msgid "Email"
 msgstr "Post"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 #, fuzzy
 msgid "Primary Phone"
 msgstr "TosaМocht"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 #, fuzzy
 msgid "Company Phone"
 msgstr "Greamaigh"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 #, fuzzy
 msgid "Title"
 msgstr "_FillteАn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 #, fuzzy
 msgid "Note"
 msgstr "_Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "_Nota"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+msgid "Removing cards..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1310,7 +1523,7 @@ msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:7
 #, fuzzy
-msgid "Font..."
+msgid "F_ont..."
 msgstr "PriontАil"
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1373,7 +1586,6 @@ msgid "Margins"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr ""
 
@@ -1460,142 +1672,316 @@ msgstr "Do:"
 msgid "Width:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "PriontАil"
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:468
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "_Coinne"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, c-format
+msgid "Notification about your task starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, c-format
+msgid "Notification about your task ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+msgid "Notification about your task"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "_FillteАn"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "MИid"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "_Coinne"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+msgid "No description available."
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+#, fuzzy
+msgid "Snooze"
+msgstr "MИid"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:58
+#, c-format
+msgid ""
+"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+"know."
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+msgid "Could not initialize GNOME"
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+msgid "Could not initialize gnome-vfs"
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:115
+msgid "Could not create the alarm notify service factory"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:402
+msgid "%A %d %B %Y"
+msgstr ""
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+msgid "%a %d %b %Y"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 #, fuzzy
 msgid "Private"
 msgstr "PriontАil"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1592
-#: calendar/gui/event-editor.c:1619
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:660
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
-#: calendar/gui/calendar-model.c:1569
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:659
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 #, fuzzy
 msgid "Normal"
 msgstr "Sheoladh Chuig duine"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:658
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:635 calendar/gui/calendar-model.c:1173
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1175
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1177
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1179
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
-#: camel/camel-service.c:586
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:799
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1603,165 +1989,314 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:879
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:893 calendar/gui/calendar-model.c:1117
-#: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1129
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:430
-#: widgets/misc/e-dateedit.c:1339 widgets/misc/e-dateedit.c:1454
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 #, fuzzy
 msgid "None"
 msgstr "_Nota"
 
-#: calendar/gui/calendar-model.c:967
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1007
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1048
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1061
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1102
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1571
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1573
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 #, fuzzy
 msgid "No"
 msgstr "_Nota"
 
-#: calendar/gui/calendar-summary.c:196
-msgid "%A, %e %B %Y"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "_Nua"
+
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+msgid "Work Week View"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
-msgid "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+msgid "Week View"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:437
-msgid "<b>Error loading calendar</b>"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "PriontАil"
+
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:449
-msgid "<b>Error loading calendar:<br>Method not supported"
+#: calendar/gui/dialogs/alarm-options.c:354
+msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:616
-msgid "Display"
+#: calendar/gui/dialogs/alarm-options.c:363
+msgid "Message Alarm Options"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:621
-#, fuzzy
-msgid "Show appointments"
-msgstr "_Coinne"
+#: calendar/gui/dialogs/alarm-options.c:372
+msgid "Mail Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:629
-msgid "Show tasks"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
 msgstr ""
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 #, fuzzy
-msgid "Snooze"
-msgstr "MИid"
+msgid "Message to Display"
+msgstr "_Post sceАl"
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+msgid "Play sound:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+msgid "Run program:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:52
-msgid "Could not initialize GNOME"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:77
-msgid "Could not create the alarm notify service factory"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+msgid "extra times every"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
+#: calendar/gui/dialogs/alarm-page.c:284
+#, c-format
+msgid "%d days"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:286
+msgid "1 day"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, c-format
+msgid "%d weeks"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:291
+msgid "1 week"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
+#: calendar/gui/dialogs/alarm-page.c:294
+#, c-format
+msgid "%d hours"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:296
+msgid "1 hour"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, c-format
+msgid "%d minutes"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:301
+msgid "1 minute"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr "Post"
+
+#: calendar/gui/dialogs/alarm-page.c:306
 #, fuzzy
-msgid "Edit appointment"
+msgid "1 second"
+msgstr "Post"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "_Post sceАl"
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an email"
+msgstr "Post"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr "ScrМos an sceal seo"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr "ScrМos an sceal seo"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr "ScrМos an sceal seo"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
 msgstr "_Coinne"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+msgid "Basics"
 msgstr ""
 
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "ScrМos"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Reminders"
+msgstr "Post"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+#, fuzzy
+msgid "Summary:"
+msgstr "Post"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_OscАil"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+#, fuzzy
+msgid "end of appointment"
+msgstr "_Coinne"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+msgid "minute(s)"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+#, fuzzy
+msgid "start of appointment"
+msgstr "_Coinne"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
 msgstr ""
@@ -1791,38 +2326,37 @@ msgid "60 minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
+msgid "Beep when alarm windows appear."
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr ""
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
+#, fuzzy
+msgid "Calendar"
+msgstr "_FillteАn"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
+msgid "Calendar Preferences"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
-#, fuzzy
-msgid "Calendar"
-msgstr "_FillteАn"
+msgid "Color for overdue tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
+msgid "Color for tasks due today"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#, fuzzy
-msgid "Colors"
-msgstr "_FillteАn"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+msgid "Compress weekends in month view"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+msgid "Date Navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1831,1048 +2365,1146 @@ msgid "Defaults"
 msgstr "ScrМos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
+#: mail/mail-config.glade.h:30
+msgid "Display"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
+msgid "End of day:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
+msgid "First day of week:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "End of day:"
+msgid "Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "First day of week:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Fri"
+#: calendar/gui/dialogs/recurrence-page.c:969
+msgid "Friday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:481
-msgid "Friday"
+msgid "Mon"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
+msgid "Notification Options"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
+msgid "Overdue tasks"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr ""
+#, fuzzy
+msgid "Remind me of all appointments"
+msgstr "_Coinne"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Mon"
+msgid "Sat"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:477
-msgid "Monday"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr ""
+#, fuzzy
+msgid "Show appointment end times in week and month views"
+msgstr "_Coinne"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
+msgid "Show week numbers"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
+msgid "Start of day:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "TosaМocht"
+msgid "Sun"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 #, fuzzy
-msgid "Remind me of all appointments"
-msgstr "_Coinne"
+msgid "Sunday"
+msgstr "Post"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
 #, fuzzy
-msgid "Reminders"
-msgstr "Post"
+msgid "Task List"
+msgstr "_Teacs"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Sat"
+msgid "Tasks due today"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:482
-msgid "Saturday"
+msgid "Thu"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
-msgid "Show appointment end times"
-msgstr "_Coinne"
+msgid "Time"
+msgstr "_FillteАn"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show week numbers"
+msgid "Time divisions:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Start of day:"
+msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "Sun"
+msgid "Time zone:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:483
-#, fuzzy
-msgid "Sunday"
-msgstr "Post"
+msgid "Tue"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#, fuzzy
-msgid "TaskPad"
-msgstr "_Teacs"
+#: calendar/gui/dialogs/recurrence-page.c:966
+msgid "Tuesday"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Thu"
+msgid "Wed"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:480
-msgid "Thursday"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
+msgid "Work Week"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "Time divisions:"
+msgid "minutes before they occur."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time format:"
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-msgid "Tue"
+#: calendar/gui/dialogs/cancel-comp.c:58
+msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:478
-msgid "Tuesday"
+#: calendar/gui/dialogs/cancel-comp.c:63
+msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
+#: calendar/gui/dialogs/cancel-comp.c:68
+msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Wed"
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:479
-msgid "Wednesday"
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "minutes before they occur."
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
-#, fuzzy
-msgid "seconds."
-msgstr "Post"
-
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
+msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:73
-msgid "Are you sure you want to delete this untitled appointment?"
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:79
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:82
-msgid "Are you sure you want to delete this untitled task?"
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:88
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
+msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:91
-msgid "Are you sure want to delete this untitled journal entry?"
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr ""
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "_Nota"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Classification"
-msgstr ""
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "_Nota"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "Date & Time"
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/comp-editor.c:449
 #, fuzzy
-msgid "Pri_vate"
-msgstr "PriontАil"
+msgid "Edit Appointment"
+msgstr "_Coinne"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr ""
+#: calendar/gui/dialogs/comp-editor.c:454
+#, fuzzy, c-format
+msgid "Appointment - %s"
+msgstr "_Coinne"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Pu_blic"
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
-#, fuzzy
-msgid "Su_mmary:"
-msgstr "Post"
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-#, fuzzy
-msgid "Task"
-msgstr "_Teacs"
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Confidential"
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
+#: calendar/gui/dialogs/delete-comp.c:84
+#, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#, fuzzy
-msgid "_Priority:"
-msgstr "TosaМocht"
+#: calendar/gui/dialogs/delete-comp.c:87
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
+#: calendar/gui/dialogs/delete-comp.c:93
+#, c-format
+msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:697
-msgid "Edit Task"
+#: calendar/gui/dialogs/delete-comp.c:96
+msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
-msgid "No summary"
+#: calendar/gui/dialogs/delete-comp.c:102
+#, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
-#, fuzzy, c-format
-msgid "Appointment - %s"
-msgstr "_Coinne"
+#: calendar/gui/dialogs/delete-comp.c:105
+msgid "Are you sure want to delete this untitled journal entry?"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
+#: calendar/gui/dialogs/delete-comp.c:120
 #, c-format
-msgid "Task - %s"
+msgid "Are you sure you want to delete %d appointments?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
+#: calendar/gui/dialogs/delete-comp.c:125
 #, c-format
-msgid "Journal entry - %s"
+msgid "Are you sure you want to delete %d tasks?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
+#: calendar/gui/dialogs/delete-comp.c:130
+#, c-format
+msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Completion Date"
-msgstr ""
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "FillteАn _Nua"
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "End Date"
-msgstr ""
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "FillteАn _Nua"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Start Date"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+msgid "Time Zones"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:164
-msgid "Percent complete"
-msgstr ""
+#: calendar/gui/dialogs/event-editor.c:154
+#, fuzzy
+msgid "Appointment"
+msgstr "_Coinne"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/dialogs/event-editor.c:159
 #, fuzzy
-msgid "Summary"
+msgid "Reminder"
 msgstr "Post"
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+msgid "Meeting"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:170
-msgid "Click here to add a task"
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
+msgid "Classification"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:374
-#, c-format
-msgid "0%"
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
+msgid "Date & Time"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:375
-#, c-format
-msgid "10%"
-msgstr ""
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "Pri_vate"
+msgstr "PriontАil"
 
-#: calendar/gui/e-calendar-table.c:376
-#, c-format
-msgid "20%"
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
+msgid "Pu_blic"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:377
-#, c-format
-msgid "30%"
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
+#, fuzzy
+msgid "Su_mmary:"
+msgstr "Post"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
+msgid "_Confidential"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:378
-#, c-format
-msgid "40%"
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:379
-#, c-format
-msgid "50%"
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:380
-#, c-format
-msgid "60%"
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:381
-#, c-format
-msgid "70%"
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+msgid "Group"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:382
-#, c-format
-msgid "80%"
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+msgid "Resource"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:383
-#, c-format
-msgid "90%"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:384
-#, c-format
-msgid "100%"
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit this task..."
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:558
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
 #, fuzzy
-msgid "Edit the task"
-msgstr "ScrМos an sceal seo"
+msgid "Needs Action"
+msgstr "ScrМos"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Accepted"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
 #, fuzzy
-msgid "Delete this task"
-msgstr "ScrМos an sceal seo"
+msgid "Declined"
+msgstr "ScrМos"
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:561
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
 #, fuzzy
-msgid "Delete the task"
-msgstr "ScrМos an sceal seo"
+msgid "Delegated"
+msgstr "ScrМos"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+msgid "In Process"
 msgstr ""
 
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
-msgid "%A %d %B"
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
 msgstr ""
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Chair Persons"
 msgstr ""
 
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
-#: calendar/gui/e-week-view-main-item.c:348
-msgid "%d %b"
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+msgid "Required Participants"
 msgstr ""
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Optional Participants"
 msgstr ""
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Non-Participants"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
+#: calendar/gui/dialogs/meeting-page.c:891
 #, fuzzy
-msgid "New Appointment"
-msgstr "_Coinne"
+msgid "Sent By:"
+msgstr "Post"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "ScrМos"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
-msgid "New All Day Event"
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
-#, fuzzy
-msgid "Go to Today"
-msgstr "SАbhАil 'san _fillteАn"
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+msgid "Common Name"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
 #, fuzzy
-msgid "Go to Date..."
-msgstr "SАbhАil 'san _fillteАn"
+msgid "Delegated From"
+msgstr "ScrМos"
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: mail/folder-browser.c:566 ui/evolution-calendar.xml.h:19
-#: ui/evolution-message-composer.xml.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
 #, fuzzy
-msgid "Open"
-msgstr "_OscАil"
+msgid "Delegated To"
+msgstr "ScrМos"
 
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
-#, fuzzy
-msgid "Delete this Appointment"
-msgstr "ScrМos an sceal seo"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+msgid "Language"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+msgid "Member"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
-#, fuzzy
-msgid "Make this Occurrence Movable"
-msgstr "ScrМos an sceal seo"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
 #, fuzzy
-msgid "Delete this Occurrence"
-msgstr "ScrМos an sceal seo"
+msgid "Role"
+msgstr "ScrМos"
 
-#: calendar/gui/e-day-view.c:3179
-#, fuzzy
-msgid "Delete all Occurrences"
-msgstr "ScrМos an sceal seo"
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
-msgid "Component successfully updated."
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+msgid "_Change Organizer"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+msgid "_Invite Others"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+msgid "_Other Organizer"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:499
-msgid "I couldn't update your calendar store."
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Component successfully deleted."
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-msgid "I don't recognize this type of calendar component."
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
-msgid " Accept "
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:815
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
 #, fuzzy
-msgid " Decline "
-msgstr "ScrМos"
+msgid "Exceptions"
+msgstr "_OscАil"
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Tentative "
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:2
-#, no-c-format
-msgid "%P %%"
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:3
-msgid "--to--"
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+msgid "_Modify"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:4
-#, fuzzy
-msgid "Calendar Message"
-msgstr "Post an sceАl seo"
-
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
-#, fuzzy
-msgid "Date:"
-msgstr "ScrМos"
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:8
-msgid "Loading calendar..."
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:10
-#, fuzzy
-msgid "Server Message:"
-msgstr "Post"
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:11
-#, fuzzy
-msgid "Summary:"
-msgstr "Post"
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "ScrМos"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "ScrМos"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "_Nota"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
+#: calendar/gui/dialogs/task-editor.c:130
+#, fuzzy
+msgid "Task"
+msgstr "_Teacs"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
+#: calendar/gui/dialogs/task-page.glade.h:22
+#, fuzzy
+msgid "_Priority:"
+msgstr "TosaМocht"
+
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
+#: calendar/gui/e-calendar-table.c:351
+#, c-format
+msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
+#: calendar/gui/e-calendar-table.c:352
+#, c-format
+msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Required Participant"
+#: calendar/gui/e-calendar-table.c:353
+#, c-format
+msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:21
-#, fuzzy
-msgid "Role"
-msgstr "ScrМos"
+#: calendar/gui/e-calendar-table.c:354
+#, c-format
+msgid "30%"
+msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:22
-msgid ""
-"Schedule\n"
-"Time"
+#: calendar/gui/e-calendar-table.c:355
+#, c-format
+msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:33
-#: mail/message-list.c:1052
-msgid "Status"
+#: calendar/gui/e-calendar-table.c:356
+#, c-format
+msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
-msgid "All"
+#: calendar/gui/e-calendar-table.c:357
+#, c-format
+msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:155
-msgid "Category:"
+#: calendar/gui/e-calendar-table.c:358
+#, c-format
+msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
-msgid "Could not load the tasks in `%s'"
+msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
-msgid "The method required to load `%s' is not supported"
+msgid "90%"
 msgstr ""
 
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
-msgid "%d %B"
+#: calendar/gui/e-calendar-table.c:361
+#, c-format
+msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
 #, fuzzy
-msgid "New Appointment..."
-msgstr "_Coinne"
+msgid "_Open"
+msgstr "_OscАil"
 
-#: calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 #, fuzzy
-msgid "Delete All Occurrences"
-msgstr "ScrМos an sceal seo"
+msgid "C_ut"
+msgstr "Gearr"
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+#, fuzzy
+msgid "_Copy"
+msgstr "Greamaigh"
 
-#: calendar/gui/event-editor-dialog.glade.h:3
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
 #, fuzzy
-msgid "Appointment"
-msgstr "_Coinne"
+msgid "_Paste"
+msgstr "PriontАil"
 
-#: calendar/gui/event-editor-dialog.glade.h:4
+#: calendar/gui/e-calendar-table.c:861
 #, fuzzy
-msgid "Appointment Basics"
-msgstr "_Coinne"
+msgid "_Mark as Complete"
+msgstr "_Post sceАl"
 
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
+msgstr "ScrМos an sceal seo"
 
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
+msgstr "_Post sceАl"
 
-#: calendar/gui/event-editor-dialog.glade.h:11
+#: calendar/gui/e-calendar-table.c:868
 #, fuzzy
-msgid "Exceptions"
-msgstr "_OscАil"
+msgid "_Delete Selected Tasks"
+msgstr "ScrМos an sceal seo"
 
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "_Nota"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1579
-msgid "Play a sound"
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+#, fuzzy
+msgid "Complete"
+msgstr "_Nota"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:20
-#, fuzzy
-msgid "Reminder"
-msgstr "Post"
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1588
-msgid "Run a program"
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "TosaМocht"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1585
+#: calendar/gui/e-calendar-table.etspec.h:14
 #, fuzzy
-msgid "Send an email"
+msgid "Summary"
 msgstr "Post"
 
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1582
-msgid "Show a dialog"
-msgstr ""
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "_Teacs"
 
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
+msgid "%A %d %B"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:36
-msgid "after"
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
+#: calendar/gui/e-week-view-main-item.c:348
+msgid "%d %b"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
-msgid "before"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:36
+#: calendar/gui/e-day-view.c:3306
 #, fuzzy
-msgid "end of appointment"
+msgid "New _Appointment"
 msgstr "_Coinne"
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr ""
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
+msgstr "ScrМos an sceal seo"
 
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr ""
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
+msgstr "SАbhАil 'san _fillteАn"
 
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
-msgid "minute(s)"
-msgstr ""
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
+msgstr "ScrМos an sceal seo"
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr ""
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
+msgstr "ScrМos an sceal seo"
 
-#: calendar/gui/event-editor-dialog.glade.h:42
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
 #, fuzzy
-msgid "start of appointment"
-msgstr "_Coinne"
+msgid "Delete this _Occurrence"
+msgstr "ScrМos an sceal seo"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "until"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
+msgstr "ScrМos an sceal seo"
+
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "week(s)"
+#: calendar/gui/e-itip-control.c:697
+msgid "This is a meeting request."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "year(s)"
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
 msgstr ""
 
-#: calendar/gui/event-editor.c:373
-#, fuzzy
-msgid "Edit Appointment"
-msgstr "_Coinne"
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
+msgstr ""
 
-#: calendar/gui/event-editor.c:451
-msgid "on"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
-msgid "day"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
 msgstr ""
 
-#: calendar/gui/event-editor.c:603
-msgid "on the"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+msgid "The message is not understandable."
 msgstr ""
 
-#: calendar/gui/event-editor.c:610
-msgid "th"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/event-editor.c:756
-msgid "occurrences"
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:873
-msgid "This appointment contains recurrences that Evolution cannot edit."
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1534
-#, c-format
-msgid " %d days"
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1536
-msgid " 1 day"
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1539
-#, c-format
-msgid " %d weeks"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1541
-msgid " 1 week"
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1544
-#, c-format
-msgid " %d hours"
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1546
-msgid " 1 hour"
+#: calendar/gui/e-itip-control.c:834
+msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1549
-#, c-format
-msgid " %d minutes"
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1551
-msgid " 1 minute"
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1554
-#, fuzzy, c-format
-msgid " %d seconds"
-msgstr "Post"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr ""
 
-#: calendar/gui/event-editor.c:1556
-#, fuzzy
-msgid " 1 second"
-msgstr "Post"
+#: calendar/gui/e-itip-control.c:1015
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr ""
 
-#: calendar/gui/event-editor.c:1603
-#, fuzzy
-msgid " before start of appointment"
-msgstr "ScrМos an sceal seo"
+#: calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr ""
 
-#: calendar/gui/event-editor.c:1605
-#, fuzzy
-msgid " after start of appointment"
-msgstr "ScrМos an sceal seo"
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
+msgstr ""
 
-#: calendar/gui/event-editor.c:1613
+#: calendar/gui/e-itip-control.glade.h:4
 #, fuzzy
-msgid " before end of appointment"
-msgstr "ScrМos an sceal seo"
+msgid "Calendar Message"
+msgstr "Post an sceАl seo"
 
-#: calendar/gui/event-editor.c:1615
+#: calendar/gui/e-itip-control.glade.h:5
 #, fuzzy
-msgid " after end of appointment"
-msgstr "_Coinne"
+msgid "Date:"
+msgstr "ScrМos"
 
-#: calendar/gui/event-editor.c:3123 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+#: calendar/gui/e-itip-control.glade.h:8
+msgid "Loading calendar..."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
+#: calendar/gui/e-itip-control.glade.h:10
+#, fuzzy
+msgid "Server Message:"
+msgstr "Post"
+
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
+#: calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
+msgid "All"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
+#: calendar/gui/e-tasks.c:252
+msgid "Category:"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
+#: calendar/gui/e-tasks.c:403
+#, c-format
+msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
+#: calendar/gui/e-tasks.c:415
+#, c-format
+msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
+msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:700
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "_Coinne"
+
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:711
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -2898,238 +3530,256 @@ msgid "Go To Date"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
+msgid "January"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:7
-msgid "January"
+msgid "July"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:8
-msgid "July"
+msgid "June"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:9
-msgid "June"
+msgid "March"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:10
-msgid "March"
+msgid "May"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:11
-msgid "May"
+msgid "November"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:12
-msgid "November"
+msgid "October"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:13
-msgid "October"
+msgid "September"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:14
-msgid "September"
+#, fuzzy
+msgid "_Go To Today"
+msgstr "SАbhАil 'san _fillteАn"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 #, fuzzy
 msgid "Fr"
 msgstr "с:"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr ""
 
-#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
 #, fuzzy
 msgid "Tasks"
 msgstr "_Teacs"
 
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1104
+#: calendar/gui/print.c:1846
 #, c-format
-msgid "Current week (%s - %s)"
+msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1342
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:52
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "ScrМos an sceal seo"
+
+#: calendar/gui/print.c:2398
+#, fuzzy
+msgid "Print Setup"
+msgstr "PriontАil"
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr ""
 
@@ -3165,85 +3815,104 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:207
+#: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:245
+#: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:326
+#: camel/camel-cipher-context.c:336
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 #, fuzzy
 msgid "Syncing folders"
 msgstr "FillteАn _Nua"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 #, fuzzy
 msgid "Getting message %d (%d%%)"
 msgstr "_Post sceАl"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, fuzzy, c-format
-msgid "Failed message %d"
+msgid "Failed on message %d"
 msgstr "_Post sceАl"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 #, fuzzy
 msgid "Cannot open message"
 msgstr "_Post sceАl"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 #, fuzzy
 msgid "Syncing folder"
 msgstr "FillteАn _Nua"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-#, fuzzy
-msgid "Complete"
-msgstr "_Nota"
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "_Post sceАl"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "Post an sceАl seo"
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -3275,14 +3944,33 @@ msgstr ""
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
+#: camel/camel-lock-client.c:110
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:123
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, c-format
+msgid "Could not lock '%s'"
+msgstr ""
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3297,113 +3985,108 @@ msgstr ""
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:199
+#: camel/camel-movemail.c:159
 #, c-format
-msgid "Could not test lock file for %s: %s"
+msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:245
+#: camel/camel-movemail.c:189
 #, c-format
-msgid "Error reading mail file: %s"
+msgid "Could not create pipe: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:256
+#: camel/camel-movemail.c:201
 #, c-format
-msgid "Error writing mail temp file: %s"
+msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:239
 #, c-format
-msgid "Failed to store mail in temp file %s: %s"
+msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:306
-#, c-format
-msgid "Could not create pipe: %s"
+#: camel/camel-movemail.c:240
+msgid "(Unknown error)"
 msgstr ""
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:263
 #, c-format
-msgid "Could not fork: %s"
+msgid "Error reading mail file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:274
 #, c-format
-msgid "Movemail program failed: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:357
-msgid "(Unknown error)"
+msgid "Error writing mail temp file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:186
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:189
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:509
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
-#: camel/camel-pgp-context.c:1021 camel/camel-pgp-context.c:1235
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr ""
 
-#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
-#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1028
-#: camel/camel-pgp-context.c:1242
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:681
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:871
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr ""
 
-#: camel/camel-pgp-context.c:888
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1011
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr ""
 
-#: camel/camel-pgp-context.c:1037
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1227
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -3422,37 +4105,37 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:264
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr ""
 
@@ -3549,145 +4232,238 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:417
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
+msgstr ""
+
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
 msgstr ""
 
-#: camel/camel-search-private.c:110
+#: camel/camel-sasl-login.c:127
+msgid "Unknown authentication state."
+msgstr ""
+
+#: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:152
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:168
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:554
+#: camel/camel-service.c:548
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:581
+#: camel/camel-service.c:575
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:606
+#: camel/camel-service.c:600
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:608
+#: camel/camel-service.c:602
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:57
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:59
+#: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:274 camel/camel-session.c:364
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:462
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
 
-#. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:994 mail/mail-ops.c:1001
-#: mail/mail-ops.c:1019 mail/mail-ops.c:1020
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr ""
+
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr ""
+
+#: camel/camel-smime-context.c:249
+#, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr ""
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr ""
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
 #, fuzzy
-msgid "Trash"
-msgstr "_Teacs"
+msgid "Failed to decode message."
+msgstr "_Post sceАl"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
+#, fuzzy, c-format
+msgid ""
+"Issuer: %s\n"
+"Subject: %s"
+msgstr "Abair"
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
 
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "Post an sceАl seo"
 
-#: camel/camel-vee-folder.c:545
+#: camel/camel-vee-folder.c:547
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "Post an sceАl seo"
 
-#: camel/providers/imap/camel-imap-command.c:209
+#: camel/camel-vtrash-folder.c:109
+msgid "You cannot copy messages from this trash folder."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:217
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:272
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:456
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:490
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:172
+#: camel/providers/imap/camel-imap-folder.c:192
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:351
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
+msgstr ""
+
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
 #, fuzzy
-msgid "Scanning IMAP folder"
-msgstr "FillteАn _Nua"
+msgid "Scanning for changed messages"
+msgstr "_Post sceАl"
 
-#: camel/providers/imap/camel-imap-folder.c:986
-#: camel/providers/imap/camel-imap-folder.c:1197
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1016
-#: camel/providers/imap/camel-imap-folder.c:1231
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "_Post sceАl"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr ""
 
@@ -3696,7 +4472,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr "FillteАn _Nua"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:484
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 #, fuzzy
 msgid "Folders"
 msgstr "_FillteАn"
@@ -3730,28 +4506,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:440
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:450
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:475
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:490
-#: camel/providers/smtp/camel-smtp-transport.c:403
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3759,117 +4535,126 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:865
-#, c-format
-msgid "%s is not a selectable folder"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:879
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr ""
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#, fuzzy, c-format
+msgid "No such folder %s"
+msgstr "Post an sceАl seo"
 
-#: camel/providers/imap/camel-imap-store.c:1382
-msgid "You must be working online to complete this operation"
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-provider.c:70
+msgid "Unix mbox spool-format mail files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:71
+msgid "For storing local mail in standard Unix spool directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:136
+#: camel/providers/local/camel-local-store.c:134
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:144
-#: camel/providers/local/camel-local-store.c:160
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:175
+#: camel/providers/local/camel-local-store.c:173
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:241
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:283
+#: camel/providers/local/camel-local-store.c:279
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:293
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
+msgid "Unable to add message to summary: unknown reason"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 #, fuzzy
 msgid "No such message"
 msgstr "Post an sceАl seo"
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -3877,14 +4662,14 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -3892,28 +4677,41 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr ""
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
+#, c-format
+msgid "Cannot open maildir directory path: %s: %s"
+msgstr ""
+
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
@@ -3923,20 +4721,25 @@ msgstr ""
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -3975,82 +4778,99 @@ msgstr ""
 
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 #, fuzzy
 msgid "Summarising folder"
 msgstr "FillteАn _Nua"
 
-#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:501
-#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:506
-#: camel/providers/local/camel-mbox-summary.c:707
+#: camel/providers/local/camel-mbox-summary.c:507
+#: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:523
+#: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:556
-#: camel/providers/local/camel-mbox-summary.c:745
-#: camel/providers/local/camel-mbox-summary.c:753
+#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:557
+#: camel/providers/local/camel-mbox-summary.c:746
+#: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:616
+#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:634
-#: camel/providers/local/camel-mbox-summary.c:803
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:643
+#: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:654
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
@@ -4060,39 +4880,97 @@ msgstr ""
 msgid "`%s' is not a directory."
 msgstr ""
 
+#: camel/providers/local/camel-mh-summary.c:218
+#, c-format
+msgid "Cannot open MH directory path: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-folder.c:465
+#, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:132
+#, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:159
+#, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:176
+msgid "Spool stores do not have an inbox"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:186
+#, c-format
+msgid "Spool mail file %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -4105,24 +4983,24 @@ msgstr ""
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:226
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:288
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:295
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
@@ -4132,21 +5010,31 @@ msgstr ""
 msgid "Retrieving POP summary"
 msgstr "_Post sceАl"
 
-#: camel/providers/pop3/camel-pop3-folder.c:192
+#: camel/providers/pop3/camel-pop3-folder.c:155
+#, c-format
+msgid "Could not check POP server for new messages: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:199
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:292
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:289
+#: camel/providers/pop3/camel-pop3-folder.c:296
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "_Post sceАl"
 
-#: camel/providers/pop3/camel-pop3-folder.c:307
+#: camel/providers/pop3/camel-pop3-folder.c:303
+#, fuzzy, c-format
+msgid "Could not fetch message: %s"
+msgstr "Post an sceАl seo"
+
+#: camel/providers/pop3/camel-pop3-folder.c:320
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
@@ -4166,7 +5054,7 @@ msgstr "_Post sceАl"
 msgid "Delete after %s day(s)"
 msgstr "ScrМos an sceal seo"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr ""
 
@@ -4194,53 +5082,58 @@ msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:207
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:319
+#: camel/providers/pop3/camel-pop3-store.c:215
+#, c-format
+msgid "Could not connect to server: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:358
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:377
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:380
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:407
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:483
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Sendmail"
 msgstr "Post"
@@ -4293,7 +5186,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr ""
 
@@ -4301,124 +5194,124 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 #, fuzzy
 msgid "Help message"
 msgstr "Post an sceАl seo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 #, fuzzy
 msgid "Service ready"
 msgstr "Post"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4426,192 +5319,196 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:527
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:575
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#, fuzzy
+msgid "Sending message"
+msgstr "Post an sceАl seo"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:721
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:736
 #: camel/providers/smtp/camel-smtp-transport.c:748
+msgid "SMTP Authentication"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:782
+msgid "AUTH request failed."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:824
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:843
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:887
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:952
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytanna"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
-msgid "Attachment"
-msgstr ""
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr ""
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:7
-#, fuzzy
-msgid "Send as:"
-msgstr "Post"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
+msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:321
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr ""
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
+#: composer/e-msg-composer-hdrs.c:359
 #, fuzzy
 msgid "From:"
 msgstr "с:"
@@ -4619,7 +5516,7 @@ msgstr "с:"
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
+#: composer/e-msg-composer-hdrs.c:365
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Freagrair"
@@ -4627,121 +5524,155 @@ msgstr "Freagrair"
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Abair:"
 
-#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "Do:"
 
-#: composer/e-msg-composer-hdrs.c:384
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
 
-#: composer/e-msg-composer.c:528
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr ""
+
+#: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:716
+#: composer/e-msg-composer.c:683
+#, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr ""
+
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:727
+#: composer/e-msg-composer.c:882
+msgid "Warning!"
+msgstr ""
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:819
+#: composer/e-msg-composer.c:997
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: composer/e-msg-composer.c:877 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:883
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
+#: composer/e-msg-composer.c:1047
+#, c-format
+msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:908
-msgid "Open file"
+#: composer/e-msg-composer.c:1055
+msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1034
-msgid "That file does not exist."
+#: composer/e-msg-composer.c:1061
+#, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1044
-msgid "That is not a regular file."
+#: composer/e-msg-composer.c:1067
+#, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1054
-msgid "That file exists but is not readable."
-msgstr ""
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr "_Post sceАl"
 
-#: composer/e-msg-composer.c:1064
-msgid "That file appeared accesible but open(2) failed."
+#: composer/e-msg-composer.c:1173
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1086
+#: composer/e-msg-composer.c:1321
 msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1107
-msgid "An error occurred while reading the file."
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
+msgid "Open file"
+msgstr ""
+
+#: composer/e-msg-composer.c:1500
+msgid "Insert File"
 msgstr ""
 
-#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 #, fuzzy
 msgid "Compose a message"
 msgstr "Post an sceАl seo"
 
-#: composer/e-msg-composer.c:1829
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:355
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:370
+#: composer/evolution-composer.c:374
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
@@ -4758,307 +5689,134 @@ msgid "calendar information"
 msgstr ""
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr ""
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+msgid "%I:%M:%S %p"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+msgid "%H:%M:%S"
 msgstr ""
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr ""
+
+#: e-util/e-time-utils.c:240
+msgid "%d/%m/%Y"
+msgstr ""
+
+#: e-util/e-time-utils.c:241
+msgid "%Y/%m/%d"
+msgstr ""
+
+#: e-util/e-time-utils.c:242
+#, c-format
+msgid "%x"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
 msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr ""
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1257
-#: widgets/misc/e-dateedit.c:1316 widgets/misc/e-dateedit.c:1495
-msgid "%H:%M"
-msgstr ""
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-msgid "%H:%M:%S"
-msgstr ""
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1260
-#: widgets/misc/e-dateedit.c:1319 widgets/misc/e-dateedit.c:1498
-msgid "%I:%M %p"
-msgstr ""
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-msgid "%I:%M:%S %p"
-msgstr ""
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr ""
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr ""
-
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Post"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:76
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "FillteАn _Nua"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "FillteАn _Nua"
-
-#: executive-summary/component/e-summary.c:924
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:938
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:956
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr ""
-
-#: executive-summary/component/main.c:62
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-#, fuzzy
-msgid "RDF Summary"
-msgstr "Post"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:768
-msgid "Update automatically"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:778
-msgid "Update now"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:788
-msgid "Update every "
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:796
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr ""
-
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr ""
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr ""
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr ""
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr ""
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr ""
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr ""
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr ""
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr ""
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr ""
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr ""
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 #, fuzzy
 msgid "second"
 msgstr "Post"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr ""
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
 
-#: filter/filter-datespec.c:298
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:338
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5066,28 +5824,36 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr ""
 
-#: filter/filter-datespec.c:373
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr ""
 
 #. The label
-#: filter/filter-datespec.c:432
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr ""
 
-#: filter/filter-datespec.c:706
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr ""
 
@@ -5096,11 +5862,11 @@ msgid "Filter Rules"
 msgstr ""
 
 #. and now for the action area
-#: filter/filter-filter.c:453
+#: filter/filter-filter.c:452
 msgid "Then"
 msgstr ""
 
-#: filter/filter-filter.c:467
+#: filter/filter-filter.c:466
 msgid "Add action"
 msgstr ""
 
@@ -5110,28 +5876,28 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 #, fuzzy
 msgid "Select Folder"
 msgstr "FillteАn _Nua"
 
-#: filter/filter-folder.c:247
+#: filter/filter-folder.c:250
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:293
+#: filter/filter-folder.c:296
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-input.c:194
+#: filter/filter-input.c:193
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-part.c:475
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr ""
 
@@ -5143,26 +5909,45 @@ msgstr ""
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr ""
 
+#: filter/filter-rule.c:771
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:771
+msgid "outgoing"
+msgstr ""
+
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr ""
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr ""
+
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr ""
@@ -5206,373 +5991,509 @@ msgstr ""
 msgid "with all local folders"
 msgstr ""
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
+#: filter/libfilter-i18n.h:3
+msgid "Assign Color"
 msgstr ""
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr ""
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr ""
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr ""
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr ""
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr ""
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 #, fuzzy
 msgid "Deleted"
 msgstr "ScrМos"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr ""
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr ""
+
+#: filter/libfilter-i18n.h:16
+msgid "does not sound like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:19
 #, fuzzy
 msgid "Draft"
 msgstr "ScrМos"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:20
+msgid "ends with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:21
 msgid "Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:13
-msgid "Expression"
+#: filter/libfilter-i18n.h:22
+msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:14
-msgid "Forward to Address"
+#: filter/libfilter-i18n.h:23
+msgid "Expression"
 msgstr ""
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:24
 msgid "Important"
 msgstr ""
 
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "Is Not"
-msgstr "_Nota"
+#: filter/libfilter-i18n.h:25
+msgid "is"
+msgstr ""
 
-#: filter/libfilter-i18n.h:17
-msgid "Is"
+#: filter/libfilter-i18n.h:26
+msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:27
+msgid "is less than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:28
+msgid "is not"
+msgstr ""
+
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr ""
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "Move to Folder"
 msgstr "FillteАn _Nua"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:35
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:36
+msgid "on or before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
 #, fuzzy
 msgid "Read"
 msgstr "ScrМos"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28 filter/score-rule.c:203 filter/score-rule.c:205
-#: mail/message-list.c:1052
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 #, fuzzy
 msgid "Sender"
 msgstr "Post"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "MИid"
+
+#: filter/libfilter-i18n.h:45
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:46
 msgid "Source Account"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:48
+msgid "starts with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Abair"
 
-#: filter/libfilter-i18n.h:38
-msgid "contains"
+#: filter/libfilter-i18n.h:52
+msgid "was after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:39
-msgid "does not contain"
+#: filter/libfilter-i18n.h:53
+msgid "was before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
-msgid "does not end with"
+#: filter/rule-editor.c:147
+#, fuzzy
+msgid "Rules"
+msgstr "ScrМos"
+
+#: filter/rule-editor.c:240
+msgid "Add Rule"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
-msgid "does not exist"
+#: filter/rule-editor.c:299
+#, fuzzy
+msgid "Edit Rule"
+msgstr "_FillteАn"
+
+#: filter/score-editor.c:130
+msgid "Score Rules"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42
-msgid "does not sound like"
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
-msgid "does not start with"
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44
-msgid "ends with"
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "Mail"
+msgstr "Post"
+
+#: importers/elm-importer.c:498
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
 msgstr ""
 
-#: filter/libfilter-i18n.h:45
-msgid "exists"
+#: importers/elm-importer.c:527
+#, fuzzy
+msgid "Elm mail"
+msgstr "Post"
+
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+msgid "Addressbook"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46
-msgid "is greater than"
+#: importers/evolution-gnomecard-importer.c:253
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47
-msgid "is less than"
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "Post"
+
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
-msgid "is not"
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
-msgid "is"
+#: importers/pine-importer.c:691
+#, fuzzy
+msgid "Pine mail"
+msgstr "Post"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
-msgid "on or after"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
-msgid "on or before"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
 msgstr ""
 
-#: filter/libfilter-i18n.h:52
-msgid "sounds like"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
 msgstr ""
 
-#: filter/libfilter-i18n.h:53
-msgid "starts with"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
 msgstr ""
 
-#: filter/libfilter-i18n.h:54
-msgid "was after"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
 msgstr ""
 
-#: filter/libfilter-i18n.h:55
-msgid "was before"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
 msgstr ""
 
-#: filter/score-editor.c:130
-msgid "Score Rules"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+msgid "Mail configuration interface"
 msgstr ""
 
-#: mail/component-factory.c:329
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "PriontАil"
+
+#: mail/component-factory.c:337
+msgid "Change this folder's properties"
+msgstr ""
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-factory.c:209
+#: mail/folder-browser-ui.c:254
 #, c-format
 msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser-factory.c:211 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
+#: mail/folder-browser-ui.c:256
 msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:225
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr ""
+
+#: mail/folder-browser.c:893
 #, fuzzy
 msgid "Store search as vFolder"
 msgstr "FillteАn _Nua"
 
-#: mail/folder-browser.c:533
-msgid "VFolder on Subject"
-msgstr ""
+#: mail/folder-browser.c:1238
+#, fuzzy
+msgid "VFolder on _Subject"
+msgstr "Abair"
 
-#: mail/folder-browser.c:536
-msgid "VFolder on Sender"
+#: mail/folder-browser.c:1241
+msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:539
-msgid "VFolder on Recipients"
+#: mail/folder-browser.c:1244
+msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:542 mail/folder-browser.c:733
-msgid "VFolder on Mailing List"
-msgstr ""
+#: mail/folder-browser.c:1247
+#, fuzzy
+msgid "VFolder on Mailing _List"
+msgstr "Abair"
 
-#: mail/folder-browser.c:548
-msgid "Filter on Subject"
-msgstr ""
+#: mail/folder-browser.c:1253
+#, fuzzy
+msgid "Filter on Sub_ject"
+msgstr "Abair"
 
-#: mail/folder-browser.c:551
-msgid "Filter on Sender"
-msgstr ""
+#: mail/folder-browser.c:1256
+#, fuzzy
+msgid "Filter on Sen_der"
+msgstr "Abair"
 
-#: mail/folder-browser.c:554
-msgid "Filter on Recipients"
-msgstr ""
+#: mail/folder-browser.c:1259
+#, fuzzy
+msgid "Filter on Re_cipients"
+msgstr "Abair"
 
-#: mail/folder-browser.c:557 mail/folder-browser.c:732
-msgid "Filter on Mailing List"
+#: mail/folder-browser.c:1262
+msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:1273
 #, fuzzy
 msgid "Resend"
 msgstr "Post"
 
-#: mail/folder-browser.c:570
-msgid "Save As..."
-msgstr ""
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
+#, fuzzy
+msgid "_Save As..."
+msgstr "SАbhАil 'san _fillteАn"
 
-#: mail/folder-browser.c:577
-msgid "Reply to Sender"
-msgstr ""
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#, fuzzy
+msgid "_Print"
+msgstr "PriontАil"
 
-#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:60
-msgid "Reply to All"
-msgstr ""
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#, fuzzy
+msgid "_Reply to Sender"
+msgstr "Freagrair"
 
-#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:24
-msgid "Forward"
-msgstr "Sheoladh Chuig duine"
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "Freagrair"
 
-#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:26
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 #, fuzzy
-msgid "Forward inline"
+msgid "Reply to _All"
+msgstr "Freagrair"
+
+#: mail/folder-browser.c:1288
+#, fuzzy
+msgid "_Forward"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/folder-browser.c:586
-msgid "Mark as Read"
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+msgid "Mar_k as Read"
+msgstr ""
+
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+msgid "Mark as U_nread"
+msgstr ""
+
+#: mail/folder-browser.c:1295
+msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:588
-msgid "Mark as Unread"
+#: mail/folder-browser.c:1297
+msgid "Mark as Unim_portant"
 msgstr ""
 
-#: mail/folder-browser.c:593
+#: mail/folder-browser.c:1302
 #, fuzzy
-msgid "Move to Folder..."
+msgid "_Move to Folder..."
 msgstr "SАbhАil 'san _fillteАn"
 
-#: mail/folder-browser.c:595
-msgid "Copy to Folder..."
-msgstr ""
+#: mail/folder-browser.c:1304
+#, fuzzy
+msgid "_Copy to Folder..."
+msgstr "_FillteАn"
 
-#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:81
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 #, fuzzy
-msgid "Undelete"
+msgid "_Undelete"
 msgstr "ScrМos"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:1313
+msgid "Add Sender to Address Book"
+msgstr ""
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:613
-msgid "Create Rule From Message"
+#: mail/folder-browser.c:1322
+#, fuzzy
+msgid "Create Ru_le From Message"
+msgstr "Post an sceАl seo"
+
+#: mail/folder-browser.c:1479
+msgid "Filter on Mailing List"
+msgstr ""
+
+#: mail/folder-browser.c:1480
+msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:736
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+msgid "Factory to import mbox into Evolution"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+msgid "Imports mbox files into Evolution"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+msgid "Factory to import Outlook Express 4 mails into Evolution"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+msgid "Imports Outlook Express 4 files into Evolution"
 msgstr ""
 
 #: mail/local-config.glade.h:1
@@ -5608,39 +6529,66 @@ msgstr ""
 msgid "mh"
 msgstr ""
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+msgid "You have not filled in all of the required information."
+msgstr ""
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Evolution"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
+msgid "Evolution Account Editor"
+msgstr ""
+
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "FillteАn _Nua"
+
+#: mail/mail-account-gui.c:977
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+
+#: mail/mail-accounts.c:135
 #, fuzzy
 msgid " (default)"
 msgstr "ScrМos"
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
-msgid "Are you sure you want to delete this news account?"
-msgstr ""
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "ScrМos"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:536
-msgid "Evolution Account Manager"
+#: mail/mail-accounts.c:271
+msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-account-editor.c:105
-msgid "You have not filled in all of the required information."
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+msgid "Are you sure you want to delete this news account?"
 msgstr ""
 
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
-msgid "Evolution Account Editor"
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
+msgid "Evolution Account Manager"
 msgstr ""
 
 #: mail/mail-autofilter.c:70
@@ -5663,11 +6611,11 @@ msgstr ""
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5675,100 +6623,157 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:308
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:351
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:591
+#: mail/mail-callbacks.c:653
 #, c-format
-msgid "On %s, %s wrote:\n"
+msgid "On %s, %s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:773
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:876
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:878
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1019
+#: mail/mail-callbacks.c:1374
+#, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1056
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1089 mail/mail-display.c:90
-msgid "Overwrite file?"
+#: mail/mail-callbacks.c:1442
+#, c-format
+msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1093 mail/mail-display.c:94
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
+#: mail/mail-callbacks.c:1463
+msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:1137
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1139
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1253
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:51
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "_FillteАn"
+
+#: mail/mail-callbacks.c:1823
 #, fuzzy
 msgid "Print Message"
 msgstr "Post an sceАl seo"
 
-#: mail/mail-callbacks.c:1349
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-config.c:1043 mail/mail-config.c:1046
+#: mail/mail-callbacks.c:1966
+#, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr ""
+
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+
+#. set window title
+#: mail/mail-config-druid.c:466
+msgid "Evolution Account Wizard"
+msgstr ""
+
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 msgid "Connecting to server..."
 msgstr ""
 
@@ -5782,35 +6787,64 @@ msgid " color"
 msgstr "_FillteАn"
 
 #: mail/mail-config.glade.h:3
-msgid "Account"
+msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
 #: mail/mail-config.glade.h:4
-msgid "Account Information"
+msgid "Account"
 msgstr ""
 
 #: mail/mail-config.glade.h:5
-msgid "Account Management"
+msgid "Account Information"
 msgstr ""
 
 #: mail/mail-config.glade.h:6
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Accounts"
 msgstr "_OscАil"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr ""
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "_Nota"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -5820,439 +6854,579 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "De_fault"
 msgstr "ScrМos"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Done"
 msgstr "_Nota"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid "Drafts"
 msgstr "ScrМos"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "PriontАil"
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+msgid "Enabled"
+msgstr ""
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
-msgid "Highlight citations with "
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:42
+msgid "HTML Signature:"
+msgstr ""
+
+#: mail/mail-config.glade.h:43
+msgid "Highlight citations with"
+msgstr ""
+
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+msgid "Inline"
+msgstr ""
+
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Kerberos "
 msgstr "Post"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Sheoladh Chuig duine"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
+msgstr "FillteАn _Nua"
+
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:57
+msgid "NNTP Server:"
+msgstr ""
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "News"
 msgstr "_Nua"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr ""
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr ""
+
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "Post"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "_Nota"
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
+
+#: mail/mail-config.glade.h:84
+msgid "Security"
+msgstr ""
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Sending Email"
 msgstr "Post"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Post"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 #, fuzzy
 msgid "Sent"
 msgstr "Post"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Post an sceАl seo"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "_Post sceАl"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Server Type: "
 msgstr "Post"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+msgid "Source"
+msgstr ""
+
+#: mail/mail-config.glade.h:98
+msgid "Source Information"
+msgstr ""
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Special Folders"
 msgstr "_FillteАn"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Type"
-msgstr ""
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
-msgid "_Edit"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config-druid.c:99
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config-druid.c:101
-msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what kind of server you use, contact your system administrator or "
-"Internet Service Provider."
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "seconds."
+msgstr "Post"
+
+#: mail/mail-crypto.c:60
+msgid "Could not create a PGP signature context."
 msgstr ""
 
-#: mail/mail-config-druid.c:105
-msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know which protocol you use, contact your system administrator or "
-"Internet Service Provider."
+#: mail/mail-crypto.c:86
+msgid "Could not create a PGP verification context."
 msgstr ""
 
-#: mail/mail-config-druid.c:107
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
+#: mail/mail-crypto.c:116
+msgid "Could not create a PGP encryption context."
 msgstr ""
 
-#. set window title
-#: mail/mail-config-druid.c:445
-msgid "Evolution Account Wizard"
+#: mail/mail-crypto.c:142
+msgid "Could not create a PGP decryption context."
 msgstr ""
 
-#: mail/mail-display.c:194
-msgid "Save Attachment"
+#: mail/mail-crypto.c:177
+msgid "Could not create a S/MIME signature context."
 msgstr ""
 
-#: mail/mail-display.c:234
-#, c-format
-msgid "Could not create temporary directory: %s"
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-display.c:295
-msgid "Save to Disk..."
+#: mail/mail-crypto.c:240
+msgid "Could not create a S/MIME encryption context."
 msgstr ""
 
-#: mail/mail-display.c:297
-#, c-format
-msgid "Open in %s..."
+#: mail/mail-crypto.c:271
+msgid "Could not create a S/MIME envelope context."
+msgstr ""
+
+#: mail/mail-crypto.c:301
+msgid "Could not create a S/MIME decode context."
+msgstr ""
+
+#: mail/mail-display.c:221
+msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:299
+#: mail/mail-display.c:338
+msgid "Save to Disk..."
+msgstr ""
+
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:334
-msgid "External Viewer"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:1102
-msgid "Open link in browser"
+#: mail/mail-display.c:424
+msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1104
+#: mail/mail-display.c:1048
 #, fuzzy
-msgid "Save as (FIXME)"
-msgstr "_Post sceАl"
+msgid "Loading message content"
+msgstr "Post an sceАl seo"
+
+#: mail/mail-display.c:1404
+msgid "Open Link in Browser"
+msgstr ""
 
-#: mail/mail-display.c:1106
+#: mail/mail-display.c:1406
 #, fuzzy
-msgid "Copy location (FIXME)"
+msgid "Copy Link Location"
 msgstr "_Coinne"
 
-#: mail/mail-format.c:518
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
+msgstr "_Post sceАl"
+
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "SАbhАil 'san _fillteАn"
+
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr "Post"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:560
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:742
+#: mail/mail-format.c:746
 #, fuzzy
-msgid "Loading message content"
-msgstr "Post an sceАl seo"
+msgid "Date"
+msgstr "ScrМos"
+
+#: mail/mail-format.c:842
+msgid "Bad Address"
+msgstr ""
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#, fuzzy
+msgid "From"
+msgstr "с:"
 
-#: mail/mail-format.c:1046
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "Freagrair"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#, fuzzy
+msgid "To"
+msgstr "Do:"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Cc:"
+
+#: mail/mail-format.c:1291
+msgid "No GPG/PGP program configured."
+msgstr ""
+
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:1052
+#: mail/mail-format.c:1318
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Post an sceАl seo"
 
-#: mail/mail-format.c:1053
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1137 mail/mail-format.c:1526
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1145 mail/mail-format.c:1534
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1747
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1759
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1763
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1797
+#: mail/mail-format.c:2094
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr ""
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1802
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:337
-#, fuzzy, c-format
-msgid "No such folder %s"
-msgstr "Post an sceАl seo"
-
-#: mail/mail-local.c:509
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr ""
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:791
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:815
-#, fuzzy
-msgid "Reconfiguring folder"
-msgstr "FillteАn _Nua"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:844
-msgid "Closing current folder"
-msgstr ""
-
-#: mail/mail-local.c:876
-msgid "Renaming old folder and opening"
-msgstr ""
-
-#: mail/mail-local.c:894
-msgid "Creating new folder"
-msgstr ""
-
-#: mail/mail-local.c:908
-#, fuzzy
-msgid "Copying messages"
-msgstr "_Post sceАl"
-
-#: mail/mail-local.c:925
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:964
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+msgid "You cannot change the format of a non-local folder."
+msgstr ""
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "FillteАn _Nua"
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:192
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr ""
 
-#: mail/mail-mt.c:679 mail/session.c:98
-msgid "Do you accept?"
-msgstr ""
-
-#: mail/mail-mt.c:873
-#, fuzzy
-msgid "Evolution progress"
-msgstr "Evolution"
-
-#: mail/mail-ops.c:587
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:589
-#, fuzzy
-msgid "Sending message"
-msgstr "Post an sceАl seo"
-
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:698
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Post an sceАl seo"
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:717
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "_Post sceАl"
 
-#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:811
+#: mail/mail-ops.c:805
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "_Post sceАl"
@@ -6267,288 +7441,287 @@ msgstr "_Post sceАl"
 msgid "Copying messages to %s"
 msgstr "_Post sceАl"
 
-#: mail/mail-ops.c:900
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:904
 #, fuzzy
 msgid "Copying"
 msgstr "Greamaigh"
 
-#: mail/mail-ops.c:978
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1139
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#, fuzzy
+msgid "Trash"
+msgstr "_Teacs"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1247
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "FillteАn _Nua"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "FillteАn _Nua"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1483
+#: mail/mail-ops.c:1653
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "_Post sceАl"
 
-#: mail/mail-ops.c:1550
-#, fuzzy
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "_Post sceАl"
 
-#: mail/mail-ops.c:1560
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1634
-#, fuzzy
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "_Post sceАl"
 
-#: mail/mail-ops.c:1713
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1726
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1740
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1857
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-ops.c:2101
+#, c-format
+msgid "Disconnecting from %s"
+msgstr ""
+
+#: mail/mail-search.c:138
 #, fuzzy
-msgid "_Search"
-msgstr "_FillteАn"
+msgid "(Untitled Message)"
+msgstr "Post an sceАl seo"
+
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Post an sceАl seo"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "_Post sceАl"
+
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "_Post sceАl"
+
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-search.c:315
+#, fuzzy
+msgid "Search Forward"
+msgstr "Sheoladh Chuig duine"
+
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
+msgstr "PriontАil"
 
-#: mail/mail-send-recv.c:138
-msgid "Cancelling ..."
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "ScrМos"
+
+#: mail/mail-send-recv.c:141
+msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr ""
 
-#: mail/mail-send-recv.c:285
-msgid "Updating ..."
+#: mail/mail-send-recv.c:302
+msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
-msgid "Waiting ..."
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 #, fuzzy
 msgid "Sending"
 msgstr "Post"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr ""
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-tools.c:188
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr ""
-
-#: mail/mail-tools.c:198
-msgid "Fwd: (no subject)"
-msgstr ""
-
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:217
-msgid "Forwarded message (no subject)"
-msgstr ""
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "_Post sceАl"
 
-#: mail/mail-tools.c:414
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Post an sceАl seo"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 #, fuzzy
 msgid "VFolders"
 msgstr "_FillteАn"
 
-#: mail/mail-vfolder.c:427
+#: mail/mail-vfolder.c:463
 #, fuzzy
 msgid "New VFolder"
 msgstr "FillteАn _Nua"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:59
-msgid "Reply"
-msgstr "Freagrair"
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:65
-msgid "Reply to the sender of this message"
-msgstr ""
-
-#: mail/mail-view.c:147 ui/evolution-mail.xml.h:63
-msgid "Reply to all recipients of this message"
-msgstr ""
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:28
-msgid "Forward this message"
-msgstr ""
-
-#: mail/mail-view.c:154 ui/evolution-mail.xml.h:56
-msgid "Print the selected message"
-msgstr ""
-
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
-msgid "Delete this message"
-msgstr "ScrМos an sceal seo"
-
-#: mail/message-list.c:648
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:649
+#: mail/message-list.c:614
 #, fuzzy
 msgid "Seen"
 msgstr "Post"
 
-#: mail/message-list.c:650
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:651
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:652
+#: mail/message-list.c:617
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Post an sceАl seo"
 
-#: mail/message-list.c:656
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:657
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:661
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:662
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:912
+#: mail/message-list.c:877
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:919
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:928
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:940
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:948
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:950
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:1052
-msgid "Flagged"
-msgstr ""
-
-#: mail/message-list.c:1053
+#: mail/message-list.c:2290
 #, fuzzy
-msgid "From"
-msgstr "с:"
+msgid "Updating message list"
+msgstr "_Post sceАl"
 
-#: mail/message-list.c:1053
-#, fuzzy
-msgid "Date"
-msgstr "ScrМos"
+#: mail/message-list.etspec.h:2
+msgid "Flagged"
+msgstr ""
 
-#: mail/message-list.c:1053
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr ""
 
-#: mail/message-list.c:1054
-#, fuzzy
-msgid "To"
-msgstr "Do:"
-
-#: mail/message-list.c:1054
+#: mail/message-list.etspec.h:7
 #, fuzzy
 msgid "Size"
 msgstr "MИid"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Folder"
 msgstr "_FillteАn"
@@ -6577,157 +7750,1428 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr ""
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr ""
+
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr ""
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
 #, fuzzy
-msgid "Folder name:"
-msgstr "_FillteАn"
+msgid "Appointments"
+msgstr "_Coinne"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: my-evolution/e-summary-calendar.c:177
 #, fuzzy
-msgid "Folder type:"
+msgid "No appointments"
+msgstr "_Coinne"
+
+#: my-evolution/e-summary-calendar.c:226
+msgid "%l:%M%p"
+msgstr ""
+
+#: my-evolution/e-summary-calendar.c:228
+msgid "%a %l:%M%p"
+msgstr ""
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Post"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "Evolution"
+
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+msgid "<b>Error downloading RDF</b>"
+msgstr ""
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "_Teacs"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "Post"
+
+#: my-evolution/e-summary.c:145
+msgid "%A, %d %B %Y"
+msgstr ""
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+msgid "Printing of My Evolution failed"
+msgstr ""
+
+#: my-evolution/main.c:52
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr ""
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
 msgstr "_FillteАn"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
 msgstr ""
 
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
 msgstr ""
 
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
+#: my-evolution/metar.c:47
+msgid "Few clouds"
 msgstr ""
 
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
+#: my-evolution/metar.c:48
+msgid "Overcast"
 msgstr ""
 
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
 msgstr ""
 
-#: shell/importer/importer.c:351
-msgid "Importing"
+#: my-evolution/metar.c:63
+msgid "Variable"
 msgstr ""
 
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "_Nota"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
 msgstr ""
 
-#: shell/importer/importer.c:372
-#, c-format
-msgid "Error starting %s"
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "_Nota"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
 msgstr ""
 
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "PriontАil"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
 msgstr ""
 
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
+#: my-evolution/metar.c:65
+msgid "Southeast"
 msgstr ""
 
-#: shell/importer/importer.c:473
-msgid "Automatic"
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
 msgstr ""
 
-#: shell/importer/importer.c:523
+#: my-evolution/metar.c:66
 #, fuzzy
-msgid "Filename:"
+msgid "South"
+msgstr "PriontАil"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+msgid "Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+msgid "West"
+msgstr ""
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "_Nota"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Showers"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+msgid "Rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Drifting rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Freezing rain"
+msgstr ""
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "MИid"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Moderate snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Drifting snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "Post"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Shallow hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Partial hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "Post"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Shallow small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Showers of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+msgid "Unknown precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Unknown thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Freezing precipitation"
+msgstr ""
+
+#. MIST
+#: my-evolution/metar.c:109
+msgid "Mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "TosaМocht"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Drifting mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog with wind"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+msgid "Smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Shallow smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke with wind"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "Post"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "Post"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+msgid "Sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+msgid "Dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Raging tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Thunderous tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+msgid "Add new feed"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
 msgstr "_FillteАn"
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+msgid "All stations:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:6
+msgid "Display folders:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:7
+msgid "Display stations:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:8
+msgid "Displayed feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:9
 #, fuzzy
-msgid "Select a file"
-msgstr "FillteАn _Nua"
+msgid "Five days"
+msgstr "_FillteАn"
 
-#: shell/importer/importer.c:538
-msgid "File type:"
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
 msgstr ""
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
 msgstr ""
 
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
 msgstr ""
 
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
 msgstr ""
 
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "Post"
+
+#: my-evolution/my-evolution.glade.h:16
+msgid "One month"
 msgstr ""
 
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
+#: my-evolution/my-evolution.glade.h:17
+msgid "One week"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+msgid "Schedule"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Post an sceАl seo"
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "Show full path for folders"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:22
+msgid "Show today's tasks"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "_Teacs"
+
+#: my-evolution/my-evolution.glade.h:24
+msgid "Units: "
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Post"
+
+#: my-evolution/my-evolution.glade.h:26
+msgid "Weather settings"
 msgstr ""
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: my-evolution/my-evolution.glade.h:27
+msgid "imperial"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#, fuzzy
+msgid "The Evolution shell."
+msgstr ""
+"Go raibh maith agat\n"
+"An Fhoireann Evolution\n"
+
+#: shell/e-activity-handler.c:198
+msgid "Show Details"
+msgstr ""
+
+#: shell/e-activity-handler.c:200
+msgid "Cancel Operation"
+msgstr ""
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "_FillteАn"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr ""
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr ""
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr ""
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6735,14 +9179,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:230
+#: shell/e-setup.c:235
 #, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6750,7 +9194,16 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6758,249 +9211,534 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:160
+msgid "Cannot move a folder over itself."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:162
+msgid "Cannot copy a folder over itself."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "_FillteАn"
+
+#: shell/e-shell-folder-commands.c:313
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "FillteАn _Nua"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "ScrМos an sceal seo"
+
+#: shell/e-shell-folder-commands.c:363
+#, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:422
+#, c-format
+msgid "Rename folder '%s'"
+msgstr ""
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:248
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:319
+#: shell/e-shell-folder-selection-dialog.c:343
 #, fuzzy
 msgid "New..."
 msgstr "_Nua"
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr ""
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:383
+#, c-format
+msgid "Error starting %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:402
+#, c-format
+msgid "Error loading %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr ""
+
+#: shell/e-shell-importer.c:538
+#, fuzzy
+msgid "Filename:"
+msgstr "_FillteАn"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a file"
+msgstr "FillteАn _Nua"
+
+#: shell/e-shell-importer.c:553
+msgid "File type:"
+msgstr ""
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "FillteАn _Nua"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:437
 #, fuzzy
 msgid "Go to folder..."
 msgstr "SАbhАil 'san _fillteАn"
 
-#: shell/e-shell-view.c:148
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "ScrМos an sceal seo"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
+msgstr "Sheoladh Chuig duine"
+
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
+msgstr ""
+
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1134
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1411
 #, fuzzy, c-format
 msgid "%s - Evolution %s"
 msgstr "Evolution"
 
-#: shell/e-shell-view.c:1136
+#: shell/e-shell-view.c:1413
 #, fuzzy, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "Evolution"
 
-#: shell/e-shell.c:378
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1248
+#: shell/e-shell.c:1311
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+msgid "Rename Shortcut Group"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:301
+msgid "Rename selected shortcut group to:"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+msgid "_Remove this Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+msgid "Re_name this Group..."
+msgstr ""
+
+#: shell/e-shortcuts-view.c:336
+msgid "Rename this shortcut group"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
+#: shell/e-shortcuts-view.c:461
+msgid "Rename shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:462
+msgid "Rename selected shortcut to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+#, fuzzy
+msgid "Open"
+msgstr "_OscАil"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Post an sceАl seo"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "ScrМos"
+
+#: shell/e-shortcuts-view.c:479
+msgid "Rename this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:379
+#: shell/e-shortcuts.c:585
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
-#, fuzzy
-msgid "_View"
-msgstr "_Nua"
+#: shell/e-shortcuts.c:982
+msgid "Shortcuts"
+msgstr ""
 
-#: shell/e-storage-set-view.c:649
-msgid "View the selected folder"
+#: shell/e-shortcuts.c:984
+msgid "Inbox"
 msgstr ""
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "_Coinne"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr ""
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr ""
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
+
+#: shell/e-task-widget.c:173
+msgid "%s (%d%% complete)"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+msgid "Active connections"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "Host"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #, fuzzy
-msgid "The Evolution shell."
+msgid "Folder name:"
+msgstr "_FillteАn"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#, fuzzy
+msgid "Folder type:"
+msgstr "_FillteАn"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Specify where to create the folder:"
 msgstr ""
-"Go raibh maith agat\n"
-"An Fhoireann Evolution\n"
 
-#: shell/main.c:83
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+
+#: shell/importer/import.glade.h:2
+msgid "Evolution Import Utility"
+msgstr ""
+
+#: shell/importer/import.glade.h:3
+msgid "Evolution Importer Utility"
+msgstr ""
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+
+#: shell/importer/intelligent.c:191
+msgid "Importers"
+msgstr ""
+
+#: shell/importer/intelligent.c:197
+msgid "Don't import"
+msgstr ""
+
+#: shell/importer/intelligent.c:199
+#, fuzzy
+msgid "Don't ask me again"
+msgstr "Post an sceАl seo"
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
 #, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:108
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7008,261 +9746,338 @@ msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: shell/main.c:139
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr ""
+"Go raibh maith agat\n"
+"An Fhoireann Evolution\n"
 
-#: shell/main.c:185
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:186
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:219
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:2
-msgid "Create new contact"
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Greamaigh"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:4
+msgid "Create new contact"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:5
 #, fuzzy
-msgid "Delete a contact"
+msgid "Create new contact list"
 msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr ""
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Gearr"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:9
 #, fuzzy
-msgid "New contact"
-msgstr "_Coinne"
+msgid "Delete selected contacts"
+msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:49
+#: ui/evolution-addressbook.xml.h:10
 #, fuzzy
-msgid "Previews the message to be printed"
-msgstr "Post an sceАl seo"
+msgid "New contact"
+msgstr "_Coinne"
 
 #: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
-msgstr ""
+#, fuzzy
+msgid "New list"
+msgstr "_Nua"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:78
-msgid "Stop"
-msgstr ""
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+#, fuzzy
+msgid "Paste"
+msgstr "PriontАil"
 
-#: ui/evolution-addressbook.xml.h:13
-msgid "Stop Loading"
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:14
 #, fuzzy
-msgid "View All"
-msgstr "_Nua"
+msgid "Previews the contacts to be printed"
+msgstr "Post an sceАl seo"
+
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
+msgstr "ScrМos an sceal seo"
+
+#: ui/evolution-addressbook.xml.h:18
+#, fuzzy
+msgid "Select All"
+msgstr "FillteАn _Nua"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
+#: ui/evolution-addressbook.xml.h:20
+msgid "Stop"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:21
+msgid "Stop Loading"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "_Coinne"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 #, fuzzy
 msgid "_Print..."
 msgstr "PriontАil"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:110
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:42
+#: ui/evolution-addressbook.xml.h:29
+#, fuzzy
+msgid "_Select All"
+msgstr "FillteАn _Nua"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_UirlisМ"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Create a new all day Event"
+msgid "Create a New All-Day _Event"
 msgstr "ScrМos an sceal seo"
 
 #: ui/evolution-calendar.xml.h:5
 #, fuzzy
-msgid "Create a new appointment"
+msgid "Create a _New Appointment"
 msgstr "ScrМos an sceal seo"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr ""
+#, fuzzy
+msgid "Create a new appointment"
+msgstr "ScrМos an sceal seo"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
+msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 #, fuzzy
 msgid "Go forward in time"
 msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go to _Date"
-msgstr ""
-
 #: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
+msgid "Go to _Date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:16
 #, fuzzy
-msgid "Month"
-msgstr "PriontАil"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr ""
+msgid "New Appointment"
+msgstr "_Coinne"
 
-#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr ""
+#: ui/evolution-calendar.xml.h:18
+#, fuzzy
+msgid "Previews the calendar to be printed"
+msgstr "Post an sceАl seo"
 
 #: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
+msgid "Print calendar"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:21
-msgid "Prev"
+msgid "Print this Calendar"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:22
-#, fuzzy
-msgid "Previews the calendar to be printed"
-msgstr "Post an sceАl seo"
+msgid "Publish Free/Busy Information"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:24
+msgid "Show 1 day"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:25
-msgid "Print calendar"
+msgid "Show 1 month"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:26
-msgid "Print this Calendar"
+msgid "Show 1 week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-#, fuzzy
-msgid "Save As"
-msgstr "SАbhАil 'san _fillteАn"
+#: ui/evolution-calendar.xml.h:27
+msgid "Show the working week"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
+msgid "W_ork Week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
-msgid "Show 1 day"
-msgstr ""
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
+msgstr "_Coinne"
 
-#: ui/evolution-calendar.xml.h:31
-msgid "Show 1 month"
+#: ui/evolution-calendar.xml.h:30
+msgid "_Calendar Settings..."
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:32
-msgid "Show 1 week"
+msgid "_Day"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:33
-msgid "Show the working week"
-msgstr ""
+#, fuzzy
+msgid "_Month"
+msgstr "PriontАil"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
-#: widgets/misc/e-dateedit.c:422
-msgid "Today"
+#: ui/evolution-calendar.xml.h:37
+msgid "_Week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:35
-msgid "W_ork Week"
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
+#: ui/evolution-comp-editor.xml.h:3
+#, fuzzy
+msgid "Close this appointment"
+msgstr "ScrМos an sceal seo"
+
+#: ui/evolution-comp-editor.xml.h:5
+#, fuzzy
+msgid "Delete this appointment"
+msgstr "ScrМos an sceal seo"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-comp-editor.xml.h:7
 #, fuzzy
-msgid "_Appointment"
-msgstr "_Coinne"
+msgid "Preview the printed item"
+msgstr "Post an sceАl seo"
 
-#: ui/evolution-calendar.xml.h:38
-msgid "_Day"
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-comp-editor.xml.h:11
 #, fuzzy
-msgid "_Month"
+msgid "Print S_etup"
 msgstr "PriontАil"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
-msgid "_New"
-msgstr "_Nua"
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+#, fuzzy
+msgid "Print this item"
+msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+#, fuzzy
+msgid "Print..."
+msgstr "PriontАil"
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:106
-#: ui/evolution-tasks.xml.h:8
-#, fuzzy
-msgid "_Save As..."
-msgstr "SАbhАil 'san _fillteАn"
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:45
-msgid "_Week"
+#: ui/evolution-comp-editor.xml.h:17
+msgid "Save this item to disk"
 msgstr ""
 
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "_OscАil"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+#, fuzzy
+msgid "_File"
+msgstr "_FillteАn"
+
 #: ui/evolution-contact-editor.xml.h:2
 #, fuzzy
 msgid "Delete this item"
 msgstr "ScrМos an sceal seo"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 #, fuzzy
 msgid "Delete..."
 msgstr "ScrМos"
@@ -7276,30 +10091,13 @@ msgstr ""
 msgid "Print En_velope..."
 msgstr "Post an sceАl seo"
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-#, fuzzy
-msgid "Print this item"
-msgstr "ScrМos an sceal seo"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:57 ui/evolution-task-editor-dialog.xml.h:41
-#, fuzzy
-msgid "Print..."
-msgstr "PriontАil"
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 #, fuzzy
 msgid "Save _As..."
 msgstr "SАbhАil 'san _fillteАn"
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr ""
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr ""
@@ -7317,1003 +10115,1002 @@ msgstr ""
 msgid "Send _message to contact..."
 msgstr "_Post sceАl"
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
-#, fuzzy
-msgid "_File"
-msgstr "_FillteАn"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 #, fuzzy
 msgid "_Save"
 msgstr "SАbhАil 'san _fillteАn"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr ""
-
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:2
 #, fuzzy
-msgid "Address _Book... (FIXME)"
-msgstr "SАbhАil 'san _fillteАn"
-
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-#, fuzzy
-msgid "C_lear"
-msgstr "_FillteАn"
+msgid "Delete this list"
+msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-#, fuzzy
-msgid "C_ut"
-msgstr "Gearr"
+#: ui/evolution-contact-list-editor.xml.h:6
+msgid "Save the list and close the dialog box"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:7
 #, fuzzy
-msgid "Chec_k Names (FIXME)"
+msgid "Se_nd list to other..."
 msgstr "_Post sceАl"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
-msgid "Clear"
-msgstr "_FillteАn"
+msgid "Send _message to list..."
+msgstr "_Post sceАl"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
+#: ui/evolution-event-editor.xml.h:1
+msgid "Cancel Mee_ting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:11
-#, fuzzy
-msgid "Close this appointment"
-msgstr "ScrМos an sceal seo"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+msgid "Cancel the meeting for this item"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "SАbhАil 'san _fillteАn"
-
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Greamaigh"
+msgid "Forward as i_Calendar"
+msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+msgid "Forward this item via email"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Gearr"
-
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:18
-#, fuzzy
-msgid "Delete this appointment"
-msgstr "ScrМos an sceal seo"
+#: ui/evolution-event-editor.xml.h:6
+msgid "Re_fresh Meeting"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+msgid "Schedule a meeting for this item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
 #, fuzzy
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "SАbhАil 'san _fillteАn"
+msgid "_Actions"
+msgstr "_OscАil"
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
+#: ui/evolution-executive-summary.xml.h:1
 #, fuzzy
-msgid "For_ward (FIXME)"
-msgstr "Sheoladh Chuig duine"
+msgid "Customise My Evolution"
+msgstr "Evolution"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
+#: ui/evolution-mail-global.xml.h:2
+msgid "Cancel the current mail operation"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr ""
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Post an sceАl seo"
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-#, fuzzy
-msgid "Paste"
-msgstr "PriontАil"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-#, fuzzy
-msgid "Print S_etup..."
-msgstr "PriontАil"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
+#: ui/evolution-mail-global.xml.h:13
 #, fuzzy
-msgid "Print Setup"
-msgstr "PriontАil"
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "FillteАn _Nua"
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
-msgid "Save"
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send / Receive"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:68
-#: ui/evolution-task-editor-dialog.xml.h:57
+#: ui/evolution-mail-global.xml.h:19
 #, fuzzy
-msgid "Select All"
-msgstr "FillteАn _Nua"
+msgid "_Filters..."
+msgstr "_FillteАn"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
+#: ui/evolution-mail-global.xml.h:20
 #, fuzzy
-msgid "Select everything"
-msgstr "FillteАn _Nua"
+msgid "_Mail Message"
+msgstr "_Post sceАl"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
+#: ui/evolution-mail-global.xml.h:22
+msgid "_Preview Pane"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-#, fuzzy
-msgid "_About..."
-msgstr "Evolution"
-
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
-msgid "_Close"
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:28
-#, fuzzy
-msgid "_Contact (FIXME)"
-msgstr "_Coinne"
-
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-#, fuzzy
-msgid "_Copy"
-msgstr "Greamaigh"
-
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
+#: ui/evolution-mail-list.xml.h:3
 #, fuzzy
-msgid "_Help"
-msgstr "_Nota"
+msgid "Copy selected messages"
+msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
+#: ui/evolution-mail-list.xml.h:5
 #, fuzzy
-msgid "_Item (FIXME)"
-msgstr "_Coinne"
+msgid "Cut selected messages"
+msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
+#: ui/evolution-mail-list.xml.h:6
 #, fuzzy
-msgid "_Journal Entry (FIXME)"
-msgstr "_Coinne"
+msgid "Hide S_elected Messages"
+msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
+#: ui/evolution-mail-list.xml.h:7
 #, fuzzy
-msgid "_Last Item in Folder (FIXME)"
-msgstr "SАbhАil 'san _fillteАn"
+msgid "Hide _Deleted Messages"
+msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
+#: ui/evolution-mail-list.xml.h:8
 #, fuzzy
-msgid "_Mail Message (FIXME)"
-msgstr "_Post sceАl"
+msgid "Hide _Read Messages"
+msgstr "Post an sceАl seo"
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-#, fuzzy
-msgid "_Move to Folder... (FIXME)"
-msgstr "SАbhАil 'san _fillteАn"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-#, fuzzy
-msgid "_Note (FIXME)"
-msgstr "_Coinne"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-#, fuzzy
-msgid "_Paste"
-msgstr "PriontАil"
+#: ui/evolution-mail-list.xml.h:11
+msgid "Mark all visible messages as read"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-#, fuzzy
-msgid "_Print"
-msgstr "PriontАil"
+#: ui/evolution-mail-list.xml.h:13
+msgid "Paste message in the clipboard"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:102
-#: ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-mail-list.xml.h:14
 #, fuzzy
-msgid "_Properties..."
-msgstr "PriontАil"
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "FillteАn _Nua"
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
 #, fuzzy
-msgid "_Select All"
+msgid "Select _All"
 msgstr "FillteАn _Nua"
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:19
 #, fuzzy
-msgid "_Task (FIXME)"
-msgstr "_Post sceАl"
+msgid "Select all visible messages"
+msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
+#: ui/evolution-mail-list.xml.h:20
 #, fuzzy
-msgid "_Unread Item (FIXME)"
-msgstr "_Coinne"
+msgid "Show _All"
+msgstr "Post an sceАl seo"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
+#: ui/evolution-mail-list.xml.h:22
+msgid "Temporarily hide all messages that have already been read"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr ""
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr ""
+#: ui/evolution-mail-list.xml.h:24
+#, fuzzy
+msgid "Threaded Message list"
+msgstr "Post an sceАl seo"
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
-msgstr ""
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_FillteАn"
 
-#: ui/evolution-mail.xml.h:3
-msgid "Change the properties of this folder"
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:4
-msgid "Compose"
-msgstr ""
+#: ui/evolution-mail-list.xml.h:28
+#, fuzzy
+msgid "_Properties..."
+msgstr "PriontАil"
 
-#: ui/evolution-mail.xml.h:5
+#: ui/evolution-mail-list.xml.h:29
 #, fuzzy
-msgid "Compose a new message"
+msgid "_Threaded Message List"
 msgstr "Post an sceАl seo"
 
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail-message.xml.h:1
 #, fuzzy
-msgid "Configure Folder..."
-msgstr "SАbhАil 'san _fillteАn"
+msgid "Apply filter rules to the selected messages"
+msgstr "ScrМos an sceal seo"
+
+#: ui/evolution-mail-message.xml.h:2
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
+msgid "Compose a reply to the sender of the selected message"
+msgstr "ScrМos an sceal seo"
+
+#: ui/evolution-mail-message.xml.h:6
 #, fuzzy
 msgid "Copy selected messages to another folder"
 msgstr "FillteАn _Nua"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail-message.xml.h:7
 msgid "Create _Virtual Folder From Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:12
-#, fuzzy
-msgid "Delete the selected messages"
-msgstr "ScrМos an sceal seo"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:15
-#, fuzzy
-msgid "Edit Message"
-msgstr "_Post sceАl"
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:16
-msgid "Edit the current message"
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
+#: ui/evolution-mail-message.xml.h:12
+msgid "Create a virtual folder for these recipients"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:13
+msgid "Create a virtual folder for this mailing list"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:18
-msgid "Expunge"
+#: ui/evolution-mail-message.xml.h:14
+msgid "Create a virtual folder for this sender"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:19
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:15
+msgid "Create a virtual folder for this subject"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:20
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:17
+msgid "Display the next important message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail-message.xml.h:18
 #, fuzzy
-msgid "Filter on _Subject"
-msgstr "Abair"
+msgid "Display the next message"
+msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Finaly remove all mails tagged for deletion"
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
+msgstr "ScrМos an sceal seo"
+
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:23
-msgid "Forget _Passwords"
+#: ui/evolution-mail-message.xml.h:21
+msgid "Display the previous important message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail-message.xml.h:22
 #, fuzzy
-msgid "Forward As"
-msgstr "Sheoladh Chuig duine"
+msgid "Display the previous message"
+msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Forward the selected mail to someone"
+#: ui/evolution-mail-message.xml.h:23
+msgid "Display the previous unread message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:29
-msgid "Forward this message in-line with your mail, so you can edit it"
+#: ui/evolution-mail-message.xml.h:24
+msgid "Filter on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail-message.xml.h:25
 #, fuzzy
-msgid "Full _Headers"
-msgstr "_FillteАn"
+msgid "Filter on Se_nder..."
+msgstr "Abair"
 
-#: ui/evolution-mail.xml.h:31
+#: ui/evolution-mail-message.xml.h:26
 #, fuzzy
-msgid "Hide Deleted Messages"
-msgstr "ScrМos an sceal seo"
+msgid "Filter on _Recipients..."
+msgstr "Abair"
 
-#: ui/evolution-mail.xml.h:32
+#: ui/evolution-mail-message.xml.h:27
 #, fuzzy
-msgid "Hide S_elected Messages"
-msgstr "ScrМos an sceal seo"
+msgid "Filter on _Subject..."
+msgstr "Abair"
+
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:33
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "Sheoladh Chuig duine"
+
+#: ui/evolution-mail-message.xml.h:30
 #, fuzzy
-msgid "Hide _Deleted Messages"
-msgstr "ScrМos an sceal seo"
+msgid "Forward As"
+msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-mail.xml.h:34
+#: ui/evolution-mail-message.xml.h:31
 #, fuzzy
-msgid "Hide _Read messages"
-msgstr "Post an sceАl seo"
+msgid "Forward _Attached"
+msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Invert Selection"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:32
+#, fuzzy
+msgid "Forward _Inline"
+msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-mail.xml.h:36
-msgid "Manage _Subscriptions..."
-msgstr ""
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Forward _Quoted"
+msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-mail.xml.h:37
-msgid "Mar_k as Read"
+#: ui/evolution-mail-message.xml.h:34
+msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:38
-msgid "Mark All as R_ead"
+#: ui/evolution-mail-message.xml.h:35
+#, fuzzy
+msgid "Forward the selected message quoted like a reply"
+msgstr "FillteАn _Nua"
+
+#: ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward the selected message to someone"
+msgstr "FillteАn _Nua"
+
+#: ui/evolution-mail-message.xml.h:37
+msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:39
-msgid "Mark As Read"
+#: ui/evolution-mail-message.xml.h:39
+msgid "Load _Images"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:40
-msgid "Mark As U_nread"
+#: ui/evolution-mail-message.xml.h:41
+msgid "Mark as I_mportant"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:41
-msgid "Mark as U_nread"
+#: ui/evolution-mail-message.xml.h:43
+msgid "Mark as Unimp_ortant"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "ScrМos an sceal seo"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail-message.xml.h:47
 #, fuzzy
-msgid "Move"
-msgstr "ScrМos"
+msgid "Mark the selected messages as unimportant"
+msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
-msgid "Move message to a new folder"
+msgid "Mark the selected messages for deletion"
 msgstr "FillteАn _Nua"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:49
+#, fuzzy
+msgid "Move"
+msgstr "ScrМos"
+
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Move selected messages to another folder"
 msgstr "FillteАn _Nua"
 
-#: ui/evolution-mail.xml.h:47
-msgid "Open in New Window"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Post an sceАl seo"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "_Post sceАl"
+
+#: ui/evolution-mail-message.xml.h:54
+msgid "Next Thread"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
-msgid "Open the current message in a new window"
+msgid "Next Unread Message"
 msgstr "Post an sceАl seo"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
 #, fuzzy
-msgid "Print Preview of message..."
+msgid "Open the selected message in a new window"
 msgstr "Post an sceАl seo"
 
-#: ui/evolution-mail.xml.h:54
-msgid "Print message to the printer"
+#: ui/evolution-mail-message.xml.h:57
+msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
-msgid "Print message..."
+msgid "Previews the message to be printed"
 msgstr "Post an sceАl seo"
 
-#: ui/evolution-mail.xml.h:58
-msgid "Redirect (FIXME: implement me)"
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail-message.xml.h:60
 #, fuzzy
-msgid "Reply to _All"
-msgstr "Freagrair"
+msgid "Previous Important Message"
+msgstr "Post an sceАl seo"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
-msgid "Reply to all"
-msgstr "Freagrair"
+msgid "Previous Message"
+msgstr "Post an sceАl seo"
 
-#: ui/evolution-mail.xml.h:64
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
-msgid "Reply to sender"
-msgstr "Freagrair"
+msgid "Previous Unread Message"
+msgstr "Post an sceАl seo"
 
-#: ui/evolution-mail.xml.h:66
-msgid "S_ource"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
+msgid "Print Message..."
+msgstr "Post an sceАl seo"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
-msgid "Save the message into a new file"
+msgid "Print Preview..."
 msgstr "Post an sceАl seo"
 
-#: ui/evolution-mail.xml.h:69 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
-msgid "Select _All"
-msgstr "FillteАn _Nua"
+msgid "Print this message"
+msgstr "Post an sceАl seo"
 
-#: ui/evolution-mail.xml.h:70
-msgid "Select _Thread"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "Freagrair"
 
-#: ui/evolution-mail.xml.h:71
-msgid "Send / Receive"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:72
-msgid "Send a reply to the person who sent you this mail"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:71
+#, fuzzy
+msgid "S_earch Message"
+msgstr "Post"
 
-#: ui/evolution-mail.xml.h:73
-msgid "Send a single mail in reply to all the selected mail"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:72
+#, fuzzy
+msgid "Save the message as a text file"
+msgstr "Post an sceАl seo"
 
-#: ui/evolution-mail.xml.h:74
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:76
-msgid "Send queued mail and retrieve new mail"
+#: ui/evolution-mail-message.xml.h:74
+msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
-msgid "Show _All"
-msgstr "Post an sceАl seo"
+msgid "Show Full _Headers"
+msgstr "_FillteАn"
+
+#: ui/evolution-mail-message.xml.h:76
+msgid "Show message in the normal style"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:79
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
-msgid "Threaded Message list"
-msgstr "Post an sceАl seo"
+msgid "Show message with all email headers"
+msgstr "FillteАn _Nua"
 
-#: ui/evolution-mail.xml.h:80
+#: ui/evolution-mail-message.xml.h:78
+msgid "Show the raw email source of the message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-mail.xml.h:82
-msgid "VFolder on Se_nder"
+#: ui/evolution-mail-message.xml.h:80
+msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail.xml.h:83
-msgid "VFolder on _Recipients"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:84
+#: ui/evolution-mail-message.xml.h:81
 #, fuzzy
-msgid "VFolder on _Subject"
+msgid "VFolder on Se_nder..."
 msgstr "Abair"
 
-#: ui/evolution-mail.xml.h:85
-msgid "View Raw Message Source"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "VFolder on _Recipients..."
+msgstr "Abair"
 
-#: ui/evolution-mail.xml.h:86
-msgid "Virtual Folder _Editor..."
-msgstr ""
+#: ui/evolution-mail-message.xml.h:83
+#, fuzzy
+msgid "VFolder on _Subject..."
+msgstr "Abair"
 
-#: ui/evolution-mail.xml.h:87
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:88
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
-msgid "_Attachment"
-msgstr "_Coinne"
-
-#: ui/evolution-mail.xml.h:89
-#, fuzzy
-msgid "_Copy to Folder..."
+msgid "_Copy to Folder"
 msgstr "_FillteАn"
 
-#: ui/evolution-mail.xml.h:90
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:92
-msgid "_Expunge"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:93
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
-msgid "_Filters..."
-msgstr "_FillteАn"
-
-#: ui/evolution-mail.xml.h:94 ui/evolution.xml.h:31
-msgid "_Folder"
-msgstr "_FillteАn"
-
-#: ui/evolution-mail.xml.h:95
-#, fuzzy
-msgid "_Forward"
+msgid "_Forward Message"
 msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-mail.xml.h:96
-msgid "_Inline"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:97 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:98
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
-msgid "_Mail Message"
+msgid "_Message Display"
 msgstr "_Post sceАl"
 
-#: ui/evolution-mail.xml.h:99
-msgid "_Mail Settings..."
-msgstr ""
-
-#: ui/evolution-mail.xml.h:100
-#, fuzzy
-msgid "_Move to Folder..."
-msgstr "SАbhАil 'san _fillteАn"
-
-#: ui/evolution-mail.xml.h:101
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
-msgid "_Open Selected Items"
-msgstr "ScrМos an sceal seo"
+msgid "_Move to Folder"
+msgstr "FillteАn _Nua"
 
-#: ui/evolution-mail.xml.h:103
-#, fuzzy
-msgid "_Quoted"
-msgstr "_Nota"
+#: ui/evolution-mail-message.xml.h:91
+msgid "_Normal Display"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:104
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
-msgid "_Reply"
-msgstr "Freagrair"
+msgid "_Open Message"
+msgstr "_Post sceАl"
 
-#: ui/evolution-mail.xml.h:105
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
-msgid "_Resend Messages"
+msgid "_Re-send Message"
 msgstr "_Post sceАl"
 
-#: ui/evolution-mail.xml.h:107
-#, fuzzy
-msgid "_Save Message As..."
-msgstr "SАbhАil 'san _fillteАn"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:108
-msgid "_Send / Receive"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr ""
+
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr ""
+
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:109
-msgid "_Threaded"
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:111
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
 #, fuzzy
-msgid "_Undelete"
-msgstr "ScrМos"
+msgid "_View"
+msgstr "_Nua"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:5
 #, fuzzy
+msgid "Delete all but signature"
+msgstr "FillteАn _Nua"
+
+#: ui/evolution-message-composer.xml.h:6
+#, fuzzy
 msgid "Encrypt this message with PGP"
 msgstr "Post an sceАl seo"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+msgid "Inline Text _File..."
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
+msgid "S/MIME Encrypt"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:18
+msgid "S/MIME Sign"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:20
 #, fuzzy
-msgid "Save in _folder... (FIXME)"
+msgid "Save As"
 msgstr "SАbhАil 'san _fillteАn"
 
-#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
 msgid "Save in folder..."
 msgstr "SАbhАil 'san _fillteАn"
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 #, fuzzy
 msgid "Save the message in a specified folder"
 msgstr "Post an sceАl seo"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Post"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
 msgid "Send _Later"
 msgstr "Post"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
 msgid "Send _later"
 msgstr "Post"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
 msgid "Send the message later"
 msgstr "Post an sceАl seo"
 
-#: ui/evolution-message-composer.xml.h:28
-#, fuzzy
-msgid "Send the message now"
-msgstr "Post an sceАl seo"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
 msgid "Send this message now"
 msgstr "Post an sceАl seo"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
 msgid "Show / hide attachments"
 msgstr "_Coinne"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
 msgid "Show _attachments"
 msgstr "_Coinne"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 #, fuzzy
 msgid "Show attachments"
 msgstr "_Coinne"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
 msgid "Sign this message with your PGP key"
 msgstr "Post an sceАl seo"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Post an sceАl seo"
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "_Coinne"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:45
-msgid "_From Field"
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:47
-msgid "_Insert"
+#, fuzzy
+msgid "_Delete all"
+msgstr "ScrМos"
+
+#: ui/evolution-message-composer.xml.h:50
+msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:48
-#, fuzzy
-msgid "_Insert text file... (FIXME)"
-msgstr "SАbhАil 'san _fillteАn"
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
+msgid "_Insert"
+msgstr ""
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 #, fuzzy
 msgid "_Open..."
 msgstr "_OscАil"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 #, fuzzy
 msgid "_Reply-To Field"
 msgstr "Freagrair"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr ""
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#, fuzzy
+msgid "_Help"
+msgstr "_Nota"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 #, fuzzy
 msgid "F_older"
 msgstr "_FillteАn"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:43
+#: ui/evolution-task-editor.xml.h:1
 #, fuzzy
-msgid "Redo"
-msgstr "ScrМos"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-#, fuzzy
-msgid "Redo the undone action"
-msgstr "ScrМos"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-#, fuzzy
-msgid "Replace"
-msgstr "Freagrair"
+msgid "Cancel Task"
+msgstr "_Teacs"
 
-#: ui/evolution-task-editor-dialog.xml.h:46
+#: ui/evolution-task-editor.xml.h:3
 #, fuzzy
-msgid "Replace a string"
-msgstr "Freagrair"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr ""
+msgid "Delegate Task"
+msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
+#: ui/evolution-task-editor.xml.h:7
+msgid "Re_fresh Task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "LeasЗ"
-
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
+#: ui/evolution-tasks.xml.h:3
 #, fuzzy
-msgid "_Appointment (FIXME)"
-msgstr "_Coinne"
+msgid "Copy selected task"
+msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
+#: ui/evolution-tasks.xml.h:4
 #, fuzzy
-msgid "_Mark Complete (FIXME)"
-msgstr "_Post sceАl"
+msgid "Create a new task"
+msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr ""
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
-msgid "Create a new task"
+msgid "Delete selected tasks"
 msgstr "ScrМos an sceal seo"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:8
 #, fuzzy
 msgid "New Task"
 msgstr "_Teacs"
 
-#: ui/evolution-tasks.xml.h:5
-msgid "Save task as something else"
+#: ui/evolution-tasks.xml.h:9
+msgid "Paste task from the clipboard"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
+#: ui/evolution-tasks.xml.h:12
+msgid "Save task as something else"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "Post"
+
+#: ui/evolution-tasks.xml.h:19
 #, fuzzy
 msgid "_Task"
 msgstr "_Teacs"
@@ -8323,326 +11120,498 @@ msgstr "_Teacs"
 msgid "About Evolution..."
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr ""
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
+#: ui/evolution.xml.h:2
+msgid "Add to _Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
+#: ui/evolution.xml.h:3
+msgid "Change the name of this folder"
 msgstr ""
 
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr ""
+#, fuzzy
+msgid "Copy this folder"
+msgstr "_FillteАn"
 
 #: ui/evolution.xml.h:7
-msgid "Display a different folder"
-msgstr ""
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "FillteАn _Nua"
 
 #: ui/evolution.xml.h:8
-msgid "E_xit"
+msgid "Create a link to this folder in the shortcut bar"
 msgstr ""
 
 #: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
+#, fuzzy
+msgid "Create a new folder"
+msgstr "ScrМos an sceal seo"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "ScrМos an sceal seo"
+
+#: ui/evolution.xml.h:14
+msgid "Display a different folder"
 msgstr ""
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:15
+msgid "E_xit"
+msgstr ""
+
+#: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:17
+#, fuzzy
+msgid "Evolution _Window"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr ""
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr ""
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:13
-msgid "Main toolbar"
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "FillteАn _Nua"
+
+#: ui/evolution.xml.h:24
+msgid "Open in New _Window"
 msgstr ""
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Open this folder in an other window"
+msgstr "Post an sceАl seo"
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr ""
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:30
+#, fuzzy
+msgid "Toggle"
+msgstr "ScrМos"
+
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:33
+msgid "Toggle whether we are working offline."
+msgstr ""
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr ""
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr ""
 
-#: ui/evolution.xml.h:23
-msgid "Work Offline"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_About Evolution..."
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:41
 #, fuzzy
-msgid "_Actions"
-msgstr "_OscАil"
+msgid "_Appointment (FIXME)"
+msgstr "_Coinne"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:43
+#, fuzzy
+msgid "_Contact (FIXME)"
+msgstr "_Coinne"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "Greamaigh"
+
+#: ui/evolution.xml.h:49
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_FillteАn"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Go to Folder..."
 msgstr "_FillteАn"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Import file..."
 msgstr "SАbhАil 'san _fillteАn"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr ""
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:54
 #, fuzzy
 msgid "_Mail message"
 msgstr "_Post sceАl"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "ScrМos"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Nua"
+
+#: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_New Folder"
 msgstr "FillteАn _Nua"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "_OscАil"
+
+#: ui/evolution.xml.h:59
+msgid "_Shortcut"
+msgstr ""
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr ""
 
+#: ui/evolution.xml.h:61
+#, fuzzy
+msgid "_Task (FIXME)"
+msgstr "_Post sceАl"
+
+#: ui/evolution.xml.h:64
+msgid "_Work Offline"
+msgstr ""
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "Evolution"
+
+#: views/addressbook/galview.xml.h:1
+msgid "Address Cards"
+msgstr ""
+
+#: views/addressbook/galview.xml.h:2
+#, fuzzy
+msgid "By Company"
+msgstr "Greamaigh"
+
+#: views/addressbook/galview.xml.h:3
+msgid "Phone List"
+msgstr ""
+
+#: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "By Sender"
+msgstr "Post"
+
+#: views/mail/galview.xml.h:2
+msgid "By Status"
+msgstr ""
+
+#: views/mail/galview.xml.h:3
+#, fuzzy
+msgid "By Subject"
+msgstr "Abair"
+
+#: views/mail/galview.xml.h:4
+#, fuzzy
+msgid "Messages"
+msgstr "_Post sceАl"
+
+#: views/tasks/galview.xml.h:2
+msgid "With Category"
+msgstr ""
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 msgid "%A, %B %d, %Y"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
-msgid "Tentative"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 #, fuzzy
 msgid "_Options"
 msgstr "_OscАil"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 msgid "Meeting _start time:"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 msgid "Meeting _end time:"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:177
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:196
+#: widgets/menus/gal-view-menus.c:259
 msgid "Define Views"
 msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr ""
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+msgid "Now"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
-msgid "Now"
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:242
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:723
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:166
-msgid "Save Search"
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:237
-msgid "Advanced Search"
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:317
-msgid "Advanced ..."
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:152
-msgid "Information"
+#: widgets/misc/e-charset-picker.c:63
+msgid "Greek"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:173
-msgid "Question"
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:180
+#: widgets/misc/e-charset-picker.c:66
 #, fuzzy
-msgid "Message"
-msgstr "_Post sceАl"
+msgid "Turkish"
+msgstr "_Teacs"
 
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
 #, fuzzy
-msgid "Don't show this message again."
-msgstr "Post an sceАl seo"
+msgid "Traditional"
+msgstr "_OscАil"
 
-#: widgets/misc/e-search-bar.c:148
-msgid "Sear_ch"
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
 msgstr ""
 
-#: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
 msgstr ""
 
-#: views/addressbook/galview.xml.h:2
+#: widgets/misc/e-charset-picker.c:102
 #, fuzzy
-msgid "By Company"
-msgstr "Greamaigh"
+msgid "New"
+msgstr "_Nua"
 
-#: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#: widgets/misc/e-charset-picker.c:160
+#, c-format
+msgid "Unknown character set: %s"
 msgstr ""
 
-#: views/mail/galview.xml.h:1
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
 #, fuzzy
-msgid "By Sender"
-msgstr "Post"
+msgid "Other..."
+msgstr "_OscАil"
 
-#: views/mail/galview.xml.h:2
-msgid "By Status"
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
 msgstr ""
 
-#: views/mail/galview.xml.h:3
+#: widgets/misc/e-clipped-label.c:112
+msgid "..."
+msgstr ""
+
+#: widgets/misc/e-filter-bar.c:157
 #, fuzzy
-msgid "By Subject"
-msgstr "Abair"
+msgid "Search Editor"
+msgstr "_FillteАn"
 
-#: views/mail/galview.xml.h:4
+#: widgets/misc/e-filter-bar.c:173
+msgid "Save Search"
+msgstr ""
+
+#: widgets/misc/e-filter-bar.c:241
+msgid "Advanced Search"
+msgstr ""
+
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr ""
+
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:152
+msgid "Information"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:173
+msgid "Question"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:180
 #, fuzzy
-msgid "Messages"
+msgid "Message"
 msgstr "_Post sceАl"
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#. Add the "Don't show this message again." checkbox
+#: widgets/misc/e-messagebox.c:224
+#, fuzzy
+msgid "Don't show this message again."
+msgstr "Post an sceАl seo"
+
+#: widgets/misc/e-search-bar.c:155
+msgid "Sear_ch"
 msgstr ""
 
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
@@ -8666,40 +11635,179 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Remove action"
-#~ msgstr "ScrМos"
+#~ msgid "_Company:"
+#~ msgstr "Greamaigh"
+
+#, fuzzy
+#~ msgid "TaskPad"
+#~ msgstr "_Teacs"
+
+#, fuzzy
+#~ msgid "Edit the task"
+#~ msgstr "ScrМos an sceal seo"
+
+#, fuzzy
+#~ msgid "Delete all Occurrences"
+#~ msgstr "ScrМos an sceal seo"
+
+#, fuzzy
+#~ msgid "Appointment Basics"
+#~ msgstr "_Coinne"
 
 #, fuzzy
-#~ msgid "Mail"
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "FillteАn _Nua"
+
+#, fuzzy
+#~ msgid "Send as:"
 #~ msgstr "Post"
 
 #, fuzzy
-#~ msgid "Optional"
-#~ msgstr "_OscАil"
+#~ msgid "Send an email to %s"
+#~ msgstr "Post"
 
 #, fuzzy
-#~ msgid "Select signature file"
+#~ msgid "Move %s to the left"
 #~ msgstr "FillteАn _Nua"
 
 #, fuzzy
-#~ msgid "_Message Hiding"
+#~ msgid "RDF Summary"
+#~ msgstr "Post"
+
+#, fuzzy
+#~ msgid "Is Not"
+#~ msgstr "_Nota"
+
+#, fuzzy
+#~ msgid "Move to Folder..."
+#~ msgstr "SАbhАil 'san _fillteАn"
+
+#, fuzzy
+#~ msgid "Copying messages"
 #~ msgstr "_Post sceАl"
 
 #, fuzzy
-#~ msgid "New"
+#~ msgid "View All"
 #~ msgstr "_Nua"
 
 #, fuzzy
-#~ msgid "Open..."
-#~ msgstr "_OscАil"
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "SАbhАil 'san _fillteАn"
 
 #, fuzzy
-#~ msgid "Save changes to message..."
+#~ msgid "C_lear"
+#~ msgstr "_FillteАn"
+
+#, fuzzy
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "_Post sceАl"
+
+#, fuzzy
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "SАbhАil 'san _fillteАn"
+
+#, fuzzy
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "SАbhАil 'san _fillteАn"
+
+#, fuzzy
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "Sheoladh Chuig duine"
+
+#, fuzzy
+#~ msgid "Print S_etup..."
+#~ msgstr "PriontАil"
+
+#, fuzzy
+#~ msgid "Select everything"
+#~ msgstr "FillteАn _Nua"
+
+#, fuzzy
+#~ msgid "_About..."
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "_Item (FIXME)"
+#~ msgstr "_Coinne"
+
+#, fuzzy
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "_Coinne"
+
+#, fuzzy
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "SАbhАil 'san _fillteАn"
+
+#, fuzzy
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "_Post sceАl"
+
+#, fuzzy
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "SАbhАil 'san _fillteАn"
+
+#, fuzzy
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_Coinne"
+
+#, fuzzy
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "_Coinne"
+
+#, fuzzy
+#~ msgid "Configure Folder..."
+#~ msgstr "SАbhАil 'san _fillteАn"
+
+#, fuzzy
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "ScrМos an sceal seo"
+
+#, fuzzy
+#~ msgid "Reply to all"
+#~ msgstr "Freagrair"
+
+#, fuzzy
+#~ msgid "_Reply"
+#~ msgstr "Freagrair"
+
+#, fuzzy
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "SАbhАil 'san _fillteАn"
+
+#, fuzzy
+#~ msgid "Send the message now"
 #~ msgstr "Post an sceАl seo"
 
 #, fuzzy
-#~ msgid "Subject contains"
-#~ msgstr "Abair"
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "SАbhАil 'san _fillteАn"
+
+#, fuzzy
+#~ msgid "Redo"
+#~ msgstr "ScrМos"
+
+#, fuzzy
+#~ msgid "Redo the undone action"
+#~ msgstr "ScrМos"
+
+#, fuzzy
+#~ msgid "Replace"
+#~ msgstr "Freagrair"
+
+#, fuzzy
+#~ msgid "Replace a string"
+#~ msgstr "Freagrair"
+
+#~ msgid "Undo"
+#~ msgstr "LeasЗ"
+
+#, fuzzy
+#~ msgid "_Message Hiding"
+#~ msgstr "_Post sceАl"
+
+#, fuzzy
+#~ msgid "Save changes to message..."
+#~ msgstr "Post an sceАl seo"
 
 #, fuzzy
 #~ msgid "FIXME: _Appointment"
@@ -8730,10 +11838,6 @@ msgstr ""
 #~ msgstr "_Post sceАl"
 
 #, fuzzy
-#~ msgid "FIXME: Forward as _vCard"
-#~ msgstr "Sheoladh Chuig duine"
-
-#, fuzzy
 #~ msgid "FIXME: For_ward"
 #~ msgstr "Sheoladh Chuig duine"
 
@@ -8742,10 +11846,6 @@ msgstr ""
 #~ msgstr "ScrМos"
 
 #, fuzzy
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "Abair"
-
-#, fuzzy
 #~ msgid "_Undo"
 #~ msgstr "LeasЗ"
 
diff --git a/po/gl.po b/po/gl.po
index d590753168..ff2e326e2c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2001-04-26 00:03+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2000-08-26 00:59+0200\n"
 "Last-Translator: Manuel A. FernАndez Montecelo <manuel@sindominio.net>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -20,11 +20,21 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import VCard files into Evolution."
+msgstr "FАbrica para importar ficheiros GnomeCard a Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports VCard files into Evolution."
+msgstr "Importa ficheiros GnomeCard a Evolution."
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Tarxeta: "
 
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -32,7 +42,7 @@ msgstr ""
 "\n"
 "Nome: "
 
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -40,7 +50,7 @@ msgstr ""
 "\n"
 "  Prefixo:    "
 
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -48,7 +58,7 @@ msgstr ""
 "\n"
 "  Entregado:      "
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -56,7 +66,7 @@ msgstr ""
 "\n"
 "  Adicional: "
 
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -64,7 +74,7 @@ msgstr ""
 "\n"
 "  Familia:     "
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -72,7 +82,7 @@ msgstr ""
 "\n"
 "  Sufixo:     "
 
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -80,7 +90,7 @@ msgstr ""
 "\n"
 "Data de nacemento: "
 
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -88,7 +98,7 @@ msgstr ""
 "\n"
 "Enderezo:"
 
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -96,7 +106,7 @@ msgstr ""
 "\n"
 "  Apdo. de correos: "
 
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -104,7 +114,7 @@ msgstr ""
 "\n"
 "  Ext:         "
 
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -112,7 +122,7 @@ msgstr ""
 "\n"
 "  RЗa:         "
 
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -120,7 +130,7 @@ msgstr ""
 "\n"
 "  Cidade:      "
 
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -128,7 +138,7 @@ msgstr ""
 "\n"
 "  RexiСn:      "
 
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -136,7 +146,7 @@ msgstr ""
 "\n"
 "  CСdigo postal: "
 
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -144,7 +154,7 @@ msgstr ""
 "\n"
 "  PaМs:        "
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
@@ -152,7 +162,7 @@ msgstr ""
 "\n"
 "Etiqueda de entrega: "
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -160,7 +170,7 @@ msgstr ""
 "\n"
 "TelИfonos:\n"
 
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -168,7 +178,7 @@ msgstr ""
 "\n"
 "TelИfono:"
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -176,7 +186,7 @@ msgstr ""
 "\n"
 "Correo electrСnico:\n"
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -184,7 +194,7 @@ msgstr ""
 "\n"
 "Correo electrСnico:"
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -192,7 +202,7 @@ msgstr ""
 "\n"
 "Cliente de correo: "
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -200,7 +210,7 @@ msgstr ""
 "\n"
 "Zona horaria: "
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -208,7 +218,7 @@ msgstr ""
 "\n"
 "LocalizaciСn XeogrАfica: "
 
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -216,7 +226,7 @@ msgstr ""
 "\n"
 "Posto Laboral: "
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -224,7 +234,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -232,7 +242,7 @@ msgstr ""
 "\n"
 "  Nome:  "
 
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -240,7 +250,7 @@ msgstr ""
 "\n"
 "  Unidade:  "
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -248,7 +258,7 @@ msgstr ""
 "\n"
 "  Unidade2: "
 
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -256,7 +266,7 @@ msgstr ""
 "\n"
 "  Unidade3: "
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -264,7 +274,7 @@ msgstr ""
 "\n"
 "  Unidade4: "
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -272,7 +282,7 @@ msgstr ""
 "\n"
 "CategorМas: "
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -290,7 +300,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -298,7 +308,7 @@ msgstr ""
 "\n"
 "Cadea Exclusiva: "
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -306,27 +316,25 @@ msgstr ""
 "\n"
 "Clave pЗblica: "
 
-#: addressbook/backend/ebook/e-destination.c:232
-msgid "???"
-msgstr "???"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr "FАbrica para importar ficheiros GnomeCard a Evolution."
+#: addressbook/backend/ebook/e-card.c:4037
+#, fuzzy
+msgid "Multiple VCards"
+msgstr "MЗltiples Mensaxes"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "Importa ficheiros GnomeCard a Evolution."
+#: addressbook/backend/ebook/e-card.c:4045
+#, fuzzy, c-format
+msgid "VCard for %s"
+msgstr "Introduza o contrasinal %s"
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:43
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:99 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Non foi posible inicializar Bonobo"
 
@@ -339,14 +347,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook non cargado\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Non foi posible iniciar o servidor wombat"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Non foi posible iniciar wombat"
 
@@ -356,726 +364,848 @@ msgstr "Non foi posible iniciar wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Non foi posible ler o bloque de aplicaciСn Enderezo de pilot"
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr "Un control de Bonobo para un menЗ emerxente de enderezo."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "Un control de Bonobo para amosar un enderezo."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "Unha mostra de control de Bonobo que amosa un libro de enderezos."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Control que amosa unha minitarxeta de libro de enderezos de Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "CompoЯente de Evolution para manexar contactos."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr "FАbrica para o control da Minitarxeta do Libro de Enderezos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr "FАbrica para o visor de enderezos do Libro de Enderezos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr "FАbrica para o menЗ emerxente do enderezo do Libro de Enderezos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr "FАbrica para o compoЯente Libro de Enderezos de Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr "FАbrica para a mostra de control do Libro de Enderezos"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "Servidor LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Ficheiro"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Tipo de libro de enderezos descoЯecido"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "NingЗn (modo anСnimo)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Contrasinal"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Tipo de autenticaciСn descoЯecido"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "Base"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "зnico"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "SubАrbore"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr "Tipo de Аmbito descoЯecido"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr "Asignar ND:"
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr "AMаяAME Texto de axuda para Asignar ND aquМ"
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Lembrar este contrasinal"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "Servidor:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr "AMаяAME Texto de axuda para Servidor aquМ"
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "ND RaМz:"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr "AMаяAME Texto de axuda para ND RaМz aquМ"
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Porto:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr "AMаяAME Texto de axuda para Porto aquМ"
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "Buscar аmbito:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "AutenticaciСn:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "CamiЯo:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr "AMаяAME Texto de axuda para CamiЯo aquМ"
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "Crear camiЯo se non existe."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "Editar o Libro de Enderezos"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "Engadir Libro de Enderezos"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"Elixe a clase de Libro de Enderezos que tes, e introduce a informaciСn "
+"relevante sobre el."
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Nome:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr "AMаяAME Texto de axuda para Nome aquМ"
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "DescriciСn:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr "AMаяAME Texto de axuda para DescriciСn aquМ"
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "Engadir"
+msgid "Addressbook Sources"
+msgstr "Engadir Fontes para o Libro de Enderezos"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Eliminar"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Nome:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "_Engadir"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "_Editar"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "Outros Contactos"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "Introduza o contrasinal %s"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Non se pode abrir o libro de enderezos"
+
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
+msgstr "Calquera campo contИn"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "Nome contИn"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "Enderezo contИn"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "Nome contИn"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "O URI que amosarА o Navegador de Cartafoles"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "Correo electrСnico principal"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "Correo ElectrСnico 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "Correo ElectrСnico 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "Seleccionar un ficheiro"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Crear un novo contacto"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "Editar o Libro de Enderezos"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "Editar InformaciСn de Contacto"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "Engadir a Contactos"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "Enderezo de Correo-E:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "Desactivar PeticiСns"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Activar PeticiСns (║Perigoso!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Interfaz de selecciСn de nome do Libro de Enderezos de Evolution"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+"FАbrica para a interfaz de selecciСn de nome do Libro de Enderezos de "
+"Evolution"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Quitar"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "Quitar Todos"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "Enviando Correo"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Outros Contactos"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "Destinatarios da mensaxe"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "Seleccionar Nomes"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "Seleccionar nome desde:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "CategorМa:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Buscar"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "Ani_versario:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "T_raballo"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "_Fax do traballo"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "C_ontactos..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ca_tegorМas..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Detalles"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Arquivar como:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Xeral"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Novo tipo de telИfono"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "No_tas:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "OrganizaciСn:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Tipos de telИfono"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
-msgstr "Correo electrСnico principal"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "Quere recibir correo en _HTML"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Enderezo da pАxina Web:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
-msgstr "_Engadir"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "_Enderezo..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "Nome do _asistente:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "_Aniversario:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Traballo"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_CompaЯМa:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "_Contactos..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:625 mail/mail-config.glade.h:75
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:93
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "_Departamento:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "Nome _completo..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_Particular"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "_Posto de traballo:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "Nome do _Xestor:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_MСbil"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "_Sobrenome:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "_Oficina:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_ProfesiСn:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "_CСnxuxe:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "_Este И o enderezo da lista de correo"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "©Borrar Contacto?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 #, fuzzy
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertence a estas categorМas:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Asistente"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Traballo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Traballo 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Fax do Traballo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "ReincorporaciСn"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "AutomСbil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "CompaЯМa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Particular 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Fax Particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "RDSI"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "MСbil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Outro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Outro Fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Localizador (Pager)"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
-msgid "Email 2"
-msgstr "Correo ElectrСnico 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
-msgid "Email 3"
-msgstr "Correo ElectrСnico 3"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "©Borrar Contacto?"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:233
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Engadir Contacto Rapidamente"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:235
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "Editar Completo"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:276
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Nome Completo:"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:282
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "Correo ElectrСnico"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Enderezo _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "CanadА"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Comprobar Enderezo"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "_PaМs:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Finlandia"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "Estados Unidos"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Enderezo:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_Cidade:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "_Apdo. de Correos:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "E_stado/Provincia:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "CСdigo _Postal:"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Comprobar Nome Completo"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Don"
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "fillo"
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "SriЯa."
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Sr."
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Sra."
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Sra."
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Nome:"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_Apelidos:"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Outros nomes:"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_Sufixo:"
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Tratamento:"
 
-#: addressbook/gui/component/addressbook.c:241
-msgid "As _Minicards"
-msgstr "Como _Minitarxetas"
-
-#: addressbook/gui/component/addressbook.c:247
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Como unha _TАboa"
-
-#: addressbook/gui/component/addressbook.c:399
-#, c-format
-msgid "Enter password for %s"
-msgstr "Introduza o contrasinal %s"
-
-#: addressbook/gui/component/addressbook.c:427
-msgid "Unable to open addressbook"
-msgstr "Non se pode abrir o libro de enderezos"
-
-#: addressbook/gui/component/addressbook.c:432
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Non fomos capaces de abrir este libro de enderezos. Isto\n"
-"significa que ou introduciches unha URI incorrecta, ou\n"
-"que se tentou acceder a un servidor LDAP e o programa\n"
-"non estА compilado con soporte LDAP. Se introduciches\n"
-"unha URI comproba que sexa correcta e volve introducila.\n"
-"SenСn, probablemente tentaches acceder a un servidor\n"
-"LDAP. Se desexas poder usar LDAP, necesitarАs baixar e\n"
-"instalar OpenLDAP e recompilar e instalar Evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:555 widgets/misc/e-filter-bar.h:95
-msgid "Show All"
-msgstr "Ver Todos"
-
-#: addressbook/gui/component/addressbook.c:557
-msgid "Advanced..."
-msgstr "Avanzado..."
-
-#: addressbook/gui/component/addressbook.c:587 calendar/gui/gnome-cal.c:236
-msgid "Any field contains"
-msgstr "Calquera campo contИn"
-
-#: addressbook/gui/component/addressbook.c:588
-msgid "Name contains"
-msgstr "Nome contИn"
-
-#: addressbook/gui/component/addressbook.c:589
-msgid "Email contains"
-msgstr "Enderezo contИn"
-
-#: addressbook/gui/component/addressbook.c:732
-msgid "The URI that the Folder Browser will display"
-msgstr "O URI que amosarА o Navegador de Cartafoles"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "Servidor LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Ficheiro"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Tipo de libro de enderezos descoЯecido"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "NingЗn (modo anСnimo)"
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
-msgid "Password"
-msgstr "Contrasinal"
-
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:170
-msgid "Unknown auth type"
-msgstr "Tipo de autenticaciСn descoЯecido"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "Base"
-msgstr "Base"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "One"
-msgstr "зnico"
-
-#: addressbook/gui/component/addressbook-config.c:183
-msgid "Subtree"
-msgstr "SubАrbore"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Unknown scope type"
-msgstr "Tipo de Аmbito descoЯecido"
-
-#: addressbook/gui/component/addressbook-config.c:353
-msgid "Bind DN:"
-msgstr "Asignar ND:"
-
-#: addressbook/gui/component/addressbook-config.c:354
-msgid "FIXME Bind DN Help text here"
-msgstr "AMаяAME Texto de axuda para Asignar ND aquМ"
-
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
-msgstr "Lembrar este contrasinal"
-
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
-msgid "Host:"
-msgstr "Servidor:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Host help text here."
-msgstr "AMаяAME Texto de axuda para Servidor aquМ"
-
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Port:"
-msgstr "Porto:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "Nome de ficheiro:"
 
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
-msgstr "AMаяAME Texto de axuda para Porto aquМ"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "decembro"
 
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
-msgstr "ND RaМz:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
-msgstr "AMаяAME Texto de axuda para ND RaМz aquМ"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:435
-msgid "Search Scope:"
-msgstr "Buscar аmbito:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
+msgstr "Quitar"
 
-#: addressbook/gui/component/addressbook-config.c:489
-msgid "Authentication:"
-msgstr "AutenticaciСn:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "Editor de contactos"
 
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
-msgid "Path:"
-msgstr "CamiЯo:"
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "Editor de contactos"
 
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "FIXME Path Help text here"
-msgstr "AMаяAME Texto de axuda para CamiЯo aquМ"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:513
-msgid "Create path if it doesn't exist."
-msgstr "Crear camiЯo se non existe."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:647
-msgid "Edit Addressbook"
-msgstr "Editar o Libro de Enderezos"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#, fuzzy
+msgid "New Contact:"
+msgstr "Novo contacto"
 
-#: addressbook/gui/component/addressbook-config.c:649
-msgid "Add Addressbook"
-msgstr "Engadir Libro de Enderezos"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#, fuzzy
+msgid "Original Contact:"
+msgstr "Outros Contactos"
 
-#: addressbook/gui/component/addressbook-config.c:665
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
 msgstr ""
-"Elixe a clase de Libro de Enderezos que tes, e introduce a informaciСn "
-"relevante sobre el."
-
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
-msgid "Name:"
-msgstr "Nome:"
-
-#: addressbook/gui/component/addressbook-config.c:672
-msgid "FIXME Name help text here"
-msgstr "AMаяAME Texto de axuda para Nome aquМ"
-
-#: addressbook/gui/component/addressbook-config.c:674
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "DescriciСn:"
-
-#: addressbook/gui/component/addressbook-config.c:675
-msgid "FIXME Description help text here"
-msgstr "AMаяAME Texto de axuda para DescriciСn aquМ"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Engadir Fontes para o Libro de Enderezos"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:19
-#: mail/message-browser.c:203 ui/evolution-addressbook.xml.h:3
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Eliminar"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "Editar"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Nome:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+msgid "Changed Contact:"
 msgstr "Outros Contactos"
 
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "Desactivar PeticiСns"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "Activar PeticiСns (║Perigoso!)"
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
-msgstr "Editar InformaciСn de Contacto"
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
-msgid "Add to Contacts"
-msgstr "Engadir a Contactos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Un control de Bonobo para un menЗ emerxente de enderezo."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Un control de Bonobo para amosar un enderezo."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Unha mostra de control de Bonobo que amosa un libro de enderezos."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Control que amosa unha minitarxeta de libro de enderezos de Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "CompoЯente de Evolution para manexar contactos."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr "FАbrica para o control da Minitarxeta do Libro de Enderezos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "FАbrica para o visor de enderezos do Libro de Enderezos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
-msgstr "FАbrica para o menЗ emerxente do enderezo do Libro de Enderezos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "FАbrica para o compoЯente Libro de Enderezos de Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
-msgstr "FАbrica para a mostra de control do Libro de Enderezos"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
-msgstr "Quitar"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
-msgid "Remove All"
-msgstr "Quitar Todos"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Interfaz de selecciСn de nome do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "FАbrica para a interfaz de selecciСn de nome do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Buscar..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Destinatarios da mensaxe"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Seleccionar Nomes"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Seleccionar nome desde:"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
+msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Buscar"
 
@@ -1187,156 +1317,254 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "Gardar como TarxetaV"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr "Enviar contacto a outro"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Send message to contact"
 msgstr "Enviar mensaxe a un contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/message-browser.c:200
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:51 ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr "ConfiguraciСn da ImpresiСn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Eliminar"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "Erro cargando %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "Fontes"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Erro descoЯecido"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "Traballar desconectado"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "Permiso denegado"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "Ficheiro non atopado"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "OperaciСn non soportada"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "Cancelada"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "Erro de E/S"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "Erro cargando %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Erro cargando %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Erro cargando %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "Erro cargando %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr ""
+"Erro lendo os datos:\n"
+"%s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* Prema aquМ para engadir un contacto *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr "Arquivar como"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "Correo ElectrСnico"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "TelИfono Principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr "TelИfono do Asistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "TelИfono de Negocios"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr "TelИfono de ReincorporaciСn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "TelИfono da CompaЯМa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "TelИfono Particular"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "OrganizaciСn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "Enderezo do Traballo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "Enderezo Particular"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "TelИfono MСbil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "TelИfono AutomСbil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "TelИfono Traballo 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "Particular 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "Outro TelИfono"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "Outro Enderezo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Sitio Web"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "Departamento"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Oficina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "TМtulo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "ProfesiСn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Xestor"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Sobrenome"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "CСnxuxe"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr "URL libre-ocupada"
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "Feito"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "Cargando axenda..."
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Gardar no libro de enderezos"
 
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1379,7 +1607,8 @@ msgid "Dimensions:"
 msgstr "DimensiСns:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Fonte..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1439,7 +1668,6 @@ msgid "Margins"
 msgstr "Marxes"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "NЗmero de columnas:"
 
@@ -1519,39 +1747,64 @@ msgstr "Tipo:"
 msgid "Width:"
 msgstr "Largura:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Fonte..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Erro comunicando co servidor de axenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 #, fuzzy
 msgid "Could not read pilot's Calendar application block"
 msgstr "Non foi posible ler o bloque de aplicaciСn pilot da Axenda"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 #, fuzzy
 msgid "Could not read pilot's ToDo application block"
 msgstr "Non foi posible ler o bloque de aplicaciСn pilot ToDo (PorFacer)"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "Recordatorio da cita en "
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Unha mostra de control Bonobo que mostra unha axenda."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Adiar"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr "CompoЯente da axenda do resume executivo de Evolution."
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Aceptar"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Visor da axenda iTip/iMip de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr "CompoЯente de Evolution para manexar a axenda."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr "FАbrica para o compoЯente Resume da Axenda."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr "FАbrica para o compoЯente da axenda de Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr "FАbrica para o control vista iTip da axenda"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr "FАbrica para a mostra de control Axenda"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "FАbrica para o compoЯente da axenda de Evolution."
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1561,140 +1814,258 @@ msgstr "Servicio de notificaciСn de alarma"
 msgid "Factory for the alarm notification service"
 msgstr "FАbica para o sercivio de notificaciСn de alarma"
 
-#: calendar/gui/alarm-notify/notify-main.c:56
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "NotificaciСn da sЗa cita o %A, %d de %b de %Y, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "NotificaciСn da sЗa cita o %A, %d de %b de %Y, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "NotificaciСn da sЗa cita o %A, %d de %b de %Y, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "NotificaciСn da sЗa cita o %A, %d de %b de %Y, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "NotificaciСn da sЗa cita o %A, %d de %b de %Y, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "NotificaciСn da sЗa cita o %A, %d de %b de %Y, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "NotificaciСn da sЗa cita o %A, %d de %b de %Y, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "Amosar informaciСn sobre o Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "Alarma o %A, %d de %b de %Y, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Pechar"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "Adiar"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "Tempo de adiamento (minutos)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "Editar cita"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "Non hai resume dispoЯible."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "Recordatorio da cita en "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "Adiar"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Aceptar"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
 "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
 "know."
-msgstr "Son (И) a(s) %s. O tempo Unix И agora %ld. Pensamos que che pode apetecer sabelo."
+msgstr ""
+"Son (И) a(s) %s. O tempo Unix И agora %ld. Pensamos que che pode apetecer "
+"sabelo."
 
-#: calendar/gui/alarm-notify/notify-main.c:94 calendar/gui/main.c:52
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
 msgid "Could not initialize GNOME"
 msgstr "Non foi posible inicializar GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:109
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Non foi posible inicializar Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
 msgid "Could not create the alarm notify service factory"
 msgstr "Non foi posible crear a fАbrica do servicio de notificacin de alarma"
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
-msgstr "Ficheiro non atopado"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A, %d de %B de %Y"
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
-msgstr "Abrir axenda"
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d de %b"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d de %b"
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
-msgstr "Gardar axenda"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:468
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B de %Y"
+
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr "Non foi posible crear o visor da axenda. Comproba a tЗa configuraciСn de ORBit e OAF."
+msgstr ""
+"Non foi posible crear o visor da axenda. Comproba a tЗa configuraciСn de "
+"ORBit e OAF."
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "PЗblico"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1606
-#: calendar/gui/event-editor.c:1633
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "DescoЯecido"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:690
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Alta"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
-#: calendar/gui/calendar-model.c:1569
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:689
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:688
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Baixa"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Transparente"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Opaco"
 
-#: calendar/gui/calendar-model.c:635 calendar/gui/calendar-model.c:1173
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Non Iniciada"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1175
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "En Progreso"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1177
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "Completada"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1179
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
-#: camel/camel-service.c:586
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Cancelada"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:799
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1705,24 +2076,29 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:879
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
-"A clasificaciСn ten que ser 'PЗblica', 'Privada', 'Confidencial' ou 'Ningunha'"
+"A clasificaciСn ten que ser 'PЗblica', 'Privada', 'Confidencial' ou "
+"'Ningunha'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:893 calendar/gui/calendar-model.c:1117
-#: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1179
-#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
-#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Nada"
 
-#: calendar/gui/calendar-model.c:967
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1732,116 +2108,292 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1007
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "A porcentaxe ten que ser un valor entre 0 e 100, inclusive"
 
-#: calendar/gui/calendar-model.c:1048
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "A prioridade ten que ser 'Alta', 'Normal', 'Baixa' ou 'Indefinida'."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1061
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Indefinida"
 
-#: calendar/gui/calendar-model.c:1102
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "A transparencia ten que ser 'Transparente, 'Opaca' ou 'Ningunha'."
 
-#: calendar/gui/calendar-model.c:1571
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "Recurrindo"
 
-#: calendar/gui/calendar-model.c:1573
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Asignada"
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Si"
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Non"
 
-#: calendar/gui/calendar-summary.c:198
-msgid "%A, %e %B %Y"
-msgstr "%A, %d de %B de %Y"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "Vista de Tarxeta"
 
-#: calendar/gui/calendar-summary.c:207
-msgid "Appointments"
-msgstr "Citas"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "Semana Lab_oral"
 
-#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "Definir Vistas"
 
-#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:948
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Tarefas"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "Mes"
 
-#: calendar/gui/calendar-summary.c:443
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Erro cargando a axenda</b>"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "O URI que amosarА a axenda"
 
-#: calendar/gui/calendar-summary.c:455
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Erro cargando a axenda:<br>MИtodo non soportado"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "Alarmas Sonoras"
 
-#: calendar/gui/calendar-summary.c:622
-msgid "Display"
-msgstr "Visualizar"
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "Destinatarios da mensaxe"
 
-#: calendar/gui/calendar-summary.c:627
-msgid "Show appointments"
-msgstr "Amosar citas..."
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "OpciСns de Vista"
 
-#: calendar/gui/calendar-summary.c:635
-msgid "Show tasks"
-msgstr "Amosar tarefas"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:690
-msgid "Things to do"
-msgstr "Cousas por facer"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Cargando Axenda"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "O URI que amosarА a axenda"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarma o %A, %d de %b de %Y, %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "Almacenamento da mensaxe"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "NotificaciСn da sЗa cita o %A, %d de %b de %Y, %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Tocar un son"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
-msgstr "Non hai resume dispoЯible."
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Pechar"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "Executar un programa"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Editar cita"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Tempo de adiamento (minutos)"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "dМas"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "Actualizar cada"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "horas"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "minutos"
+
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr "%d dМas"
+
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr " un dМa"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr " %d semanas"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr " unha semana"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr " %d horas"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr " unha hora"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr " %d minutos"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr " un minuto"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr " %d segundos"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr " un segundo"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr "Tocar un son"
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "Mostrar todas as cabeceiras da mensaxe"
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an email"
+msgstr "Enviar unha mensaxe"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr "Executar un programa"
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr " antes do comezo da cita"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr " despois do comezo da cita"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr " antes da fin desta cita"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr " despois da fin desta cita"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "Base"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "Data e hora"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "Recordatorios"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Resume:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_OpciСns"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "despois"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "antes"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "dМa(s)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr "fin da cita"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr "hora(s)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+msgid "minute(s)"
+msgstr "minutos"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
+msgstr "comezo da cita"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
@@ -1872,36 +2424,38 @@ msgid "60 minutes"
 msgstr "60 minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "As alarmas saltan despois de"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Alarmas Sonoras"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "Chifrar cando aparece a fiestra de alarma."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Axenda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "Preferencias da Axenda"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Cores"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+#, fuzzy
+msgid "Compress weekends in month view"
 msgstr "Comprimir fins de semana"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+#, fuzzy
+msgid "Date Navigator"
 msgstr "OpciСns do navegador de Citas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1909,593 +2463,1091 @@ msgid "Defaults"
 msgstr "OpciСns por defecto"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "OpciСns de Vista"
+#: mail/mail-config.glade.h:30
+msgid "Display"
+msgstr "Visualizar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-#, fuzzy
-msgid "Due Date"
-msgstr "Cita Agardada"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#, fuzzy
-msgid "Enable snoozing for"
-msgstr "Activar adiando para"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Final do dМa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Primeiro dМa da semana:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "Ven"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:484
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Venres"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Resaltar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#, fuzzy
-msgid "Items Due Today"
-msgstr "Cousas esperadas para hoxe"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#, fuzzy
-msgid "Items Due Today:"
-msgstr "Cousas esperadas para hoxe:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#, fuzzy
-msgid "Items Not Yet Due"
-msgstr "Cousas aМnda non esperadas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#, fuzzy
-msgid "Items Not Yet Due:"
-msgstr "Cousas aМnda non esperadas:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Luns"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#, fuzzy
-msgid "Overdue Items"
-msgstr "Retrasar Cousas"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 #, fuzzy
-msgid "Overdue Items:"
-msgstr "Retrasar Cousas:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
-msgstr "Escoller unha cor"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "Prioridade"
+msgid "Overdue tasks"
+msgstr "Retrasar Cousas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Lembrarme todas as citas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Recordatorios"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "SАb"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:485
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "SАbado"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Amosar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "Amosar os prazos finais das citas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Amosar nЗmeros de semana"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "Inicio do dМa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "Dom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:486
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Domingo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #, fuzzy
-msgid "TaskPad"
-msgstr "Rota de Tarefas"
+msgid "Task List"
+msgstr "Tarefas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "Cousas esperadas para hoxe"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "Xov"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Xoves"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Tempo ata que se deba facer"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Time"
+msgstr "TМtulo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "DivisiСns da hora:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Formato da hora:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"Zona horaria: "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "Mar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Martes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Alarmas Visuais"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "MИr"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "MИrcores"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "Semana de traballo"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
+msgstr "Semana Lab_oral"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "minutos antes de que ocorran."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
-msgid "seconds."
-msgstr "segundos."
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "©EstА seguro de que quere borrar esta conta?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "©EstА seguro de que quere borrar a tarefa `%s'?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "©EstА seguro de que quere borrar a entrada de diario `%s'?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "Completada"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "Completada"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#, fuzzy
+msgid "Due "
+msgstr "Cita Agardada"
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "Editar Cita"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "Cita - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "Tarefa - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Entrada de diario - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Sen resume"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "©Sobrescribir ficheiro?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Xa existe un ficheiro con ese nome.\n"
+"©Sobrescribilo?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+#, fuzzy
+msgid "Save As..."
+msgstr "Gardar _Como..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "©EstА seguro de que quere borrar a cita `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:73
+#: calendar/gui/dialogs/delete-comp.c:87
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "©EstА seguro de que quere borrar esta cita sen tМtulo?"
 
-#: calendar/gui/dialogs/delete-comp.c:79
+#: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "©EstА seguro de que quere borrar a tarefa `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:82
+#: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "©EstА seguro de que quere borrar esta tarefa sen tМtulo?"
 
-#: calendar/gui/dialogs/delete-comp.c:88
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "©EstА seguro de que quere borrar a entrada de diario `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "©EstА seguro de que quere borrar esta entrada de diario sen tМtulo?"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "©Quere gardar os cambios?"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "©EstА seguro de que quere borrar a cita `%s'?"
 
-#: calendar/gui/dialogs/task-editor.c:707
-msgid "Edit Task"
-msgstr "Editar Tarefa"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "©EstА seguro de que quere borrar a tarefa `%s'?"
 
-#: calendar/gui/dialogs/task-editor.c:713 calendar/gui/event-editor.c:382
-msgid "No summary"
-msgstr "Sen resume"
+#: calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "©EstА seguro de que quere borrar a entrada de diario `%s'?"
 
-#: calendar/gui/dialogs/task-editor.c:719 calendar/gui/event-editor.c:388
-#, c-format
-msgid "Appointment - %s"
-msgstr "Cita - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Seleccionar un ficheiro"
 
-#: calendar/gui/dialogs/task-editor.c:722 calendar/gui/event-editor.c:391
-#, c-format
-msgid "Task - %s"
-msgstr "Tarefa - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "SecciСns:"
 
-#: calendar/gui/dialogs/task-editor.c:725 calendar/gui/event-editor.c:394
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Entrada de diario - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Zona horaria: "
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% Comp_leta:"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
+msgstr "Cita"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
+msgstr "Recordatorio"
+
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
+msgstr "Recurrencia"
+
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "Cancelar ReuniСn"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "Evento de dМa comp_leto"
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "ClasificaciСn"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Date & Time"
 msgstr "Data e hora"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Data Completada:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Pri_vate"
 msgstr "Pri_vado"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "En Progreso"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "PЗ_blico"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Data de _Inicio:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "_Resume:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Tarefa"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "_Contactos..."
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "Hora de _finalizaciСn:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "Hora de _comezo:"
+
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
 #, fuzzy
-msgid "_Due Date:"
-msgstr "_Data Estimada:"
+msgid "Group"
+msgstr "Nome do grupo:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_Prioridade:"
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Orixe do papel:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "_Estado:"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
-msgstr "CategorМas"
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+#, fuzzy
+msgid "Chair"
+msgstr "Presidir"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Completion Date"
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr "Participantes Requiridos"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr "Participante Opcional"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr "Non-Participante"
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Engadir acciСn"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr " Aceptar "
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr " Rexeitar "
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Tentativa"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Eliminada"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "En Progreso"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "TelИfono AutomСbil"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Participantes Requiridos"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Participante Opcional"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Non-Participante"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "Enviada"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "Eliminar..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#, fuzzy
+msgid "Attendee"
+msgstr "Ocupada"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
 msgstr "Data na que se completa"
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "End Date"
-msgstr "Data de _finalizaciСn:"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "Eliminada"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Start Date"
-msgstr "Data de _Inicio:"
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "Eliminada"
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
-msgstr "PosiciСn xeogrАfica"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "Xestor"
 
-#: calendar/gui/e-calendar-table.c:164
-msgid "Percent complete"
-msgstr "Porcentaxe colpleta"
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "decembro"
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Summary"
-msgstr "_Resume"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr "RSVP"
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
-msgstr "Transparencia"
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr "Posto"
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Estado"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Tipo:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizador:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Organizador:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "_Convidar Outros..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Organizador:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a, %d de %b de %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Esta cita contИn recurrencias que Evolution non pode editar."
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr "o"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "dМa"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr "no"
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+#, fuzzy
+msgid "th"
+msgstr "4╨"
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr "ocurrencias"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
+msgstr "Recurrencia personalizada"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Cada"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "ExcepciСns"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
+msgstr "Sen recurrencia"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
+msgstr "Previsualizar"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
+msgstr "Regra de Recurrencia"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
+msgstr "Recurrencia simple"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "Modificar"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "para"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "para sempre"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "mes(es)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr "ata"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "semana(s)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
+msgstr "ano(s)"
+
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr "©Quere gardar os cambios?"
+
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "Data Completada:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "Eliminada"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "Eliminada"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "Nada"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
-msgstr "Alarmas"
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "Tarefa"
 
-#: calendar/gui/e-calendar-table.c:170
-msgid "Click here to add a task"
-msgstr "Prema aquМ para engadir unha tarefa"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% Comp_leta:"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
+msgstr "En Progreso"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "Data de _Inicio:"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
+#, fuzzy
+msgid "_Due Date:"
+msgstr "_Data Estimada:"
+
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
+msgstr "_Prioridade:"
+
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
+msgstr "_Estado:"
+
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "Marcar como Completa"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
-msgstr "Marcar a tarefa como completa"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "Co_rtar"
 
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit this task..."
-msgstr "Editar esta tarefa..."
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "Editar Tarefa"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "_Pegar"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "Marcar como Completa"
+
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Borrar esta tarefa"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
+msgstr "Marcar como Completa"
+
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Borrar a tarefa"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
-msgstr "am"
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "Prema aquМ para engadir unha tarefa"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% Comp_leta:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Alarmas"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "CategorМas"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "Completo"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "Data na que se completa"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+#, fuzzy
+msgid "Due Date"
+msgstr "Cita Agardada"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Data de _finalizaciСn:"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "PosiciСn xeogrАfica"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Prioridade"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Data de _Inicio:"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "_Resume"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "Tarefas"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "Transparencia"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL:"
+
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i divisiСns de minuto"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A, %d de %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr "%a %d de %b"
-
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d de %b"
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "pm"
+
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Nova Cita"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "Novo Evento de dМa _completo"
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
-msgid "Go to Today"
-msgstr "Ir a Hoxe"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "Ir a _Hoxe"
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "Ir А Data"
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Abrir"
-
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Borrar esta Cita"
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "AMаяAME: Programar ReuniСn"
-
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Facer esta Ocurrencia Movible"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "Borrar esta Ocurrencia"
 
-#: calendar/gui/e-day-view.c:3179
-msgid "Delete all Occurrences"
-msgstr "Borrar todas as Ocurrencias"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
+msgstr "Borrar Todas as Ocurrencias"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i divisiСns de minuto"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
-msgstr "║Non foi posible actualizar o ficheiro da axenda!\n"
+#: calendar/gui/e-itip-control.c:697
+#, fuzzy
+msgid "This is a meeting request."
+msgstr "_Este И o enderezo da lista de correo"
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
-msgid "Component successfully updated."
-msgstr "CompoЯente actualizada con Иxito."
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
-msgstr "Houbo un erro cargando o ficheiro da axenda."
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
-msgstr "║Non foi posible abir o ficheiro da axenda!\n"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
-msgstr "║Non foi posible cargar o ficheiro da axenda!\n"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
-msgstr "║Non foi posible ler o ficheiro da axenda!\n"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+#, fuzzy
+msgid "The message is not understandable."
+msgstr "Esta mensaxe non estА dispoЯible actualmente."
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
-msgstr "║Esta И unha resposta de alguИn que non foi convidado!"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:499
-msgid "I couldn't update your calendar store."
-msgstr "║Non foi posible actualizar o almacenamento da axenda!"
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
-msgstr "║Non se puido borrar o compoЯente da axenda!\n"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Component successfully deleted."
-msgstr "CompoЯente borrado con Иxito."
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-msgid "I don't recognize this type of calendar component."
-msgstr "Non se recoЯece este tipo de compoЯente de axenda."
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
-msgstr "Engadir А Axenda"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
-msgid " Accept "
-msgstr " Aceptar "
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:815
-msgid " Decline "
-msgstr " Rexeitar "
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Tentative "
-msgstr " Tentativa "
+#: calendar/gui/e-itip-control.c:834
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "O cartafol parece estar corrompido sen recuperaciСn posible."
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
-msgstr "Actualizar Axenda"
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
-msgstr "Cancelar ReuniСn"
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr "║Non foi posible actualizar o ficheiro da axenda!\n"
+
+#: calendar/gui/e-itip-control.c:1015
+#, fuzzy
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "║Non foi posible abir o ficheiro da axenda!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, fuzzy, no-c-format
@@ -2510,26 +3562,22 @@ msgstr "--a--"
 msgid "Calendar Message"
 msgstr "Mensaxe da Axenda"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:623
+#: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Data:"
 
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "Cargando Axenda"
+
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Cargando axenda..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizador:"
-
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Mensaxe de servidor:"
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Resume:"
-
 #: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "data-finalizaciСn"
@@ -2538,423 +3586,48 @@ msgstr "data-finalizaciСn"
 msgid "date-start"
 msgstr "data-comezo"
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-#, fuzzy
-msgid "Attendee"
-msgstr "Ocupada"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-#, fuzzy
-msgid "Attendee address"
-msgstr "Enderezo ocupado"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-#, fuzzy
-msgid "Attendees: "
-msgstr "Ocupadas: "
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"Cancelar\n"
-"ReuniСn"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-#, fuzzy
-msgid "Chair"
-msgstr "Presidir"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "Convida para a ReuniСn"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "Non-Participante"
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "Participante Opcional"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "Organizador:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"Publicar\n"
-"Evento"
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"Solicitar\n"
-"ReuniСn"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Required Participant"
-msgstr "Participantes Requiridos"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid "Role"
-msgstr "Posto"
-
-#: calendar/gui/e-meeting-dialog.glade.h:22
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"Programar\n"
-"Hora"
-
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1082
-msgid "Status"
-msgstr "Estado"
-
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "Todas"
 
-#: calendar/gui/e-tasks.c:155
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "CategorМa:"
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Non foi posible cargar as tarefas en `%s'"
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "O mИtodo requirido para cargar `%s' non estА soportado"
 
-#: calendar/gui/event-editor.c:376
-msgid "Edit Appointment"
-msgstr "Editar Cita"
-
-#: calendar/gui/event-editor.c:454
-msgid "on"
-msgstr "o"
-
-#: calendar/gui/event-editor.c:479 filter/filter-datespec.c:81
-msgid "day"
-msgstr "dМa"
-
-#: calendar/gui/event-editor.c:606
-msgid "on the"
-msgstr "no"
-
-#: calendar/gui/event-editor.c:613
-#, fuzzy
-msgid "th"
-msgstr "4╨"
-
-#: calendar/gui/event-editor.c:759
-msgid "occurrences"
-msgstr "ocurrencias"
-
-#: calendar/gui/event-editor.c:876
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Esta cita contИn recurrencias que Evolution non pode editar."
-
-#: calendar/gui/event-editor.c:1548
-#, c-format
-msgid " %d days"
-msgstr "%d dМas"
-
-#: calendar/gui/event-editor.c:1550
-msgid " 1 day"
-msgstr " un dМa"
-
-#: calendar/gui/event-editor.c:1553
-#, c-format
-msgid " %d weeks"
-msgstr " %d semanas"
-
-#: calendar/gui/event-editor.c:1555
-msgid " 1 week"
-msgstr " unha semana"
-
-#: calendar/gui/event-editor.c:1558
-#, c-format
-msgid " %d hours"
-msgstr " %d horas"
-
-#: calendar/gui/event-editor.c:1560
-msgid " 1 hour"
-msgstr " unha hora"
-
-#: calendar/gui/event-editor.c:1563
-#, c-format
-msgid " %d minutes"
-msgstr " %d minutos"
-
-#: calendar/gui/event-editor.c:1565
-msgid " 1 minute"
-msgstr " un minuto"
-
-#: calendar/gui/event-editor.c:1568
-#, c-format
-msgid " %d seconds"
-msgstr " %d segundos"
-
-#: calendar/gui/event-editor.c:1570
-msgid " 1 second"
-msgstr " un segundo"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1593
-msgid "Play a sound"
-msgstr "Tocar un son"
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1596
-msgid "Show a dialog"
-msgstr "Amosar un diАlogo"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1599
-msgid "Send an email"
-msgstr "Enviar unha mensaxe"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1602
-msgid "Run a program"
-msgstr "Executar un programa"
-
-#: calendar/gui/event-editor.c:1617
-msgid " before start of appointment"
-msgstr " antes do comezo da cita"
-
-#: calendar/gui/event-editor.c:1619
-msgid " after start of appointment"
-msgstr " despois do comezo da cita"
-
-#: calendar/gui/event-editor.c:1627
-msgid " before end of appointment"
-msgstr " antes da fin desta cita"
-
-#: calendar/gui/event-editor.c:1629
-msgid " after end of appointment"
-msgstr " despois da fin desta cita"
-
-#: calendar/gui/event-editor.c:3137 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%a, %d de %b de %Y"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Evento de dМa comp_leto"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Cita"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "BАsicos sobre Citas"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Recurrencia personalizada"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Cada"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "ExcepciСns"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Modificar"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Sen recurrencia"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Previsualizar"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Recurrencia"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Regra de Recurrencia"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Recordatorio"
-
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "Preferencias..."
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Recurrencia simple"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "Hora de _finalizaciСn:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "Hora de _comezo:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "Data de _comezo:"
-
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "despois"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
-msgid "before"
-msgstr "antes"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "dМa(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "fin da cita"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "para"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "para sempre"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "hora(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
-msgid "minute(s)"
-msgstr "minutos"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr "mes(es)"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "start of appointment"
-msgstr "comezo da cita"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "until"
-msgstr "ata"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "week(s)"
-msgstr "semana(s)"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "year(s)"
-msgstr "ano(s)"
-
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-msgid "New Appointment..."
-msgstr "Nova Cita..."
-
-#: calendar/gui/e-week-view.c:3314
-msgid "Delete All Occurrences"
-msgstr "Borrar Todas as Ocurrencias"
-
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d de %b"
 
-#: calendar/gui/gnome-cal.c:223
-msgid "Show all "
-msgstr "Amosar todas "
-
-#: calendar/gui/gnome-cal.c:237
-msgid "Summary contains"
-msgstr "O resume contИn"
-
-#: calendar/gui/gnome-cal.c:238
-msgid "Description contains"
-msgstr "A descriciСn contИn"
-
-#: calendar/gui/gnome-cal.c:239
-msgid "Comment contains"
-msgstr "O comentario contИn"
-
-#: calendar/gui/gnome-cal.c:240
-msgid "Has category"
-msgstr "Ten a categorМa"
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "Nova Cita..."
 
-#: calendar/gui/gnome-cal.c:843
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Non foi posible abrir o cartafol en `%s'"
 
-#: calendar/gui/gnome-cal.c:854
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "O mИtodo requirido para cargar `%s' non estА soportado"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Unha mostra de control Bonobo que mostra unha axenda."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr "CompoЯente da axenda do resume executivo de Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Visor da axenda iTip/iMip de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "CompoЯente de Evolution para manexar a axenda."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr "FАbrica para o compoЯente Resume da Axenda."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "FАbrica para o compoЯente da axenda de Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr "FАbrica para o control vista iTip da axenda"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr "FАbrica para a mostra de control Axenda"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "abril"
@@ -2976,233 +3649,257 @@ msgid "Go To Date"
 msgstr "Ir А Data"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Ir a hoxe"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "xaneiro"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "xullo"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "xuЯo"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "marzo"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "maio"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "novembro"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "outubro"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "setembro"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Ir a hoxe"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Xo"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "Sa"
 
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Tarefas"
+
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "DМa actual (%a, %d de %b de %Y)"
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d de %Y"
 
-#: calendar/gui/print.c:1104
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Semana actual (%s - %s)"
 
 # Isto estА mal, o %a И o nome de semana
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Mes actual (%b de %Y)"
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Ano actual (%Y)"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Imprimir Axenda"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1488
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:53
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "PrevisualizaciСn da ImpresiСn"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Imprimir este elemento"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "ConfiguraciСn da ImpresiСn"
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "O URI do cartafol de tarefas a amosar"
 
@@ -3210,7 +3907,9 @@ msgstr "O URI do cartafol de tarefas a amosar"
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
-msgstr "Evolution colleu as tarefas que estaban no cartafol da axenda e migrounas automaticamente ao novo cartafol de tarefas."
+msgstr ""
+"Evolution colleu as tarefas que estaban no cartafol da axenda e migrounas "
+"automaticamente ao novo cartafol de tarefas."
 
 #: calendar/gui/tasks-migrate.c:109
 msgid ""
@@ -3219,104 +3918,129 @@ msgid ""
 "Some of the tasks could not be migrated, so this process may be attempted "
 "again in the future."
 msgstr ""
-"Evolution tentou coller as tarefas que estaban no cartafol da axenda e migralas automaticamente ao novo cartafol de tarefas.\n"
-"Non foi posible migrar algunhas das tarefas, asМ que pode tentar facerse este proceso outra vez no futuro."
+"Evolution tentou coller as tarefas que estaban no cartafol da axenda e "
+"migralas automaticamente ao novo cartafol de tarefas.\n"
+"Non foi posible migrar algunhas das tarefas, asМ que pode tentar facerse "
+"este proceso outra vez no futuro."
 
 #: calendar/gui/tasks-migrate.c:121
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
-msgstr "Non se puido abrir `%s'; non se migrarАn obxectos do cartafol da axenda ao de tarefas."
+msgstr ""
+"Non se puido abrir `%s'; non se migrarАn obxectos do cartafol da axenda ao "
+"de tarefas."
 
 #: calendar/gui/tasks-migrate.c:134
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
-msgstr "Non estА soportado o mИtodo requerido para cargar `%s'; non se migrarАn obxectos do cartafol da axenda ao de tarefas."
+msgstr ""
+"Non estА soportado o mИtodo requerido para cargar `%s'; non se migrarАn "
+"obxectos do cartafol da axenda ao de tarefas."
 
 #: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
 msgid "SMTWTFS"
 msgstr "DLMMXVS"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "Non estА soportado asinar por este cifrado"
 
-#: camel/camel-cipher-context.c:209
+#: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
 msgstr "Non estА soportado asinar en claro por este cifrado"
 
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
 msgstr "Non estА soportado verificar por este cifrado"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
 msgstr "Non estА soportado encriptar por este cifrado"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:336
 msgid "Decryption is not supported by this cipher"
 msgstr "Non estА soportado desencriptar por este cifrado"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr "Debe estar traballando conectado para completar esta operaciСn"
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "Sincronizando cartafoles"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Incapaz de abrir o cartafol spool"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Incapaz de procesar o cartafol spool"
 
-#: camel/camel-filter-driver.c:666
-#, c-format
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "Recibindo a mensaxe %d (%d%%)"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
-#, c-format
-msgid "Failed message %d"
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, fuzzy, c-format
+msgid "Failed on message %d"
 msgstr "Fallo na mensaxe %d"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "Sincronizando cartafol"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-msgid "Complete"
-msgstr "Completo"
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro analizando o filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro executando o filtro: %s: %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro executando bЗsqueda por filtro: %s: %s"
@@ -3352,17 +4076,38 @@ msgstr "Efectuando peticiСn sobre a cabeceira descoЯecida: %s"
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Tipo invАlido nos contidos do corpo, agardАbase unha cadea"
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Non foi posible crear unha canalizaciСn: %s"
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "Non foi posible facer fork: %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Non foi posible crear o ficheiro de bloqueo para %s: %s"
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "A operaciСn expirou tentando obter o ficheiro de bloqueo sobre %s. TИnteo de novo mАis tarde."
+msgstr ""
+"A operaciСn expirou tentando obter o ficheiro de bloqueo sobre %s. TИnteo de "
+"novo mАis tarde."
 
 #: camel/camel-lock.c:201
 #, c-format
@@ -3374,120 +4119,116 @@ msgstr "Fallo ao tentar obter bloqueo usando fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Fallo ao tentar obter bloqueo usando flock(2): %s"
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Non foi posible comprobar o ficheiro de correo %s: %s"
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Non foi posible abrir o ficheiro de correo %s: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Non foi posible abrir o ficheiro de correo temporal %s: %s"
 
-#: camel/camel-movemail.c:199
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Non foi posible comprobar o ficheiro de bloqueo para %s: %s"
-
-#: camel/camel-movemail.c:245
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Erro lendo o ficheiro de correo: %s"
-
-#: camel/camel-movemail.c:256
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Erro escribindo o ficheiro temporal de correo: %s"
-
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Erro С almacenar o correo no ficheiro temporal %s: %s"
 
-#: camel/camel-movemail.c:306
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Non foi posible crear unha canalizaciСn: %s"
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Non foi posible facer fork: %s"
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "O programa movemail fallou: %s"
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Erro descoЯecido)"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Erro lendo o ficheiro de correo: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Erro escribindo o ficheiro temporal de correo: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Erro copiando o ficheiro temporal de correo: %s"
 
-#: camel/camel-pgp-context.c:190
-#, c-format, fuzzy
+#: camel/camel-pgp-context.c:193
+#, fuzzy, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Introduza o seu contrasinal %s para %s"
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:196
 #, fuzzy, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Introduza o seu contrasinal %s"
 
-#: camel/camel-pgp-context.c:513
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr "Non hai texto plano para asinar."
 
-#: camel/camel-pgp-context.c:520 camel/camel-pgp-context.c:692
-#: camel/camel-pgp-context.c:1060 camel/camel-pgp-context.c:1272
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Non se indicou un contrasinal."
 
-#: camel/camel-pgp-context.c:526 camel/camel-pgp-context.c:698
-#: camel/camel-pgp-context.c:881 camel/camel-pgp-context.c:1067
-#: camel/camel-pgp-context.c:1279
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Non foi posible crear unha canalizaciСn co GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:685
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr "Non hai texto plano para asinar en claro."
 
-#: camel/camel-pgp-context.c:875
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr "Non hai texto plano para verificar."
 
-#: camel/camel-pgp-context.c:892
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Non foi posible crear o ficheiro temporal: %s"
 
-#: camel/camel-pgp-context.c:1050
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr "Non hai texto plano para encriptar."
 
-#: camel/camel-pgp-context.c:1076
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "Non se especificaron destinatarios."
 
-#: camel/camel-pgp-context.c:1264
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr "Non hai texto cifrado para desencriptar."
 
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr "Non foi posible cargar %s: Non se soporta a carga de mСdulos neste sistema."
+msgstr ""
+"Non foi posible cargar %s: Non se soporta a carga de mСdulos neste sistema."
 
 #: camel/camel-provider.c:140
 #, c-format
@@ -3499,37 +4240,37 @@ msgstr "Non foi posible cargar %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Non foi posible cargar %s: Non hai cСdigo de inicializaciСn no mСdulo."
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s servidor %s"
 
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "servicio %s para %s en %s"
 
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr "ConexiСn Cancelada"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Non foi posible conectarse a %s (porto %d): %s"
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr "(mАquina descoЯecida)"
 
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:264
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "OperaciСn cancelada"
 
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "O servidor desconectou inesperadamente"
 
@@ -3546,7 +4287,7 @@ msgid "Authentication failed."
 msgstr "Fallo de autenticaciСn"
 
 #: camel/camel-sasl-anonymous.c:119
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Invalid email address trace information:\n"
 "%s"
@@ -3555,7 +4296,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-anonymous.c:131
-#, c-format, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Invalid opaque trace information:\n"
 "%s"
@@ -3581,7 +4322,9 @@ msgstr "CRAM-MD5"
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
-msgstr "Esta opciСn conectarase С servidor usando un contrasinal seguro CRAM-MD5, se o servidor o soporta."
+msgstr ""
+"Esta opciСn conectarase С servidor usando un contrasinal seguro CRAM-MD5, se "
+"o servidor o soporta."
 
 #: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
@@ -3592,7 +4335,9 @@ msgstr "DIGEST-MD5"
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
-msgstr "Esta opciСn conectarase С servidor usando un contrasinal seguro DIGEST-MD5, se o servidor o soporta."
+msgstr ""
+"Esta opciСn conectarase С servidor usando un contrasinal seguro DIGEST-MD5, "
+"se o servidor o soporta."
 
 #: camel/camel-sasl-digest-md5.c:810
 #, fuzzy
@@ -3607,7 +4352,9 @@ msgstr "Resposta do servidor non vАlida\n"
 #: camel/camel-sasl-digest-md5.c:825
 #, fuzzy
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr "A resposta do servidor contiЯa o sinal \"Quality of Protection\" (\"Calidade de ProtecciСn\") non vАlido\n"
+msgstr ""
+"A resposta do servidor contiЯa o sinal \"Quality of Protection\" (\"Calidade "
+"de ProtecciСn\") non vАlido\n"
 
 #: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
@@ -3640,7 +4387,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:420
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "Mala resposta de autenticaciСn do servidor."
 
@@ -3656,60 +4403,60 @@ msgstr "Esta opciСn conectarase С servidor usando un simple contrasinal."
 msgid "Unknown authentication state."
 msgstr "Estado de autenticaciСn descoЯecido."
 
-#: camel/camel-search-private.c:110
+#: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Fallo na compilaciСn da espresiСn regular: %s: %s"
 
-#: camel/camel-service.c:152
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "O URL '%s' necesita unha parte co nome do usuario"
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "O URL '%s' necesita unha parte co nome de mАquina"
 
-#: camel/camel-service.c:168
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "O URL '%s' necesita unha parte co camiЯo"
 
-#: camel/camel-service.c:554
+#: camel/camel-service.c:548
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolvendo: %s"
 
-#: camel/camel-service.c:581
+#: camel/camel-service.c:575
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fallo na bЗsqueda do nome: %s"
 
-#: camel/camel-service.c:606
+#: camel/camel-service.c:600
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Fallo na bЗsqueda do servidor: %s: servidor non atopado"
 
-#: camel/camel-service.c:608
+#: camel/camel-service.c:602
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Fallo na bЗsqueda do servidor: %s: motivo descoЯecido"
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr "Fornecedor de correo do cartafol virtual"
 
-#: camel/camel-session.c:58
+#: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
 msgstr "Para ler correo como peticiСn de outro conxunto de cartafoles"
 
-#: camel/camel-session.c:273 camel/camel-session.c:363
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Non hai ningЗn fornecedor dispoЯible para o protocolo `%s'"
 
-#: camel/camel-session.c:462
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3718,33 +4465,53 @@ msgstr ""
 "Non foi posible crear o directorio %s:\n"
 "%s"
 
-#. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:1007 mail/mail-ops.c:1014
-#: mail/mail-ops.c:1032 mail/mail-ops.c:1033
-msgid "Trash"
-msgstr "Lixo"
+#: camel/camel-smime-context.c:173
+#, fuzzy, c-format
+msgid "Please enter your password for %s"
+msgstr "Introduza o seu contrasinal %s para %s"
 
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "O ficheiro non existe."
+
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "O ficheiro non existe."
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, fuzzy, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "Fallo ao enviar o nome de usuario ao servidor"
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
+#, fuzzy
+msgid "Failed to decode message."
+msgstr "Fallo na mensaxe %d"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
-"Enderezo de Correo-E: %s\n"
-"Nome ComЗn: %s\n"
-"Unidade en OrganizaciСn: %s\n"
-"OrganizaciСn: %s\n"
-"Localidade: %s\n"
-"Estado: %s\n"
-"PaМs: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3759,17 +4526,36 @@ msgstr ""
 "\n"
 "©Desexa aceptar de todas maneiras?"
 
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
+"Enderezo de Correo-E: %s\n"
+"Nome ComЗn: %s\n"
+"Unidade en OrganizaciСn: %s\n"
+"OrganizaciСn: %s\n"
+"Localidade: %s\n"
+"Estado: %s\n"
+"PaМs: %s"
+
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Non foi posible analizar a URL `%s'"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Non existe a mensaxe %s en %s"
 
-#: camel/camel-vee-folder.c:545
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "Non existe a mensaxe: %s"
@@ -3778,60 +4564,76 @@ msgstr "Non existe a mensaxe: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Non podes copiar mensaxes deste cartafol de lixo."
 
-#: camel/providers/imap/camel-imap-message-cache.c:130
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Non foi posible abrir o directorio de cachИ: %s"
-
-#: camel/providers/imap/camel-imap-command.c:209
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta non agardada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:217
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Erro descoЯecido"
-
-#: camel/providers/imap/camel-imap-command.c:272
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "A resposta do servidor rematou cedo de mАis."
 
-#: camel/providers/imap/camel-imap-command.c:456
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "A resposta do servidor IMAP non contiЯa informaciСn sobre %s"
 
-#: camel/providers/imap/camel-imap-command.c:490
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta positiva inesperada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:170
+#: camel/providers/imap/camel-imap-folder.c:192
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr "Non foi posible crear o directorio %s: %s"
+
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Non foi posible cargar resume para %s"
 
-#: camel/providers/imap/camel-imap-folder.c:349
-msgid "Scanning IMAP folder"
-msgstr "Explorando cartafol IMAP"
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
+msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:984
-#: camel/providers/imap/camel-imap-folder.c:1195
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "Gardando as mensaxes"
+
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "Esta mensaxe non estА dispoЯible actualmente."
 
-#: camel/providers/imap/camel-imap-folder.c:1014
-#: camel/providers/imap/camel-imap-folder.c:1229
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Gardando as mensaxes"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 #, fuzzy
 msgid "Could not find message body in FETCH response."
 msgstr "Non foi posible atopar o corpo da mensaxe na resposta FETCH."
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "Non foi posible abrir o directorio de cachИ: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "Comprobando o novo correo"
 
@@ -3839,7 +4641,7 @@ msgstr "Comprobando o novo correo"
 msgid "Check for new messages in all folders"
 msgstr "Comprobar as novas mensaxes en tСdolos cartafoles"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:534
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Cartafoles"
 
@@ -3850,7 +4652,8 @@ msgstr "Amosar namais cartafoles subscritos"
 #: camel/providers/imap/camel-imap-provider.c:52
 #, fuzzy
 msgid "Override server-supplied folder namespace"
-msgstr "Sobrescribir o nome do espacio de cartafoles proporcionado polo servidor"
+msgstr ""
+"Sobrescribir o nome do espacio de cartafoles proporcionado polo servidor"
 
 #: camel/providers/imap/camel-imap-provider.c:54
 #, fuzzy
@@ -3874,28 +4677,28 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Esta opciСn conectarase С servidor IMAP usando un contrasinal sen cifrar."
 
-#: camel/providers/imap/camel-imap-store.c:443
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "O servidor IMAP %s non soporta o tipo de autenticaciСn %s pedida."
 
-#: camel/providers/imap/camel-imap-store.c:453
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Non hai soporte para o tipo de autenticaciСn %s"
 
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIntroduza o contrasinal IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:493
-#: camel/providers/smtp/camel-smtp-transport.c:403
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "Non introduciu un contrasinal."
 
-#: camel/providers/imap/camel-imap-store.c:521
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3906,102 +4709,108 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:868
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
-msgid "%s is not a selectable folder"
-msgstr "O cartafol %s non И seleccionable"
-
-#: camel/providers/imap/camel-imap-store.c:882
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Non foi posible crear o directorio %s: %s"
+msgid "No such folder %s"
+msgstr "Non existe o cartafol %s"
 
-#: camel/providers/imap/camel-imap-store.c:1385
-msgid "You must be working online to complete this operation"
-msgstr "Debe estar traballando conectado para completar esta operaciСn"
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "Directorios de correo en formato MH"
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr "Para almacenar correo local en directorios de correo tipo MH"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr "Ficheiro mailbox estАndar de Unix"
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr "Para almacenar correo local en formato estАndar mbox"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr "Ficheiros de correo con formato maildir de Qmail"
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr "Para almacenar correo local en directorios maildir de qmail"
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-provider.c:70
+#, fuzzy
+msgid "Unix mbox spool-format mail files"
+msgstr "Ficheiros de correo con formato maildir de Qmail"
+
+#: camel/providers/local/camel-local-provider.c:71
+#, fuzzy
+msgid "For storing local mail in standard Unix spool directories"
+msgstr "Para almacenar correo local en directorios maildir de qmail"
+
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "A raМz de almacenamento %s non И un camiЯo absoluto"
 
-#: camel/providers/local/camel-local-store.c:136
+#: camel/providers/local/camel-local-store.c:134
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "O raМz de almacenamento %s non И un directorio regular."
 
-#: camel/providers/local/camel-local-store.c:144
-#: camel/providers/local/camel-local-store.c:160
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Non И posible obter o cartafol: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:175
+#: camel/providers/local/camel-local-store.c:173
 msgid "Local stores do not have an inbox"
 msgstr "Os almacenamentos locais non teЯen un inbox"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr "Ficheiro local de correo %s"
 
-#: camel/providers/local/camel-local-store.c:241
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Non foi posible renomear o cartafol %s a %s: %s"
 
-#: camel/providers/local/camel-local-store.c:283
+#: camel/providers/local/camel-local-store.c:279
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Non foi posible borrar o ficheiro de resume de cartafol `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:293
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Non foi posible borrar o ficheiro de Мndice de cartafol `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Incapaz de engadir a mensaxe ao resume: motivo descoЯecido"
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Non se pode engadir a mensaxe ao cartafol maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4010,18 +4819,19 @@ msgstr ""
 "Non И posible obter a mensaxe: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "Non existe a mensaxe"
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr "Contidos da mensaxe non vАlidos"
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4031,14 +4841,14 @@ msgstr ""
 "Non И posible abrir o cartafol `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "O cartafol `%s' non existe."
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4048,22 +4858,29 @@ msgstr ""
 "Non foi posible crear o cartafol `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' non И un directorio maildir."
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Non foi posible borrar o cartafol `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "non И un directorio maildir."
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"Non foi posible crear o cartafol `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-maildir-summary.c:405
 #: camel/providers/local/camel-maildir-summary.c:526
 #, fuzzy, c-format
@@ -4071,11 +4888,13 @@ msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Non foi posible abrir o ficheiro de correo %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Non И posible abrir a caixa de correo temporal: %s"
@@ -4085,9 +4904,12 @@ msgstr "Non И posible abrir a caixa de correo temporal: %s"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Non se pode engadir a mensaxe ao ficheiro mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4096,11 +4918,13 @@ msgstr ""
 "Non И posible obter a mensaxe: %s do cartafol %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "O cartafol parece estar corrompido sen recuperaciСn posible."
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "ContrucciСn da mensaxe fallida: ©mailbox corrompido?"
 
@@ -4145,81 +4969,100 @@ msgstr "O cartafol `%s' non estА baleiro. Non borrado."
 
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "Resumindo cartafol"
 
-#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "Non foi posible abir o cartafol: %s: resumindo desde a posiciСn %ld: %s"
+msgstr ""
+"Non foi posible abir o cartafol: %s: resumindo desde a posiciСn %ld: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Erro fatal do analizador de correo preto da posiciСn %ld no cartafol %s"
+msgstr ""
+"Erro fatal do analizador de correo preto da posiciСn %ld no cartafol %s"
 
-#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Non И posible resumir o cartafol: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:501
-#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1395
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Sincronizando cartafol"
 
-#: camel/providers/local/camel-mbox-summary.c:506
-#: camel/providers/local/camel-mbox-summary.c:707
+#: camel/providers/local/camel-mbox-summary.c:507
+#: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Non foi posible abrir o cartafol para o resume: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:523
+#: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Non И posible abrir a caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:556
-#: camel/providers/local/camel-mbox-summary.c:745
-#: camel/providers/local/camel-mbox-summary.c:753
+#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:557
+#: camel/providers/local/camel-mbox-summary.c:746
+#: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "O resume e o cartafol non concordan, mesmo logo de sincronizar"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Erro escribindo А caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:616
+#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Erro escribindo А caixa de correo temporal: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:634
-#: camel/providers/local/camel-mbox-summary.c:803
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Non foi posible pechar o cartafol orixe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:643
+#: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Non foi posible pechar o cartafol temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:654
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Non foi posible renomear o cartafol: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro descoЯecido: %s"
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Non И posible engadir a mensaxe С cartafol mh: %s: %s"
@@ -4234,40 +5077,94 @@ msgstr "`%s' non И un directorio."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Non foi posible abrir o camiЯo do directorio MH: %s: %s"
 
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "Non se pode engadir a mensaxe ao ficheiro mbox: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "`%s' non И un ficheiro regular."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "O cartafol `%s' non existe."
+
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy
+msgid "Spool stores do not have an inbox"
+msgstr "Os almacenamentos locais non teЯen un inbox"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Ficheiro local de correo %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "Non foi posible abrir o ficheiro de correo temporal %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "Non foi posible pechar o cartafol orixe %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Introduza o contrasinal NNTP para %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "O servidor rexeitou o nome de usuario"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "Fallo ao enviar o nome de usuario ao servidor"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "O servidor rexeitou o nome de usuario/contrasinal"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "Mensaxe %s non atopada."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "Non foi posible recibir a lista de grupos do servidor."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
-#, c-format, fuzzy
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
+#, fuzzy, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Incapaz de cargar o ficheiro grouplist para %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
-#, c-format, fuzzy
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
+#, fuzzy, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Incapaz de gardar o ficheiro grouplist para %s: %s"
 
@@ -4279,25 +5176,25 @@ msgstr "Novas USENET"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Este И um provedor para ler e enviar aos grupos de novas de USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Non foi posible abrir o directorio para o servidor de novas: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "Novas USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 "Esta opciСn autenticarase co servidor NNTP usando un contrasinal sen cifrar."
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
@@ -4313,7 +5210,8 @@ msgstr "Non foi posible comprobar se hai mensaxes novas no servidor POP: %s"
 
 #: camel/providers/pop3/camel-pop3-folder.c:199
 msgid "Could not open folder: message listing was incomplete."
-msgstr "Non foi posible abrir o cartafol: o listado de mensaxes era incompleta."
+msgstr ""
+"Non foi posible abrir o cartafol: o listado de mensaxes era incompleta."
 
 #: camel/providers/pop3/camel-pop3-folder.c:292
 #, c-format
@@ -4348,7 +5246,7 @@ msgstr "Deixar as mensaxes no servidor"
 msgid "Delete after %s day(s)"
 msgstr "Borrar despois de %s dМa(s)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4385,27 +5283,27 @@ msgid ""
 msgstr ""
 "Isto conectarase С servidor POP e usarА Kerberos 4 para autenticarse con el."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Non foi posible autenticarse co servidor KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:225
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Non foi posible conectarse С servidor: %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:329
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Non foi posible conectarse С servidor POP en %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:368
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sIntroduza o contrasinal POP3 para %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:387
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4414,12 +5312,12 @@ msgstr ""
 "Non foi posible conectarse С servidor POP.\n"
 "Erro enviando o nome de usuario: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:390
-#: camel/providers/pop3/camel-pop3-store.c:427
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr "(DescoЯecido)"
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4427,7 +5325,7 @@ msgstr ""
 "Non foi posible conectarse С servidor POP.\n"
 "Non se soporta o mecanismo de autenticaciСn solicitado."
 
-#: camel/providers/pop3/camel-pop3-store.c:425
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4436,13 +5334,13 @@ msgstr ""
 "Non foi posible conectarse С servidor POP.\n"
 "Erro enviando o contrasinal: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:493
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Non existe o cartafol `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4497,131 +5395,136 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Entrega de correo a travИs do programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
 #: camel/providers/smtp/camel-smtp-provider.c:40
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr "Para entregar correo por conexiСn a un servidor de correo remoto usando SMTP.\n"
+msgstr ""
+"Para entregar correo por conexiСn a un servidor de correo remoto usando "
+"SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "Erro de sintaxe, comando non recoЯecido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "Erro de sintaxe nos parАmetros ou argumentos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Comando non implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "ParАmetro do comando non implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 #, fuzzy
 msgid "System status, or system help reply"
 msgstr "Resposta do estado do sistema ou da axuda do sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "Mensaxe de Axuda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Servicio preparado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr "Servicio pechando a canle de transmisiСn"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr "Servicio non dispoЯible, pechando a canle de transmisiСn"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr "AcciСn de correo pedida exitosa, completada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr "O usuario non И local; re-enviarase a <camiЯo-de-reenvМo>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "A acciСn de correo pedida non foi levada a cabo: caixa de correo non dispoЯible"
+msgstr ""
+"A acciСn de correo pedida non foi levada a cabo: caixa de correo non "
+"dispoЯible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "A acciСn pedida non foi levada a cabo: caixa de correo non dispoЯible"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr "AcciСn pedida abortada: erro ao procesar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr "Usuario non local; tИntao con <camiЯo-de-reenvМo>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
-msgstr "A acciСn pedida non foi levada a cabo: insuficiente almacenamento no sistema"
+msgstr ""
+"A acciСn pedida non foi levada a cabo: insuficiente almacenamento no sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "A acciСn pedida foi abortada: excedeu a asignaciСn de almacenamento"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "A acciСn pedida non foi levada a cabo: nome de mailbox non permitido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Comeza a entrada da mensaxe; remate con <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "Fallo na transacciСn"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr "NecesМtase un contrasinal para a transacciСn"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "O mecanismo de autenticaciСn И feble de mАis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr "NecesМtase encriptaciСn para o mecanismo de autenticaciСn pedido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "Fallo temporal de autenticaciСn"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "AutenticaciСn requerida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Erro na resposta de benvida: %s: posiblemente non fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "O servidor SMTP %s non soporta o tipo de autenticaciСn %s requerida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sIntroduza o contrasinal SMTP para %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4632,317 +5535,235 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:527
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor de SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Entrega de correo SMTP vМa %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr "Non se pode enviar a mensaxe: enderezo do autor non definida."
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr "Non se pode enviar a mensaxe: enderezo do autor non vАlido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:575
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "Enviando a mensaxe"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "<Non se pode enviar a mensaxe: non se definiron destinatarios"
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "A peticiСn HELO expirou: %s: non fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Erro na resposta HELO: %s: non fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:721
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr "Erro creando o obxecto de autenticaciСn SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:736
 #: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "AutenticaciСn"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "A peticiСn AUTH expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:782
+#, fuzzy
+msgid "AUTH request failed."
+msgstr "A peticiСn AUTH expirou: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr "Mala resposta de autenticaciСn do servidor.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:824
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "A peticiСn MAIL FROM expirou: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:843
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Erro na resposta MAIL FROM: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "A peticiСn RCPT TO expirou: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:887
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Erro na resposta RCPT TO: %s: correo non enviado."
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "A peticiСn DATA expirou: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Erro na resposta DATA: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:952
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "O envМo de DATA expirou: rematando mensaxe: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Erro na resposta DATA: rematando a mensaxe: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "A peticiСn RSET expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Erro na resposta RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "A peticiСn QUIT expirou: %s: non fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Erro na resposta QUIT: %s: non fatal"
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "IncluМr un ficheiro"
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "Quitar os elementos seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Engadir anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "IncluМr un ficheiro como anexo na mensaxe"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1082
-msgid "Attachment"
-msgstr "Anexo"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "Propiedades do anexo"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Nome de ficheiro:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-#, fuzzy
-msgid "Inline attachment"
-msgstr "Anexo Inline"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "Tipo MIME:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Enviar como:"
-
-#: composer/e-msg-composer.c:529
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"Non foi posible abrir o ficheiro de sinatura %s:\n"
-"%s"
-
-#: composer/e-msg-composer.c:699
-msgid "Save as..."
-msgstr "Gardar como..."
-
-#: composer/e-msg-composer.c:710
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Erro gardando o ficheiro: %s"
-
-#: composer/e-msg-composer.c:730
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Erro cargando o ficheiro: %s"
-
-#: composer/e-msg-composer.c:802
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"Incapaz de abrir o cartafol de borradores para esta conta.\n"
-"©GustarМalle usar o cartafol de borradores por defecto?"
-
-#: composer/e-msg-composer.c:860 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:866
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Esta mensaxe non foi enviada.\n"
-"\n"
-"©Desexa gardar os cambios?"
-
-#: composer/e-msg-composer.c:891
-msgid "Open file"
-msgstr "Abrir ficheiro"
-
-#: composer/e-msg-composer.c:1017
-msgid "That file does not exist."
-msgstr "O ficheiro non existe."
-
-#: composer/e-msg-composer.c:1027
-msgid "That is not a regular file."
-msgstr "Non И un ficheiro normal."
-
-#: composer/e-msg-composer.c:1037
-msgid "That file exists but is not readable."
-msgstr "O ficheiro existe pero non se pode ler."
-
-#: composer/e-msg-composer.c:1047
-msgid "That file appeared accesible but open(2) failed."
-msgstr "O ficheiro parecМa accesible pero a chamada a open(2) fallou."
-
-#: composer/e-msg-composer.c:1069
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
 msgstr ""
-"O ficheiro И moi longo (mАis de 100K).\n"
-"©EstА seguro de querer inserilo?"
-
-#: composer/e-msg-composer.c:1090
-msgid "An error occurred while reading the file."
-msgstr "Ocorreu un erro lendo o ficheiro."
 
-#: composer/e-msg-composer.c:1391 composer/e-msg-composer.c:1734
-msgid "Compose a message"
-msgstr "CompoЯer unha mensaxe"
-
-#: composer/e-msg-composer.c:1825
-#, fuzzy
-msgid "Could not create composer window."
-msgstr "Non foi posible crear a fiestra do compositor"
-
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "Prema aquМ para o libro de enderezos"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:354 mail/mail-format.c:744
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:360 mail/mail-format.c:746
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "Responder-A:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:371 mail/mail-format.c:643
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:385 mail/mail-format.c:748
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:386
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:389 mail/mail-format.c:750
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Introduza os enderezos que recibirАn unha copia da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4950,7 +5771,138 @@ msgstr ""
 "Introduza os enderezos que recibirАn unha copia da mensaxe sen apareceren na "
 "lista de destinatarios."
 
-#: composer/evolution-composer.c:355
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "IncluМr un ficheiro"
+
+#: composer/e-msg-composer.c:670
+#, fuzzy, c-format
+msgid ""
+"Could not open file %s:\n"
+"%s"
+msgstr ""
+"Non foi posible abrir o ficheiro `%s':\n"
+"%s"
+
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr "Erro cargando o ficheiro: %s"
+
+#: composer/e-msg-composer.c:873
+msgid "Save as..."
+msgstr "Gardar como..."
+
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "Advertencia"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
+#, c-format
+msgid "Error saving file: %s"
+msgstr "Erro gardando o ficheiro: %s"
+
+#: composer/e-msg-composer.c:926
+#, c-format
+msgid "Error loading file: %s"
+msgstr "Erro cargando o ficheiro: %s"
+
+#: composer/e-msg-composer.c:997
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"Incapaz de abrir o cartafol de borradores para esta conta.\n"
+"©GustarМalle usar o cartafol de borradores por defecto?"
+
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Erro gardando o ficheiro: %s"
+
+#: composer/e-msg-composer.c:1055
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "Non foi posible recibir a mensaxe do servidor POP %s: %s"
+
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"Non foi posible crear o ficheiro de saМda: %s\n"
+"%s"
+
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"Non foi posible crear o ficheiro de saМda: %s\n"
+"%s"
+
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"Erro gardando mensaxes en: %s:\n"
+" %s"
+
+#: composer/e-msg-composer.c:1173
+#, fuzzy
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+"Evolution atopou ficheiros de correo de Pine.\n"
+"©GЗstarМalle importalos a Evolution?"
+
+#: composer/e-msg-composer.c:1321
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Esta mensaxe non foi enviada.\n"
+"\n"
+"©Desexa gardar os cambios?"
+
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
+msgid "Open file"
+msgstr "Abrir ficheiro"
+
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "Inserir ficheiro de texto..."
+
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+msgid "Compose a message"
+msgstr "CompoЯer unha mensaxe"
+
+#: composer/e-msg-composer.c:2351
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Non foi posible crear a fiestra do compositor"
+
+#: composer/evolution-composer.c:359
 #, fuzzy
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -4959,7 +5911,7 @@ msgstr ""
 "Non foi posible crear a fiestra do compositor, porque aМnda\n"
 "non configurou ningunha identidade na compoЯente de correo."
 
-#: composer/evolution-composer.c:370
+#: composer/evolution-composer.c:374
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "Non foi posible inicializar o compositor de Evolution."
@@ -4978,36 +5930,58 @@ msgid "calendar information"
 msgstr "informaciСn de axenda"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+#, fuzzy
+msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+#, fuzzy
+msgid "%H:%M:%S"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %d/%m/%Y"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -5015,270 +5989,67 @@ msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:303
 #, fuzzy
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
+#: e-util/e-time-utils.c:312
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-#, fuzzy
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S%n"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-#, fuzzy
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p%n"
-
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Non se pode inicializar o compoЯente de Resume Executivo de Evolution."
-
-#: executive-summary/component/e-summary.c:924
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Non foi posible abrir o ficheiro HTML:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:938
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Erro lendo os datos:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:956
-#, fuzzy
-msgid "File does not have a place for the services.\n"
-msgstr "O ficheiro non ten lugar para os servicios."
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"Pode seleccionar unha pАxina HTML diferente para o fondo do Resume Executivo.\n"
-"\n"
-"DИixeo en branco para que apareza a asignada por defecto"
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "Abrir %s coa aplicaciСn por defecto de GNOME"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Abrir %s co navegador web por defecto de GNOME"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Enviar unha mensaxe de correo a %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Trocar a vista de %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Executar %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Pechar %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Mover %s para a esquerda"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Mover %s para a dereita"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Mover %s А fileira anterior"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Mover %s А seguinte fileira"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "Configurar %s"
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "Aparencia"
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "Fondo:"
-
-#: executive-summary/component/main.c:62
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"O compoЯente Resume Executivo non puido inicializar Bonobo.\n"
-"Se hai unha mensaxe de advertencia sobre RootPOA, probablemente\n"
-"significa que compilou Bonobo contra GOAD no canto de OAF."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "CompoЯente de Evolution para o resume Executivo"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "FАbrica para o compoЯente de Resume Executivo de Evolution."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "FАbrica para o resume RDF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "Resume RDF"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "FАbrica para o compoЯente bonobo de probas."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "FАbrica para o compoЯente de probas."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Comprobar servicio bonobo"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Comprobar servicio"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "Erro"
-
-#: executive-summary/test-service/rdf-summary.c:768
-msgid "Update automatically"
-msgstr "Actualizar automaticamente"
-
-#: executive-summary/test-service/rdf-summary.c:778
-msgid "Update now"
-msgstr "Actualizar agora"
-
-#: executive-summary/test-service/rdf-summary.c:788
-msgid "Update every "
-msgstr "Actualizar cada"
-
-#: executive-summary/test-service/rdf-summary.c:796
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "minutos"
-
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "ano"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "anos"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "mes"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "meses"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "semana"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "semanas"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "dМas"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "hora"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "horas"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "minuto"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "segundo"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "segundos"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Oops. Esqueceu escoller unha data."
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Oops. Escolleu unha data non vАlida."
 
-#: filter/filter-datespec.c:276
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -5288,7 +6059,7 @@ msgstr ""
 "que sexa cando se executa o filtro ou se\n"
 "abre o cartafolv."
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5296,7 +6067,7 @@ msgstr ""
 "A data da mensaxe serА comparada co momento\n"
 "que especifique aquМ."
 
-#: filter/filter-datespec.c:339
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5307,28 +6078,36 @@ msgstr ""
 "\"hai unha semana\" por exemplo."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "a hora actual"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "unha hora que especifique"
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "unha hora relativa А hora actual"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Comparar con"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "agora"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<prema aquМ para seleccionar unha data>"
 
@@ -5353,8 +6132,8 @@ msgstr ""
 "Oops, esqueceu escoller un cartafol.\n"
 "Volva atrАs e especifique un cartafol vАlido no que deixar o correo."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Seleccionar cartafol"
 
@@ -5366,46 +6145,6 @@ msgstr "Introduza o URI do cartafol"
 msgid "<click here to select a folder>"
 msgstr "<prema aquМ para seleccionar un cartafol>"
 
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Editar Filtros"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "Editar CartafolesV"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Entrante"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "SaМnte"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr "Cartafoles Virtuais"
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr "cartafoles especМficos namais"
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr "Fontes de CartafolV"
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr "con todos os cartafoles remotos activos"
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr "con todos os cartafoles locais e cos remotos activos"
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr "con todos os cartafoles locais"
-
 #: filter/filter-input.c:193
 #, c-format
 msgid ""
@@ -5415,7 +6154,7 @@ msgstr ""
 "Erro na expresiСn regular '%s':\n"
 "%s"
 
-#: filter/filter-part.c:474
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr "Proba"
 
@@ -5427,36 +6166,88 @@ msgstr "Nome da regra: "
 msgid "Untitled"
 msgstr "Sen_tМtulo"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Executar acciСns"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "se se cumpren tСdolos criterios"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "se se cumpre algЗn criterio"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "Engadir criterio"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "entrante"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "saМnte"
 
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Engadir"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Editar"
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Editar Filtros"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "Editar CartafolesV"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "Entrante"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "SaМnte"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr "Cartafoles Virtuais"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr "cartafoles especМficos namais"
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "Fontes de CartafolV"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "con todos os cartafoles remotos activos"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "con todos os cartafoles locais e cos remotos activos"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "con todos os cartafoles locais"
+
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
+#, fuzzy
+msgid "Assign Color"
 msgstr "Asignar Cor"
 
 #: filter/libfilter-i18n.h:4
@@ -5532,90 +6323,91 @@ msgid "Expression"
 msgstr "ExpresiСn"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "Reenviar С Enderezo"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "Importante"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "И"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "И maior que"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "И menor que"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "non И"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Lista de Correo"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Corpo da Mensaxe"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Cabeceira da Mensaxe"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "A mensaxe foi recibida"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "A mensaxe foi enviada"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Mover С cartafol"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr "en ou despois"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr "en ou antes"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Ler"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Coincide expresiСn regular (regexp)"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Respondido a"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.c:1082
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "PuntuaciСn"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Autor"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Establecer Estado"
 
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "TamaЯo"
+
 #: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "sona como"
@@ -5636,7 +6428,8 @@ msgstr "comeza por"
 msgid "Stop Processing"
 msgstr "Parar de procesar"
 
-#: filter/libfilter-i18n.h:51 mail/message-list.c:1083
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Asunto"
 
@@ -5656,7 +6449,7 @@ msgstr "Regras"
 msgid "Add Rule"
 msgstr "Engadir Regra"
 
-#: filter/rule-editor.c:298
+#: filter/rule-editor.c:299
 msgid "Edit Rule"
 msgstr "Editar Regra"
 
@@ -5664,192 +6457,278 @@ msgstr "Editar Regra"
 msgid "Score Rules"
 msgstr "Regras de PuntuaciСn"
 
-#: mail/component-factory.c:329
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
+msgstr "Importar"
+
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "Mail"
+msgstr "Correo ElectrСnico"
+
+#: importers/elm-importer.c:498
+#, fuzzy
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution atopou ficheiros de correo de Elm.\n"
+"©GustarМalle importalas a Evolution?"
+
+#: importers/elm-importer.c:527
+msgid "Elm mail"
+msgstr "Correo de Elm"
+
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "Engadir Libro de Enderezos"
+
+#: importers/evolution-gnomecard-importer.c:253
+#, fuzzy
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution atopou ficheiros de correo de Netscape.\n"
+"©GЗstarМalle importalos a Evolution?"
+
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "Preferencias..."
+
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution atopou ficheiros de correo de Netscape.\n"
+"©GЗstarМalle importalos a Evolution?"
+
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution atopou ficheiros de correo de Pine.\n"
+"©GЗstarМalle importalos a Evolution?"
+
+#: importers/pine-importer.c:691
+msgid "Pine mail"
+msgstr "Correo de Pine"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "CompoЯente de evolution para manexar o correo."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Evolution mail composer."
+msgstr "Compositor de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr "CompoЯente de correo de resume executivo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr "CompoЯente de mostra de cartafoles de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr "CompoЯente de fАbrica de cartafoles de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution composer."
+msgstr "FАbrica para o compositor de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr "FАbrica para o compoЯente de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr "FАbrica para a compoЯente Resume de Correo."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "ConfiguraciСn do Correo"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "_Propiedades..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Modificar as propiedades do ficheiro"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Non se pode inicializar o compoЯente de correo de Evolution."
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:894
 #, fuzzy
 msgid "Cannot register storage with shell"
 msgstr "Non se pode rexistrar o almacenamento coa shell"
 
-#: mail/folder-browser.c:253
+#: mail/folder-browser-ui.c:254
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Propiedades para \"%s\""
+
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr "Propiedades"
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Non foi posible crear o directorio temporal: %s"
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "Almacenar bЗsqueda como CartafolV"
 
-#: mail/folder-browser.c:561 ui/evolution-mail.xml.h:86
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr "CartafolV sobre o A_sunto"
 
-#: mail/folder-browser.c:564 ui/evolution-mail.xml.h:84
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "CartafolV sobre o Au_tor"
 
-#: mail/folder-browser.c:567 ui/evolution-mail.xml.h:85
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "CartafolV sobre os _Destinatarios"
 
-#: mail/folder-browser.c:570 ui/evolution-mail.xml.h:83
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr "CartafolV sobre _Lista de Correo"
 
-#: mail/folder-browser.c:576
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "Filtro sobre o As_unto"
 
-#: mail/folder-browser.c:579
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "Filtro sobre o Au_tor"
 
-#: mail/folder-browser.c:582
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "Filtro sobre os D_estinatarios"
 
-#: mail/folder-browser.c:585
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "Filtro sobre a Lista de _Correo"
 
-#: mail/folder-browser.c:594
-msgid "_Open"
-msgstr "_Abrir"
-
-#: mail/folder-browser.c:596
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Re-enviar"
 
-#: mail/folder-browser.c:598 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:108 ui/evolution-tasks.xml.h:8
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Gardar _Como..."
 
-#: mail/folder-browser.c:600 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/folder-browser.c:605
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "_Responder С Autor"
 
-#: mail/folder-browser.c:607 ui/evolution-mail.xml.h:62
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "Responder a _Todos"
+
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:97
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: mail/folder-browser.c:611
-#, fuzzy
-msgid "Forward _inline"
-msgstr "Re-enviar inline"
-
-#: mail/folder-browser.c:614 ui/evolution-mail.xml.h:38
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Marcar como _Lida"
 
-#: mail/folder-browser.c:616 ui/evolution-mail.xml.h:42
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Marcar como _non Lida"
 
-#: mail/folder-browser.c:621 ui/evolution-mail.xml.h:102
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "Importante"
+
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Marcar como _non Lida"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "_Mover С cartafol.."
 
-#: mail/folder-browser.c:623 ui/evolution-mail.xml.h:91
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "_Copiar С cartafol..."
 
-#: mail/folder-browser.c:627 ui/evolution-mail.xml.h:113
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "_Recuperar"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:637 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Engadir Libro de Enderezos"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/folder-browser.c:641
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "Crear Reg_ra Desde Mensaxe"
 
-#: mail/folder-browser.c:780
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "Filtro sobre a Lista de Correo"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "CartafolV sobre a Lista de Correo"
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtro sobre a Lista de Correo (%s)"
 
-#: mail/folder-browser.c:784
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "CartafolV sobre a Lista de Correo (%s)"
 
-#: mail/folder-browser-factory.c:211
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Propiedades para \"%s\""
-
-#: mail/folder-browser-factory.c:213 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Propiedades"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "CompoЯente de evolution para manexar o correo."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
-msgid "Evolution mail composer."
-msgstr "Compositor de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "CompoЯente de correo de resume executivo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "CompoЯente de mostra de cartafoles de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "CompoЯente de fАbrica de cartafoles de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution composer."
-msgstr "FАbrica para o compositor de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "FАbrica para o compoЯente de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "FАbrica para a compoЯente Resume de Correo."
-
-#: mail/importers/elm-importer.c:420
-msgid ""
-"Evolution has found Elm mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution atopou ficheiros de correo de Elm.\n"
-"©GustarМalle importalas a Evolution?"
-
-#: mail/importers/elm-importer.c:430
-msgid "Elm mail"
-msgstr "Correo de Elm"
-
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
 msgid "Factory to import mbox into Evolution"
@@ -5867,26 +6746,6 @@ msgstr "FАbrica para importar correo de Outlook Express 4 a Evolution"
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Importa ficheiros de Outlook Express a Evolution"
 
-#: mail/importers/netscape-importer.c:440
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Evolution atopou ficheiros de correo de Netscape.\n"
-"©GЗstarМalle importalos a Evolution?"
-
-#: mail/importers/pine-importer.c:385
-msgid ""
-"Evolution has found Pine mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution atopou ficheiros de correo de Pine.\n"
-"©GЗstarМalle importalos a Evolution?"
-
-#: mail/importers/pine-importer.c:395
-msgid "Pine mail"
-msgstr "Correo de Pine"
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Formato de almacenamento actual:"
@@ -5922,37 +6781,69 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
 msgid "You have not filled in all of the required information."
 msgstr "Non enchiches toda a informaciСn requerida."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Editor de Contas de Evolution"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Editor de Contas de Evolution"
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "Ficheiro de sinatura:"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Esta mensaxe non foi enviada.\n"
+"\n"
+"©Desexa gardar os cambios?"
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr " (por defecto)"
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "Desactivado"
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "Activado"
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "©EstА seguro de que quere borrar esta conta?"
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Recuperar"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "Facer esta a miЯa conta por defecto"
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr "©EstА seguro de que quere borrar esta conta de novas?"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:536
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Xestor de Contas de Evolution"
 
@@ -5980,7 +6871,7 @@ msgstr "lista de correo %s"
 msgid "Add Filter Rule"
 msgstr "Engadir Regra de Filtrado"
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5992,7 +6883,7 @@ msgstr ""
 "recibir ou compoЯer correo.\n"
 "©Quere configuralo agora?"
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -6000,7 +6891,7 @@ msgstr ""
 "Ten que configurar unha identidade\n"
 "antes de poder escribir correo."
 
-#: mail/mail-callbacks.c:160
+#: mail/mail-callbacks.c:161
 #, fuzzy
 msgid ""
 "You need to configure a mail transport\n"
@@ -6009,11 +6900,11 @@ msgstr ""
 "Necesitas configurar transporte para o correo\n"
 "antes de poder compoЯelo."
 
-#: mail/mail-callbacks.c:204
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr "Non definiu ningЗn mИtodo de envМo de correo"
 
-#: mail/mail-callbacks.c:237
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6021,37 +6912,45 @@ msgstr ""
 "Esta mensaxe non ten asunto.\n"
 "©Enviar realmente?"
 
-#: mail/mail-callbacks.c:310
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr "Ten que especificar destinatarios para poder enviar esta mensaxe."
 
-#: mail/mail-callbacks.c:353
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr "Ten que configurar unha identidade antes de poder enviar este correo."
 
-#: mail/mail-callbacks.c:592
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "O %s, %s escribiu:"
 
-#: mail/mail-callbacks.c:773
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Mensaxe reenviada:\n"
 
-#: mail/mail-callbacks.c:876
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "Mover mensaxe(s) a"
 
-#: mail/mail-callbacks.c:878
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Copiar mensaxe(s) a"
 
-#: mail/mail-callbacks.c:1155
+#: mail/mail-callbacks.c:1374
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "©EstА seguro de que quere editar todas as %d mensaxes?"
 
-#: mail/mail-callbacks.c:1169
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6059,7 +6958,7 @@ msgstr ""
 "SС pode editar mensaxes gardadas\n"
 "no cartafol de Borrador."
 
-#: mail/mail-callbacks.c:1201
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6067,27 +6966,25 @@ msgstr ""
 "SС pode reenviar mensaxes\n"
 "no cartafol de Enviados."
 
-#: mail/mail-callbacks.c:1234 mail/mail-display.c:90
-msgid "Overwrite file?"
-msgstr "©Sobrescribir ficheiro?"
+#: mail/mail-callbacks.c:1442
+#, fuzzy, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "©EstА seguro de que quere editar todas as %d mensaxes?"
 
-#: mail/mail-callbacks.c:1238 mail/mail-display.c:94
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Xa existe un ficheiro con ese nome.\n"
-"©Sobrescribilo?"
+#: mail/mail-callbacks.c:1463
+#, fuzzy
+msgid "No Message Selected"
+msgstr "A mensaxe foi recibida"
 
-#: mail/mail-callbacks.c:1282
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Gardar Mensaxe Como..."
 
-#: mail/mail-callbacks.c:1284
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Gardar Mensaxes Como..."
 
-#: mail/mail-callbacks.c:1399
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6096,43 +6993,54 @@ msgstr ""
 "Erro cargando a informaciСn do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1448 ui/evolution-mail.xml.h:52
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "_Filtros..."
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/mail-callbacks.c:1495
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "A impresiСn da mensaxe fallou"
 
-#: mail/mail-callbacks.c:1573
+#: mail/mail-callbacks.c:1966
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
-msgstr "©EstА seguro de que quere abrir todas as %d mensaxes en fiestras separadas?"
-
-#: mail/mail-config.c:1121 mail/mail-config.c:1124
-msgid "Connecting to server..."
-msgstr "Conectando ao servidor..."
+msgstr ""
+"©EstА seguro de que quere abrir todas as %d mensaxes en fiestras separadas?"
 
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
-msgstr "Introduza nome e enderezo de correo electrСnico mАis abaixo. Os campos \"opcionais\" non necesitan encherse, a non ser que desexe incluМr esta informaciСn nas mensaxes que mande."
+msgstr ""
+"Introduza nome e enderezo de correo electrСnico mАis abaixo. Os campos "
+"\"opcionais\" non necesitan encherse, a non ser que desexe incluМr esta "
+"informaciСn nas mensaxes que mande."
 
 #: mail/mail-config-druid.c:101
 msgid ""
 "Please enter information about your incoming mail server below. If you don't "
 "know what kind of server you use, contact your system administrator or "
 "Internet Service Provider."
-msgstr "Introduza informaciСn sobre o servidor de correo entrante. Se non sabe quИ clase de servidor usa, contacte co administrador do sistema ou co Provedor de Servicios de Internet."
+msgstr ""
+"Introduza informaciСn sobre o servidor de correo entrante. Se non sabe quИ "
+"clase de servidor usa, contacte co administrador do sistema ou co Provedor "
+"de Servicios de Internet."
 
 #: mail/mail-config-druid.c:105
 msgid ""
 "Please enter information about your outgoing mail protocol below. If you "
 "don't know which protocol you use, contact your system administrator or "
 "Internet Service Provider."
-msgstr "Introduza informaciСn sobre o protocolo do servidor de correo saМnte. Se non sabe o protocolo que usa, contacte co administrador do sistema ou co Provedor de Servicios de Internet."
+msgstr ""
+"Introduza informaciСn sobre o protocolo do servidor de correo saМnte. Se non "
+"sabe o protocolo que usa, contacte co administrador do sistema ou co "
+"Provedor de Servicios de Internet."
 
 #: mail/mail-config-druid.c:107
 msgid ""
@@ -6141,13 +7049,22 @@ msgid ""
 "will be grouped together to make an Evolution mail account. Please enter a "
 "name for this account in the space below. This name will be used for display "
 "purposes only."
-msgstr "Case rematou co proceso de configuraciСn do correo. A identidade, servidor de correo entrante e mИtodo de transporte de correo saМnte que introduciu serАn agrupados para facer unha conta de correo de Evolution. Introduza un nome para esta conta no espacio de abaixo. Este nome sС se usarА co propСsito de mostralo."
+msgstr ""
+"Case rematou co proceso de configuraciСn do correo. A identidade, servidor "
+"de correo entrante e mИtodo de transporte de correo saМnte que introduciu "
+"serАn agrupados para facer unha conta de correo de Evolution. Introduza un "
+"nome para esta conta no espacio de abaixo. Este nome sС se usarА co "
+"propСsito de mostralo."
 
 #. set window title
-#: mail/mail-config-druid.c:445
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr "Asistente de Contas de Evolution"
 
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
+msgstr "Conectando ao servidor..."
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr " Detectar tipos soportados "
@@ -6157,34 +7074,64 @@ msgid " color"
 msgstr " cor"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Non estА soportado asinar por este cifrado"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Conta"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "InformaciСn de Contas"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "XestiСn e Contas"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Contas"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Anexo"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "AutenticaciСn"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Tipo de AutenticaciСn: "
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "Comprobar automaticamente se hai correo novo de cada"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "Redactar"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6200,165 +7147,281 @@ msgstr ""
 "\n"
 "Prema \"Finalizar\" para gardar a nova configuraciСn."
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "Por de_fecto"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Feito"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Borradores"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Cartafol Borradores:"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "Editar..."
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "Enderezo de Correo-E:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "Activado"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Nome Completo:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
+msgstr ""
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "Ficheiro de sinatura:"
+
+#: mail/mail-config.glade.h:43
 #, fuzzy
-msgid "Highlight citations with "
+msgid "Highlight citations with"
 msgstr "Resaltar citas con "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Identidade"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Inline"
+msgstr "м_ndice"
+
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "ConfiguraciСn do Correo"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Formato mailbox"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "Facer esta a miЯa conta por defecto"
 
-#: mail/mail-config.glade.h:34
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "Marcar mensaxes como \"Lidas\" despois de: "
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "Servidor LDAP"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "Novas"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "InformaciСn Opcional"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "OrganizaciСn:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "CamiЯo do binario PGP"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "Escoller unha cor"
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "<Non se pode enviar a mensaxe: non se definiron destinatarios"
+
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "Maildir de Qmail "
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "No_tas:"
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "Recibindo Correo"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "Recibindo Correo"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "Recibindo OpciСns"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "InformaciСn Requerida"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
+
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Security"
+msgstr "_Seguridade"
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "Seleccionar o binario PGP"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "Enviar mensaxes en formato HTML por defecto."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "Enviada"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr "Mensaxes Enviadas e Borradores"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "Cartafol de mensaxes enviadas:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "ConfiguraciСn do Servidor"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Tipo de Servidor: "
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "O servidor require autenticaciСn"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Ficheiro de sinatura:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "Fontes"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Sen InformaciСn"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Fontes"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "Cartafoles especiais"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr "mbox estАndar de Unix"
 
-#: mail/mail-config.glade.h:68
-msgid "Type"
-msgstr "Tipo:"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "Usar conexiСn segura (SSL)"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Nome de usuario:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6368,163 +7431,243 @@ msgstr ""
 "\n"
 "Preme en \"Seguinte\" para empezar. "
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "_Editar"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
+msgstr ""
+
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
+msgstr ""
+
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr "segundos."
+
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "Non foi posible conectarse С servidor POP en %s."
+
+#: mail/mail-crypto.c:86
+#, fuzzy
+msgid "Could not create a PGP verification context."
+msgstr "Non foi posible conectarse С servidor POP en %s."
+
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr "Non foi posible crear a fiestra do compositor"
+
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
+msgstr ""
+"Non foi posible crear o directorio %s:\n"
+"%s"
+
+#: mail/mail-crypto.c:177
+msgid "Could not create a S/MIME signature context."
+msgstr ""
+
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
+msgstr ""
+
+#: mail/mail-crypto.c:240
+msgid "Could not create a S/MIME encryption context."
+msgstr ""
+
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "Non foi posible crear a fiestra do compositor"
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr "Non foi posible crear a fiestra do compositor"
 
-#: mail/mail-display.c:194
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Gardar Anexo"
 
-#: mail/mail-display.c:234
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Non foi posible crear o directorio temporal: %s"
-
-#: mail/mail-display.c:295
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Gardar С Disco..."
 
-#: mail/mail-display.c:297
-#, c-format
-msgid "Open in %s..."
-msgstr "Abrir en %s..."
-
-#: mail/mail-display.c:299
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "Ver Inline"
 
-#: mail/mail-display.c:334
-msgid "External Viewer"
-msgstr "Visualizador Externo"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:357
-#, c-format, fuzzy
+#: mail/mail-display.c:399
+#, fuzzy, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver Inline (vМa %s)"
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Agochar"
 
-#: mail/mail-display.c:1107
-msgid "Open link in browser"
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "Visualizador Externo"
+
+#: mail/mail-display.c:1048
+msgid "Loading message content"
+msgstr "Cargado o contido da mensaxe"
+
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
 msgstr "Abrir ligazСn no navegador"
 
-#: mail/mail-display.c:1109
-msgid "Save as (FIXME)"
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "Copiar localizaciСn (AMаяAME)"
+
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
 msgstr "Gardar como (AMаяAME)"
 
-#: mail/mail-display.c:1111
-msgid "Copy location (FIXME)"
-msgstr "Copiar localizaciСn (AMаяAME)"
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "Gardar como..."
+
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr " %d segundos"
 
-#: mail/mail-format.c:522
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s anexo"
 
-#: mail/mail-format.c:564
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
 
-#: mail/mail-format.c:771
-msgid "Loading message content"
-msgstr "Cargado o contido da mensaxe"
+#: mail/mail-format.c:746
+msgid "Date"
+msgstr "Data"
+
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "Enderezo de Correo-E:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr "De"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "Responder-A:"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "Para"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Cc:"
 
-#: mail/mail-format.c:1065
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "O programa GPG/PGP non estА configurado."
 
-#: mail/mail-format.c:1080
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "Mensaxe cifrada non visualizada"
 
-#: mail/mail-format.c:1086
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Mensaxe cifrada"
 
-#: mail/mail-format.c:1087
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Preme na icona para desencriptar."
 
-#: mail/mail-format.c:1177 mail/mail-format.c:1565
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Esta mensaxe estА asinada dixitalmente e comprobouse a autenticidade."
 
-#: mail/mail-format.c:1185 mail/mail-format.c:1573
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "Esta mensaxe estА asinada dixitalmente pero non se puido comprobar a sЗa autenticidade"
+msgstr ""
+"Esta mensaxe estА asinada dixitalmente pero non se puido comprobar a sЗa "
+"autenticidade"
 
-#: mail/mail-format.c:1786
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro a sitio FTP (%s)"
 
-#: mail/mail-format.c:1798
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Punteiro a ficheiro local (%s) vАlido no sitio \"%s\""
 
-#: mail/mail-format.c:1802
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro a ficheiro local (%s)"
 
-#: mail/mail-format.c:1836
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Punteiro a sitio FTP (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro a datos externos descoЯecidos (tipo \"%s\")"
 
-#: mail/mail-format.c:1841
+#: mail/mail-format.c:2107
 #, fuzzy
 msgid "Malformed external-body part."
 msgstr "Parte externa do corpo mal formada."
 
-#: mail/mail-local.c:337
-#, c-format
-msgid "No such folder %s"
-msgstr "Non existe o cartafol %s"
-
-#: mail/mail-local.c:509
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "Abrindo '%s'"
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando o cartafol \"%s\" С formato \"%s\""
 
-#: mail/mail-local.c:791
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Cambiar o cartafol \"%s\" С formato \"%s\""
-
-#: mail/mail-local.c:814
-msgid "Reconfiguring folder"
-msgstr "Reconfigurando o cartafol"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:843
-msgid "Closing current folder"
-msgstr "Pechando o cartafol actual"
-
-#: mail/mail-local.c:875
-msgid "Renaming old folder and opening"
-msgstr "Renomeando o cartafol antigo e abrindo"
-
-#: mail/mail-local.c:893
-msgid "Creating new folder"
-msgstr "Creando un novo cartafol"
-
-#: mail/mail-local.c:907
-msgid "Copying messages"
-msgstr "Copiando as mensaxes"
-
-#: mail/mail-local.c:924
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6533,7 +7676,7 @@ msgstr ""
 "Non foi posible gardar metainformaciСn do cartafol, seguramente\n"
 "non poderА abrir este cartafol nunca mАis: %s"
 
-#: mail/mail-local.c:963
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6541,7 +7684,17 @@ msgstr ""
 "Se non pode abrir mАis esta caixa de correo, poida\n"
 "que teЯa que reparala a man."
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "Non podes copiar mensaxes deste cartafol de lixo."
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "Configurar %s"
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6550,7 +7703,7 @@ msgstr ""
 "Erro mentres '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6559,105 +7712,105 @@ msgstr ""
 "Erro efectuando a operaciСn:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:892
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Traballando"
 
-#: mail/mail-mt.c:680 mail/session.c:98
-msgid "Do you accept?"
-msgstr "©Acepta?"
-
-#: mail/mail-mt.c:874
-msgid "Evolution progress"
-msgstr "Progreso de Evolution"
-
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:603
-msgid "Sending message"
-msgstr "Enviando a mensaxe"
-
-#: mail/mail-ops.c:718
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: mail/mail-ops.c:737
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
 
-#: mail/mail-ops.c:739 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Gardando a mensaxe no cartafol"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensaxes a %s"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Movendo"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/mail-ops.c:1152
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "Lixo"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "Mensaxes re-enviadas"
 
-#: mail/mail-ops.c:1193 mail/mail-ops.c:1331
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/mail-ops.c:1260
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo almacenamento %s"
 
-#: mail/mail-ops.c:1447
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "Abrindo cartafol %s"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "Reconfigurando o cartafol"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-ops.c:1496
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recibindo a mensaxe %s"
 
-#: mail/mail-ops.c:1563
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Recibindo as mensaxes"
 
-#: mail/mail-ops.c:1573
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Recibindo a mensaxe nЗmero %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1647
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Gardando as mensaxes"
 
-#: mail/mail-ops.c:1726
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6666,12 +7819,7 @@ msgstr ""
 "Non foi posible crear o ficheiro de saМda: %s\n"
 "%s"
 
-#: mail/mail-ops.c:1739
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Gardando a mensaxe %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6680,11 +7828,11 @@ msgstr ""
 "Erro gardando mensaxes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1827
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: mail/mail-ops.c:1842
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6693,232 +7841,200 @@ msgstr ""
 "Non И posible crear ficheiro de saМda: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1870
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "_Buscar"
+#: mail/mail-ops.c:2101
+#, c-format
+msgid "Disconnecting from %s"
+msgstr ""
+
+#: mail/mail-search.c:138
+#, fuzzy
+msgid "(Untitled Message)"
+msgstr "(Sen_tМtulo)"
+
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "MЗltiples Mensaxes"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "Editar Mensaxe"
+
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "Editar Mensaxe"
+
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-search.c:315
+#, fuzzy
+msgid "Search Forward"
+msgstr "Re-enviar"
+
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
+msgstr "Buscar"
+
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "CamiЯo:"
 
-#: mail/mail-send-recv.c:138
-msgid "Cancelling ..."
+#: mail/mail-send-recv.c:141
+#, fuzzy
+msgid "Cancelling..."
 msgstr "Cancelando ..."
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "Enviar e Recibir correo"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "Recibindo"
 
-#: mail/mail-send-recv.c:285
-msgid "Updating ..."
+#: mail/mail-send-recv.c:302
+#, fuzzy
+msgid "Updating..."
 msgstr "Actualizando ..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
-msgid "Waiting ..."
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#, fuzzy
+msgid "Waiting..."
 msgstr "Agardando ..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "Enviando"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "Cancelado."
 
-#: mail/mail-summary.c:110
-msgid "Incomplete message written on pipe!"
-msgstr "║Mensaxe incompleta escrita na canalizaciСn!"
-
-#: mail/mail-summary.c:468
-msgid "Mail Summary"
-msgstr "Resume de Correo"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
+msgstr ""
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Non foi posible crear a caixa de correo temporal `%s': %s"
 
-#: mail/mail-tools.c:188
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (mensaxe reenviada)"
-
-#: mail/mail-tools.c:198
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (sen asunto)"
-
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaxe reenviada - %s"
 
-#: mail/mail-tools.c:217
-msgid "Forwarded message (no subject)"
-msgstr "Mensaxe reenviada (sen asunto)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Mensaxes re-enviadas"
 
-#: mail/mail-tools.c:415
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Mensaxe Re-enviada-----<br><b>De:</b> %s<br><b>Para:</b> \n"
-"%s<br><b>Asunto:</b> %s <br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Mensaxes re-enviadas"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "CartafolesV"
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Novo CArtafolV"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:60
-msgid "Reply"
-msgstr "Responder"
-
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:66
-msgid "Reply to the sender of this message"
-msgstr "Responder С autor desta mensaxe"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:61
-msgid "Reply to All"
-msgstr "Responder a Todos"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:64
-msgid "Reply to all recipients of this message"
-msgstr "Responder a tСdolos destinatarios desta mensaxe"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:25
-msgid "Forward"
-msgstr "Re-enviar"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:29
-msgid "Forward this message"
-msgstr "Re-enviar esta mensaxe"
-
-#: mail/message-browser.c:200 ui/evolution-mail.xml.h:57
-msgid "Print the selected message"
-msgstr "Imprimir a mensaxe seleccionada"
-
-#: mail/message-browser.c:203 ui/evolution-mail.xml.h:13
-msgid "Delete this message"
-msgstr "Borrar esta mensaxe"
-
-#: mail/message-browser.c:208 ui/evolution-event-editor.xml.h:33
-#: ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Anterior"
-
-#: mail/message-browser.c:208
-msgid "Previous message"
-msgstr "Mensaxe Previa"
-
-#: mail/message-browser.c:211 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Seguinte"
-
-#: mail/message-browser.c:211
-msgid "Next message"
-msgstr "Seguinte Mensaxe"
-
-#: mail/message-list.c:678
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "Non vista"
 
-#: mail/message-list.c:679
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "MЗltiples Mensaxes Non Vistas"
 
-#: mail/message-list.c:682
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "MЗltiples Mensaxes"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "A mАis baixa"
 
-#: mail/message-list.c:687
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "Baixa"
 
-#: mail/message-list.c:691
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "Alta"
 
-#: mail/message-list.c:692
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "A mАis alta"
 
-#: mail/message-list.c:942
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "Hoxe Аs %k:%M"
 
-#: mail/message-list.c:958
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "Onte Аs %k:%M"
 
-#: mail/message-list.c:970
+#: mail/message-list.c:905
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:978
+#: mail/message-list.c:913
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: mail/message-list.c:980
+#: mail/message-list.c:915
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d de %Y"
 
-#: mail/message-list.c:1082
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Gardando as mensaxes"
+
+#: mail/message-list.etspec.h:2
 #, fuzzy
 msgid "Flagged"
 msgstr "Marcada"
 
-#: mail/message-list.c:1083
-msgid "From"
-msgstr "De"
-
-#: mail/message-list.c:1083
-msgid "Date"
-msgstr "Data"
-
-#: mail/message-list.c:1083
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Recibido"
 
-#: mail/message-list.c:1084
-msgid "To"
-msgstr "Para"
-
-#: mail/message-list.c:1084
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "TamaЯo"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:47
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Cartafol"
 
@@ -6946,15 +8062,1456 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "DesubscribМndose do cartafol \"%s\""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "Xestionar SubscripciСns"
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr "CompoЯente de Evolution para o resume Executivo"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr "FАbrica para o compoЯente de Resume Executivo de Evolution."
+
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Non se pode inicializar o compoЯente de Resume Executivo de Evolution."
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+msgid "Appointments"
+msgstr "Citas"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "Amosar citas..."
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%I:%M%p"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%I:%M %p"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Resume de Correo"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "InstalaciСn de Evolution"
+
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
+msgstr "Houbo un erro cargando o ficheiro da axenda."
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Erro cargando a axenda</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "Amosar tarefas"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "SecciСns:"
+
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A, %d de %B de %Y"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "A impresiСn da mensaxe fallou"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): non foi posible inicializar Bonobo"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "Limpar"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
+
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "Variable"
+msgstr "Desactivado"
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "Nota"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "No_tas:"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "Existe"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "Fontes"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "mes"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "A mАis baixa"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Proba"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "A mАis baixa"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "Amosar"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "Radio"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Drifting rain"
+msgstr "A descriciСn contИn"
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "Buscar de Novo"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "agora"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Moderate snow"
+msgstr "Actualizar agora"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+#, fuzzy
+msgid "Drifting snow grains"
+msgstr "A descriciСn contИn"
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "Correo ElectrСnico"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "Amosar todas "
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "Correo electrСnico principal"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "Recibindo Correo"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Shallow small hail"
+msgstr "Amosar todas "
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Showers of small hail"
+msgstr "Amosar todas "
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown precipitation"
+msgstr "Estado de autenticaciСn descoЯecido."
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "Erro descoЯecido"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "Convida para a ReuniСn"
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "SriЯa."
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "Vertical"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Drifting mist"
+msgstr "Lista de Correo"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Shallow fog"
+msgstr "Amosar todas "
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "Pechar esta fiestra"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "PuntuaciСn"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "Amosar tarefas"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "Pechar esta fiestra"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "Enviar"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "Cabeceira"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "dМas"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "agosto"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Raging tornado"
+msgstr "Cousas por facer"
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Thunderous tornado"
+msgstr "Cousas por facer"
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "Respondida"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Cartafoles"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "Todas Atendidas"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Mostar cartafoles que comezan por:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "OpciСns de Vista"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "Visualizar"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "Venres"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "MИrcores"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "mes"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr " unha semana"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr ""
+"Programar\n"
+"Hora"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Amosar tarefas"
+
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "con todos os cartafoles remotos activos"
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "Amosar tarefas"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "Tarefas"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
+msgstr ""
+"\n"
+"  Unidade:  "
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Outro"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "Limpar a selecciСn"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "abril"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "A shell de Evolution."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "Detalles"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "Cancelar ReuniСn"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Cartafoles especiais"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "InstalaciСn de Evolution"
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6962,29 +9519,25 @@ msgstr ""
 "Esta nova versiСn do Evolution necesita instalar ficheiros\n"
 "adicionais no seu directorio persoal do Evolution"
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Prema \"Aceptar\" para instalar os ficheiros, ou \"Cancelar\" para saМr."
 
-#: shell/e-setup.c:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "Non foi posible actualizar os ficheiros correctamente"
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr "Ficheiros de Evolution instalados con Иxito."
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Semella que И a primeira vez que executa Evolution."
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Prema \"Aceptar\" para instalar os ficheiros de usuario de Evolution en"
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6995,16 +9548,14 @@ msgstr ""
 "%s\n"
 "Erro: %s"
 
-#: shell/e-setup.c:230
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"Non se poden copiar os ficheiros a\n"
+"An error occurred in copying files into\n"
 "`%s'."
+msgstr "Ocorreu un erro lendo o ficheiro."
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7015,7 +9566,16 @@ msgstr ""
 "MСvao para poder instalar os ficheiros de\n"
 "usuario de Evolution."
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7026,21 +9586,58 @@ msgstr ""
 "directorio de Evolution. MСvao para poder\n"
 "instalar os ficheiros de usuario de Evolution."
 
-#: shell/e-shell.c:379
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "Non И posible obter o cartafol: %s: %s"
+
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"Non se poden copiar os ficheiros a\n"
+"`%s'."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
 #, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Non se pode activar o almacenamento local -- %s"
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
 
-#: shell/e-shell.c:1249
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "Copiar С cartafol"
+
+#: shell/e-shell-folder-commands.c:313
 #, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
-"Ooops!  A vista de `%s' morreu inesperadamente.  :-(\n"
-"Isto significa probablemente que o compoЯente %s se estragou."
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "Mover С cartafol"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "Borrar despois de %s dМa(s)"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "©EstА seguro de que quere borrar a tarefa `%s'?"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "Abrindo cartafol %s"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -7049,15 +9646,15 @@ msgstr ""
 "Non se pode crear o cartafol indicado:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "O nome de cartafol indicado non И vАlido."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crear un novo cartafol"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -7065,41 +9662,133 @@ msgstr ""
 "O tipo do cartafol seleccionado non И vАlido para\n"
 "a operaciСn solicitada."
 
-#: shell/e-shell-folder-selection-dialog.c:321
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Nova..."
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Sen_tМtulo)"
 
-#: shell/e-shell-view.c:148
-msgid "(No folder displayed)"
-msgstr "(NingЗn cartafol visualizado)"
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"Escolla o ficheiro que quere importar a Evolution, e seleccione quИ tipo de "
+"ficheiro И na lista.\n"
+"\n"
+"Pode seleccionar \"AutomАtico\" se non o sabe, e Evolution tentarА facer o "
+"traballo por vostede."
 
-#: shell/e-shell-view.c:1184
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
 #, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+"Importando %s\n"
+"Importador non preparado.\n"
+"Agarda 5 segundos antes de tentalo de novo."
 
-#: shell/e-shell-view.c:1186
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
 #, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"Importando %s\n"
+"Importando obxecto %d."
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"Non hai importador capaz de manexar\n"
+"%s"
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr "Importando"
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"Importando %s.\n"
+"Comezando %s"
+
+#: shell/e-shell-importer.c:383
+#, c-format
+msgid "Error starting %s"
+msgstr "Erro iniciando %s"
+
+#: shell/e-shell-importer.c:402
+#, c-format
+msgid "Error loading %s"
+msgstr "Erro cargando %s"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"Importando %s\n"
+"Importando obxecto 1."
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr "AutomАtico"
+
+#: shell/e-shell-importer.c:538
+msgid "Filename:"
+msgstr "Nome do ficheiro:"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "Seleccionar un ficheiro"
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:553
+msgid "File type:"
+msgstr "Tipo do ficheiro:"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "Seleccionar cartafol"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Non se atopou o Bug buddy no seu $PATH."
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Non foi posible executar o Bug buddy."
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -7109,23 +9798,88 @@ msgstr ""
 "en grupo para xestiСn de correo, axenda e contactos\n"
 "dentro do ambiente de escritorio GNOME."
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Ir С cartafol..."
 
-#: shell/e-shortcuts.c:381
-msgid "Error saving shortcuts."
-msgstr "Erro gardando atallos."
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Crear un novo grupo de atallos"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
+msgstr "Traballar desconectado"
+
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
+msgstr "Traballar desconectado"
+
+#: shell/e-shell-view.c:175
+msgid "(No folder displayed)"
+msgstr "(NingЗn cartafol visualizado)"
+
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1411
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
+
+#: shell/e-shell-view.c:1413
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Non se pode activar o almacenamento local -- %s"
+
+#: shell/e-shell.c:1311
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"Ooops!  A vista de `%s' morreu inesperadamente.  :-(\n"
+"Isto significa probablemente que o compoЯente %s se estragou."
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Crear novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Nome do grupo:"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -7134,119 +9888,202 @@ msgstr ""
 "©Realmente desexa eliminar o grupo\n"
 "`%s' da barra de atallos?"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "Non eliminar"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "Eliminar este grupo de atallos"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "Eliminar este grupo de atallos"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "Iconas _Pequenas"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Amosar os atallos como iconas pequenas"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "Iconas _Grandes"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Amosar os atallos como iconas grandes"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_Novo Grupo..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Crear un novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "_Eliminar este Grupo..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "_Eliminar este Grupo..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "Eliminar este grupo de atallos"
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "Agochar a Barra de _Atallos"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Agochar a barra de atallos"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "Activar"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "Eliminar este grupo de atallos"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "Eliminar este grupo de atallos"
+
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Abrir"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr "Abrir nunha Nova Fiestra"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
-msgstr "Activar este atallo"
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Abrir a mensaxe actual nunha nova fiestra"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "Nome da regra: "
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "Eliminar este grupo de atallos"
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Eliminar este atallo da barra de atallos"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:585
+msgid "Error saving shortcuts."
+msgstr "Erro gardando atallos."
+
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Barra de _Atallos"
+
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "_Contacto"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Sen nome)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Sen erro"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Erro xenИrico"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "Xa existe un cartafol co mesmo nome"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "O tipo do cartafol indicado non И vАlido"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "Erro de E/S"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "Non hai espacio dabondo para crear o cartafol"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "Non se atopou o cartafol indicado"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "FunciСn non implementada neste almacenamento"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "Permiso denegado"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "OperaciСn non soportada"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "O tipo especificado non estА soportado neste almacenamento"
 
-#: shell/e-storage-set-view.c:650 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:44
-msgid "_View"
-msgstr "_Vista"
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
 
-#: shell/e-storage-set-view.c:650
-msgid "View the selected folder"
-msgstr "Ver o cartafol seleccionado"
+#: shell/e-task-widget.c:173
+#, fuzzy
+msgid "%s (%d%% complete)"
+msgstr "% Comp_leta:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "Calquera campo contИn"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "Servidor:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
 
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
@@ -7260,105 +10097,6 @@ msgstr "Tipo do cartafol:"
 msgid "Specify where to create the folder:"
 msgstr "Especifica Сnde crear o cartafol:"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "A shell de Evolution."
-
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"Escolla o ficheiro que quere importar a Evolution, e seleccione quИ tipo de ficheiro И na lista.\n"
-"\n"
-"Pode seleccionar \"AutomАtico\" se non o sabe, e Evolution tentarА facer o traballo por vostede."
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"Importando %s\n"
-"Importador non preparado.\n"
-"Agarda 5 segundos antes de tentalo de novo."
-
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"Importando %s\n"
-"Importando obxecto %d."
-
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"Non hai importador capaz de manexar\n"
-"%s"
-
-#: shell/importer/importer.c:351
-msgid "Importing"
-msgstr "Importando"
-
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"Importando %s.\n"
-"Comezando %s"
-
-#: shell/importer/importer.c:372
-#, c-format
-msgid "Error starting %s"
-msgstr "Erro iniciando %s"
-
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
-msgstr "Erro cargando %s"
-
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"Importando %s\n"
-"Importando obxecto 1."
-
-#: shell/importer/importer.c:473
-msgid "Automatic"
-msgstr "AutomАtico"
-
-#: shell/importer/importer.c:523
-msgid "Filename:"
-msgstr "Nome do ficheiro:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
-msgstr "Seleccionar un ficheiro"
-
-#: shell/importer/importer.c:538
-msgid "File type:"
-msgstr "Tipo do ficheiro:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
-msgstr "Importar"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Preme en \"Importar\" para comezar a importar o ficheiro a Evolution. "
@@ -7381,26 +10119,36 @@ msgstr ""
 "Este asistente guiarАo no proceso de importar ficheiros\n"
 "externos a Evolution."
 
-#: shell/importer/intelligent.c:143
+#: shell/importer/intelligent.c:191
+#, fuzzy
+msgid "Importers"
+msgstr "Importar"
+
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "Non eliminar"
+
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "Non preguntar de novo"
 
-#: shell/main.c:83
-#, no-c-format
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
@@ -7422,7 +10170,7 @@ msgstr ""
 "Agardamos que desfrutes os resultados do noso duro traballo, ║e\n"
 " estamos impacientes esperando a tЗa contribuciСn!\n"
 
-#: shell/main.c:108
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7430,237 +10178,323 @@ msgstr ""
 "GraciЯas\n"
 "O Equipo de Evolution\n"
 
-#: shell/main.c:139
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "Non se pode inicializar a shell de Evolution."
 
-#: shell/main.c:185
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "Desactivar a pantalla inicial"
 
-#: shell/main.c:186
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr "Enviar a saМda da depuraciСn de todos os compoЯentes a un ficheiro."
 
-#: shell/main.c:219
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Non se pode inicializar o sistema de compoЯentes de Bonobo"
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Copiar"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
+msgstr "Copiar a selecciСn"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "Crear un novo contacto"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Borrar un contacto"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "Crear un novo contacto"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Buscar"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Cortar"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Buscar un contacto"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr "Cortar a selecciСn"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "Borrar un contacto"
+
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Novo contacto"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:50
-msgid "Previews the message to be printed"
-msgstr "Previsualiza a mensaxe que se vai imprimir"
-
 #: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+#, fuzzy
+msgid "New list"
+msgstr "Novas"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Pegar"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "Pegar o contido do cartafol"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
+msgstr "Previsualiza a axenda que se vai imprimir"
+
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "Imprimir contactos"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:79
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "Seleccionar Todo"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "Borrar un contacto"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Parar"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Parar a Carga"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "Ver Todos"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "Ver tСdolos contactos"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "_Fontes do Libro de Enderezos..."
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "_Contacto"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "_Buscar contactos"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:112
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:43
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
+msgstr "_Seleccionar Todo"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_Ferramentas"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 DМas"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-#, fuzzy
-msgid "Alter preferences"
-msgstr "Preferencias alternativas"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a new all day Event"
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "Crear un novo Evento de todo o dМa"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Crear unha nova cita"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Crear unha nova axenda"
+msgid "Create a new appointment"
+msgstr "Crear unha nova cita"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "DМa"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Ir Para"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Ir para atrАs no tempo"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Ir para diante no tempo"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "Ir А _Data"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
-msgstr "Ir a _Hoxe"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Ir para a data especificada"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Ir А hora actual"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "Mes"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr "Novo _Evento"
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "Abrir Axenda"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "Ant"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Nova Cita"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Previsualiza a axenda que se vai imprimir"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Imprimir Axenda"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Imprimir esta Axenda"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Gardar Como"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "InformaciСn Requerida"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "Gardar axenda como outra cousa distinta"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Amosar un dМa"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Amosar un mes"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Amosar unha semana"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Amosar a semana laboral"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
-msgid "Today"
-msgstr "Hoxe"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "Semana Lab_oral"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "Semana"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "_Citas"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "_Preferencias de Correo..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "_DМa"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "_Mes"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:39
-msgid "_New"
-msgstr "_Novo"
-
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "_Abrir axenda"
-
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "_Semana"
 
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Pechar"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "Pechar esta cita"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "Borrar esta cita"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "Barra de Ferramentas Principal"
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "Previsualiza a mensaxe que se vai imprimir"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "Previsualizar a ImpresiСn"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "ConfiguraciСn da ImpresiСn"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Imprimir este elemento"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "Imprimir..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "Gardar e Pechar"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "Gardar a cita e pechar a caixa de diАlogo"
+
+#: ui/evolution-comp-editor.xml.h:17
+#, fuzzy
+msgid "Save this item to disk"
+msgstr "Trocar a vista de %s"
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr "Configurar as opciСns de pАxina para a impresora actual"
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "_AcciСns"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "_Ficheiro"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Borrar este elemento"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "Eliminar..."
 
@@ -7673,27 +10507,12 @@ msgstr "Axuda"
 msgid "Print En_velope..."
 msgstr "_ConfiguraciСn da ImpresiСn..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Imprimir este elemento"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:58 ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Imprimir..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Gardar _Como..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Gardar e Pechar"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Gardar o contacto e pechar a caixa de diАlogo"
@@ -7710,877 +10529,1004 @@ msgstr "Ver a axuda online"
 msgid "Send _message to contact..."
 msgstr "Enviar unha _mensaxe ao contacto..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
-msgid "_File"
-msgstr "_Ficheiro"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Gardar"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Acerca desta aplicaciСn"
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Acerca de..."
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "AcciС_ns"
-
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "_Libro de enderezos... (AMаяAME)"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "Borrar este elemento"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "_Limpar"
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "Gardar a tarefa e pechar a caixa de diАlogo"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "Co_rtar"
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "E_nviar contacto a outro..."
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "Comproba_r Nomes (AMаяAME)"
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "Enviar unha _mensaxe ao contacto..."
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "Limpar"
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "Cancelar ReuniСn"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "Limpar a selecciСn"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#, fuzzy
+msgid "Cancel the meeting for this item"
+msgstr "Cambiar as propiedades deste cartafol"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Pechar esta cita"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Forward as i_Calendar"
+msgstr "Re-enviar como _AxendaV (AMаяAME)"
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "Cop_iar ao Cartafol... (AMаяAME)"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "Re-enviar esta mensaxe"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Copiar"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Copiar a selecciСn"
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr ""
+"Solicitar\n"
+"ReuniСn"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Cortar"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr "_Programar ReuniСn"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Cortar a selecciСn"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#, fuzzy
+msgid "Schedule a meeting for this item"
+msgstr "AMаяAME: Programar ReuniСn"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Borrar esta cita"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "_AcciСns"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "Envorcar XML"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "%s - Evolution %s"
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "Envorcar a descriciСn Xml da Interface"
+#: ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "Cancelada"
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "P_rimeiro Obxecto no Cartafol (AMаяAME)"
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "Gardar o ficheiro actual"
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "Re-en_viar (AMаяAME)"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "Redactar"
 
-#: ui/evolution-event-editor.xml.h:23
+#: ui/evolution-mail-global.xml.h:4
 #, fuzzy
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "Re-enviar como _AxendaV (AMаяAME)"
+msgid "Compose _New Message"
+msgstr "Redactar unha nova mensaxe"
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "Ir С elemento seguinte"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Ir С elemento anterior"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "Tarefa In_completa (AMаяAME)"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "Modificar as propiedades do ficheiro"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr "Baleirar _Lixo"
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "Se_guinte"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "Esquecer _Contrasinais"
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Pegar"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Pegar o contido do cartafol"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
+msgstr "Xestionar _SubcripciСns"
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "An_terior"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "Previsualizar a ImpresiСn"
+#: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "_ConfiguraciСn da ImpresiСn..."
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send / Receive"
+msgstr "Enviar / Recibir"
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "ConfiguraciСn da ImpresiСn"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "Enviar o correo na cola e recibir o correo novo"
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
-msgid "Save"
-msgstr "Gardar"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "Gardar a cita e pechar a caixa de diАlogo"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "Gardar o ficheiro actual"
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
+msgstr "_Editor de Cartafoles Virtuais..."
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "_Programar ReuniСn"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
+msgstr "_Filtros..."
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "Programar algunha clase de reuniСn"
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr "Enviar _Mensaxe"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "Seleccionar Todo"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "_Preferencias de Correo..."
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "Seleccionar todo"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "Previsualizar"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "Configurar as opciСns de pАxina para a impresora actual"
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
+msgstr "_Enviar / Recibir"
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "_PeticiСn de Tarefa (AMаяAME)"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr "Cambiar as propiedades deste cartafol"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "_Acerca de..."
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "Eliminar as mensaxes seleccionadas"
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Pechar"
+#: ui/evolution-mail-list.xml.h:5
+#, fuzzy
+msgid "Cut selected messages"
+msgstr "Eliminar as mensaxes seleccionadas"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
-msgid "_Contact (FIXME)"
-msgstr "_Contacto (AMаяAME)"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "Agochar Mensaxes S_eleccionadas"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_Copiar"
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "Agochar Mensaxes _Borradas"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_DepuraciСn"
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
+msgstr "Agochar Mensaxes _Lidas"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:35
-msgid "_Help"
-msgstr "A_xuda"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "_Obxecto (AMаяAME)"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "Marcar Todas como L_idas"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "_Entrada de diario (AMаяAME)"
+#: ui/evolution-mail-list.xml.h:11
+#, fuzzy
+msgid "Mark all visible messages as read"
+msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "_Derradeiro elemento no cartafol (AMаяAME)"
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "Pegar o contido do cartafol"
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "_Enviar Menxaxe (AMаяAME)"
+#: ui/evolution-mail-list.xml.h:14
+#, fuzzy
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "_Mover ao Cartafol ... (AMаяAME)"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "Seleccionar _Todo"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "_Nota (AMаяAME)"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "Seleccionar _FМo"
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "_Pegar"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:104
-#: ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
-msgstr "_Propiedades..."
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "_Seleccionar Todo"
+#: ui/evolution-mail-list.xml.h:19
+#, fuzzy
+msgid "Select all visible messages"
+msgstr "Eliminar as mensaxes seleccionadas"
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:42
-msgid "_Task (FIXME)"
-msgstr "_Tarefa (AMаяAME)"
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "Amosar _Todo"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "_Obxecto non Lido (AMаяAME)"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Engadir Servicio"
+#: ui/evolution-mail-list.xml.h:22
+#, fuzzy
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "Engadir un novo servicio ao Resume Executivo"
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "Eliminar as mensaxes seleccionadas"
 
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Crear unha nova mensaxe de correo"
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "Lista de mensaxes por fМos"
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "Preferencias do Resume Executivo..."
+#: ui/evolution-mail-list.xml.h:25
+#, fuzzy
+msgid "_Expunge"
+msgstr "_Limpar"
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Nova Mensaxe"
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Cartafol"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
-msgstr "Aplicar calquera filtro novo ao correo desta caixa"
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_Inverter SelecciСn"
 
-#: ui/evolution-mail.xml.h:3
-msgid "Change the properties of this folder"
-msgstr "Cambiar as propiedades deste cartafol"
+#: ui/evolution-mail-list.xml.h:28
+msgid "_Properties..."
+msgstr "_Propiedades..."
 
-#: ui/evolution-mail.xml.h:4
-msgid "Compose"
-msgstr "Redactar"
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "Lista de mensaxes por fМos"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
-msgstr "Redactar unha nova mensaxe"
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "Apply filter rules to the selected messages"
+msgstr "Eliminar as mensaxes seleccionadas"
 
-#: ui/evolution-mail.xml.h:6
-msgid "Configure Folder..."
-msgstr "_Configurar cartafol..."
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "Responder a tСdolos destinatarios desta mensaxe"
 
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
-msgstr "Copiar a mensaxe a un novo cartafol"
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Responder С autor desta mensaxe"
+
+#: ui/evolution-mail-message.xml.h:6
 msgid "Copy selected messages to another folder"
 msgstr "Copiar as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail-message.xml.h:7
 msgid "Create _Virtual Folder From Message"
 msgstr "Crear Cartafol _Virtual Desde Mensaxe"
 
-#: ui/evolution-mail.xml.h:12
-msgid "Delete the selected messages"
-msgstr "Eliminar as mensaxes seleccionadas"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
-msgstr "Mostrar todas as cabeceiras da mensaxe"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:15
-msgid "Edit Message"
-msgstr "Editar Mensaxe"
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:12
+#, fuzzy
+msgid "Create a virtual folder for these recipients"
+msgstr "Crear Cartafol _Virtual Desde Mensaxe"
+
+#: ui/evolution-mail-message.xml.h:13
+#, fuzzy
+msgid "Create a virtual folder for this mailing list"
+msgstr "Crear Cartafol _Virtual Desde Mensaxe"
+
+#: ui/evolution-mail-message.xml.h:14
+#, fuzzy
+msgid "Create a virtual folder for this sender"
+msgstr "Crear Cartafol _Virtual Desde Mensaxe"
+
+#: ui/evolution-mail-message.xml.h:15
+#, fuzzy
+msgid "Create a virtual folder for this subject"
+msgstr "Crear Cartafol _Virtual Desde Mensaxe"
 
-#: ui/evolution-mail.xml.h:16
-msgid "Edit the current message"
+#: ui/evolution-mail-message.xml.h:17
+#, fuzzy
+msgid "Display the next important message"
+msgstr "Responder С autor desta mensaxe"
+
+#: ui/evolution-mail-message.xml.h:18
+#, fuzzy
+msgid "Display the next message"
 msgstr "Editar a mensaxe actual"
 
-#: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
-msgstr "Baleirar _Lixo"
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
+msgstr "Eliminar as mensaxes seleccionadas"
+
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail-message.xml.h:21
+msgid "Display the previous important message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:22
 #, fuzzy
-msgid "Expunge"
-msgstr "Limpar"
+msgid "Display the previous message"
+msgstr "Mensaxe Previa"
+
+#: ui/evolution-mail-message.xml.h:23
+msgid "Display the previous unread message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:19
-msgid "Filter on Mailing _List"
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "Filtro sobre _Lista de Correo"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "Filtro sobre _Autor"
 
-#: ui/evolution-mail.xml.h:21
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "Filtro sobre _Destinatarios"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "Filtro sobre o _Asunto"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Finaly remove all mails tagged for deletion"
-msgstr "Eliminar definitivamente todas as mensaxes etiquetadas para borralas"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:24
-msgid "Forget _Passwords"
-msgstr "Esquecer _Contrasinais"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "Re-enviar"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "Re-enviar Como"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail-message.xml.h:31
 #, fuzzy
-msgid "Forward inline"
-msgstr "Re-enviar inline"
-
-#: ui/evolution-mail.xml.h:28
-msgid "Forward the selected mail to someone"
-msgstr "Reenviar o correo seleccionado a alguИn"
+msgid "Forward _Attached"
+msgstr "Re-enviar Como"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail-message.xml.h:32
 #, fuzzy
-msgid "Forward this message in-line with your mail, so you can edit it"
-msgstr "Reenviar esta mensaxe in-line coa tЗa, asМ podes editala"
-
-#: ui/evolution-mail.xml.h:31
-msgid "Full _Headers"
-msgstr "_Cabeceiras Completas"
-
-#: ui/evolution-mail.xml.h:32
-msgid "Hide Deleted Messages"
-msgstr "Agochar Mensaxes Borradas"
+msgid "Forward _Inline"
+msgstr "Re-enviar inline"
 
-#: ui/evolution-mail.xml.h:33
-msgid "Hide S_elected Messages"
-msgstr "Agochar Mensaxes S_eleccionadas"
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Forward _Quoted"
+msgstr "Re-enviar inline"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Hide _Deleted Messages"
-msgstr "Agochar Mensaxes _Borradas"
+#: ui/evolution-mail-message.xml.h:34
+#, fuzzy
+msgid "Forward the selected message in the body of a new message"
+msgstr "Reenviar o correo seleccionado a alguИn"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Hide _Read messages"
-msgstr "Agochar Mensaxes _Lidas"
+#: ui/evolution-mail-message.xml.h:35
+#, fuzzy
+msgid "Forward the selected message quoted like a reply"
+msgstr "Reenviar o correo seleccionado a alguИn"
 
-#: ui/evolution-mail.xml.h:36
-msgid "Invert Selection"
-msgstr "Inverter SelecciСn"
+#: ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward the selected message to someone"
+msgstr "Reenviar o correo seleccionado a alguИn"
 
-#: ui/evolution-mail.xml.h:37
-msgid "Manage _Subscriptions..."
-msgstr "Xestionar _SubcripciСns"
+#: ui/evolution-mail-message.xml.h:37
+#, fuzzy
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Reenviar o correo seleccionado a alguИn"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Mark All as R_ead"
-msgstr "Marcar Todas como L_idas"
+#: ui/evolution-mail-message.xml.h:39
+#, fuzzy
+msgid "Load _Images"
+msgstr "Mensaxes re-enviadas"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Mark As Read"
-msgstr "Marcar como Lida"
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "Importante"
 
-#: ui/evolution-mail.xml.h:41
-msgid "Mark As U_nread"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
 msgstr "Marcar como _non Lida"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar as mensaxes seleccionadas como se non foran lidas"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Marcar as mensaxes seleccionadas como se non foran lidas"
+
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
+
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Mover"
 
-#: ui/evolution-mail.xml.h:46
-msgid "Move message to a new folder"
-msgstr "Mover mensaxe a un novo cartafol"
-
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution-mail.xml.h:48
-msgid "Open in New Window"
-msgstr "Abrir nunha Nova Fiestra"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "Seguinte"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Seguinte Mensaxe"
 
-#: ui/evolution-mail.xml.h:49
-msgid "Open the current message in a new window"
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Seguinte Mensaxe"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Seleccionar _FМo"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Seguinte Mensaxe"
+
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Open the selected message in a new window"
 msgstr "Abrir a mensaxe actual nunha nova fiestra"
 
-#: ui/evolution-mail.xml.h:54
-msgid "Print Preview of message..."
-msgstr "PrevisualizaciСn da ImpresiСn da mensaxe..."
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Open the selected message in the composer to re-send it"
+msgstr "Marcar as mensaxes seleccionadas como se foran lidas"
 
-#: ui/evolution-mail.xml.h:55
-msgid "Print message to the printer"
-msgstr "Imprimir mensaxe na impresora"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "Previsualiza a mensaxe que se vai imprimir"
 
-#: ui/evolution-mail.xml.h:56
-msgid "Print message..."
-msgstr "Imprimir mensaxe..."
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "Anterior"
 
-#: ui/evolution-mail.xml.h:59
-msgid "Redirect (FIXME: implement me)"
-msgstr "Redireccionar (AMаяAME: implemИntame)"
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Imprimir Mensaxe"
 
-#: ui/evolution-mail.xml.h:63
-msgid "Reply to all"
-msgstr "Responder a Todos"
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Imprimir Mensaxe"
 
-#: ui/evolution-mail.xml.h:65
-msgid "Reply to sender"
-msgstr "Responder С autor"
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Imprimir Mensaxe"
 
-#: ui/evolution-mail.xml.h:67
-msgid "S_ource"
-msgstr "F_ontes"
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
+msgid "Print Message..."
+msgstr "Imprimir mensaxe..."
 
-#: ui/evolution-mail.xml.h:68
-msgid "Save the message into a new file"
-msgstr "Gardar a mensaxe nun novo ficheiro"
+#: ui/evolution-mail-message.xml.h:65
+#, fuzzy
+msgid "Print Preview..."
+msgstr "PrevisualizaciСn da ImpresiСn"
 
-#: ui/evolution-mail.xml.h:70 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Seleccionar _Todo"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "Imprimir Mensaxe"
 
-#: ui/evolution-mail.xml.h:71
-msgid "Select _Thread"
-msgstr "Seleccionar _FМo"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "Responder"
 
-#: ui/evolution-mail.xml.h:72
-msgid "Send / Receive"
-msgstr "Enviar / Recibir"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "Responder a Todos"
 
-#: ui/evolution-mail.xml.h:73
-msgid "Send a reply to the person who sent you this mail"
-msgstr "Enviar unha resposta А persoa que che enviou esta"
+#: ui/evolution-mail-message.xml.h:71
+#, fuzzy
+msgid "S_earch Message"
+msgstr "Mensaxe de servidor:"
 
-#: ui/evolution-mail.xml.h:74
-msgid "Send a single mail in reply to all the selected mail"
-msgstr "Enviar unha Зnica mensaxe en resposta a todo o correo seleccionado"
+#: ui/evolution-mail-message.xml.h:72
+#, fuzzy
+msgid "Save the message as a text file"
+msgstr "Gardar a mensaxe nun novo ficheiro"
 
-#: ui/evolution-mail.xml.h:75
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
-msgstr "Enviar o correo na cola e recibir o correo novo"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:77
-msgid "Send queued mail and retrieve new mail"
-msgstr "Enviar o correo na cola e recibir o correo novo"
+#: ui/evolution-mail-message.xml.h:74
+msgid "Show Email _Source"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:78
-msgid "Show _All"
-msgstr "Amosar _Todo"
+#: ui/evolution-mail-message.xml.h:75
+#, fuzzy
+msgid "Show Full _Headers"
+msgstr "_Cabeceiras Completas"
 
-#: ui/evolution-mail.xml.h:80
-msgid "Threaded Message list"
-msgstr "Lista de mensaxes por fМos"
+#: ui/evolution-mail-message.xml.h:76
+#, fuzzy
+msgid "Show message in the normal style"
+msgstr "A data ten que ser introducida no formato: %s"
+
+#: ui/evolution-mail-message.xml.h:77
+#, fuzzy
+msgid "Show message with all email headers"
+msgstr "Comprobar as novas mensaxes en tСdolos cartafoles"
+
+#: ui/evolution-mail-message.xml.h:78
+#, fuzzy
+msgid "Show the raw email source of the message"
+msgstr "IncluМr un ficheiro como anexo na mensaxe"
 
-#: ui/evolution-mail.xml.h:81
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "Recuperar as mensaxes seleccionadas"
 
-#: ui/evolution-mail.xml.h:82
-msgid "Undelete"
-msgstr "Recuperar"
+#: ui/evolution-mail-message.xml.h:80
+#, fuzzy
+msgid "VFolder on Mailing _List..."
+msgstr "CartafolV sobre _Lista de Correo"
 
-#: ui/evolution-mail.xml.h:87
+#: ui/evolution-mail-message.xml.h:81
 #, fuzzy
-msgid "View Raw Message Source"
-msgstr "Ver a Mensaxe en Fontes CrЗas"
+msgid "VFolder on Se_nder..."
+msgstr "CartafolV sobre o Au_tor"
 
-#: ui/evolution-mail.xml.h:88
-msgid "Virtual Folder _Editor..."
-msgstr "_Editor de Cartafoles Virtuais..."
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "VFolder on _Recipients..."
+msgstr "CartafolV sobre os _Destinatarios"
+
+#: ui/evolution-mail-message.xml.h:83
+#, fuzzy
+msgid "VFolder on _Subject..."
+msgstr "CartafolV sobre o A_sunto"
 
-#: ui/evolution-mail.xml.h:89
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_Aplicar Filtros"
 
-#: ui/evolution-mail.xml.h:90
-msgid "_Attachment"
-msgstr "_Anexo"
+#: ui/evolution-mail-message.xml.h:85
+#, fuzzy
+msgid "_Copy to Folder"
+msgstr "Copiar С cartafol"
 
-#: ui/evolution-mail.xml.h:92
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "_Crear Filtro desde Mensaxe"
 
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
-msgid "_Expunge"
-msgstr "_Limpar"
-
-#: ui/evolution-mail.xml.h:95
-msgid "_Filters..."
-msgstr "_Filtros..."
-
-#: ui/evolution-mail.xml.h:96 ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "_Cartafol"
+msgid "_Forward Message"
+msgstr "Mensaxes re-enviadas"
 
-#: ui/evolution-mail.xml.h:98
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
-msgid "_Inline"
-msgstr "м_ndice"
-
-#: ui/evolution-mail.xml.h:99 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Inverter SelecciСn"
+msgid "_Message Display"
+msgstr "Mensaxes"
 
-#: ui/evolution-mail.xml.h:100
-msgid "_Mail Message"
-msgstr "Enviar _Mensaxe"
+#: ui/evolution-mail-message.xml.h:90
+#, fuzzy
+msgid "_Move to Folder"
+msgstr "Mover С cartafol"
 
-#: ui/evolution-mail.xml.h:101
-msgid "_Mail Settings..."
-msgstr "_Preferencias de Correo..."
+#: ui/evolution-mail-message.xml.h:91
+#, fuzzy
+msgid "_Normal Display"
+msgstr "Visualizar"
 
-#: ui/evolution-mail.xml.h:103
-msgid "_Open Selected Items"
-msgstr "Abrir Obxectos Seleccionados"
+#: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Open Message"
+msgstr "_Re-enviar Mensaxes"
 
-#: ui/evolution-mail.xml.h:105
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
-msgid "_Quoted"
-msgstr "No_tas:"
+msgid "_Re-send Message"
+msgstr "_Re-enviar Mensaxes"
 
-#: ui/evolution-mail.xml.h:106
-msgid "_Reply"
-msgstr "_Responder"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Pechar esta fiestra"
 
-#: ui/evolution-mail.xml.h:107
-msgid "_Resend Messages"
-msgstr "_Re-enviar Mensaxes"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr "Personali_zar Barras de Tarefas..."
 
-#: ui/evolution-mail.xml.h:109
-msgid "_Save Message As..."
-msgstr "_Gardar Mensaxe Como..."
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "Personalizar"
 
-#: ui/evolution-mail.xml.h:110
-msgid "_Send / Receive"
-msgstr "_Enviar / Recibir"
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "Personalizar barras de tarefas"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "_Pechar"
 
-#: ui/evolution-mail.xml.h:111
-msgid "_Threaded"
-msgstr "_Por fМos"
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "_Vista"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Anexar"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Pechar o ficheiro actual"
 
 #: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Delete all but signature"
+msgstr "Borrar todas as Ocurrencias"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Encriptar esta mensaxe con PGP"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "_Formatar"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "Inserir ficheiro de texto..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Inserir un ficheiro como texto dentro da mensaxe"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Inserir ficheiro de texto..."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Abrir ficheiro"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "Encriptar con PGP"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "Asinar con PGP"
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "Gardar _Borrador"
+#, fuzzy
+msgid "S/MIME Encrypt"
+msgstr "Encriptar con PGP"
 
 #: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Gardar no _cartafol... (AMаяAME)"
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "Gardar"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Gardar Como"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr "Gardar _Borrador"
+
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Gardar no cartafol..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "Gardar o ficheiro actual"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Gardar o ficheiro actual cun nome diferente"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Gardar a mensaxe nun cartafol especМfico"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Enviar"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Enviar mАis _Tarde"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Enviar mАis _tarde"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Enviar a mensaxe en formato HTML"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Enviar a mensaxe mАis tarde"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Enviar a mensaxe agora"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Enviar esta mensaxe agora"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Amosar / agochar anexos"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Amosar _anexos"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Amosar anexos"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "Asinar esta mensaxe coa sЗa clave PGP"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Asinar esta mensaxe coa sЗa clave PGP"
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Trocar mostra do campo BCC"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr "Trocar mostra do campo CC"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Trocar mostra do selector de Deste"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Trocar mostra do campo Responder-A"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "_Anexo"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "Campo _Bcc"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "_DepuraciСn"
+
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Delete all"
+msgstr "_Borrar"
+
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "Campo _Desde"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
-msgstr "_Inserir ficheiro de texto... (AMаяAME)"
-
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "Campo _Responder-A"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "_Seguridade"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "A_xuda"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Engadir o cartafol А lista de cartafoles subscritos"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Cartafol"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Actualizar Lista"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Actualizar a lista de cartafoles"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Eliminar o cartafol da lista de cartafoles subscritos"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Subscribir"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Desubscribir"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "Asig_nar Tarefa (AMаяAME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Buscar de Novo"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "_Solicitude de ReuniСn (AMаяAME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Refacer"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Refacer a acciСn desfeita"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "SubstituМr"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "SubstituМr unha cadea"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "Responder a _Todos (AMаяAME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "_Mandar Informe de Estado (AMаяAME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "S_altarse a Ocurrencia (AMаяAME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "Gardar a tarefa e pechar a caixa de diАlogo"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "Buscar novamente a mesma cadea"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "Buscar unha cadea"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Desfacer"
+#: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Task"
+msgstr "Nova Tarefa"
 
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "Desfacer a Зltima acciСn"
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "Borrar a tarefa"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
-msgid "_Appointment (FIXME)"
-msgstr "_Cita (AMаяAME)"
+#: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Re_fresh Task"
+msgstr "Actualizar Lista"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "_Marcar como Completa (AMаяAME)"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "_Resposta (AMаяAME)"
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "Copy selected task"
+msgstr "Abrir Obxectos Seleccionados"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Crear unha nova tarefa"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "Borrar a tarefa"
+
+#: ui/evolution-tasks.xml.h:7
+#, fuzzy
+msgid "Delete selected tasks"
+msgstr "Borrar a tarefa"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Nova Tarefa"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "Pegar o contido do cartafol"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Gardar como outra cousa distinta"
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "Preferencias das Tarefas..."
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "_Preferencias de Correo..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_Tarefa"
 
@@ -8588,132 +11534,220 @@ msgstr "_Tarefa"
 msgid "About Evolution..."
 msgstr "Acerca do Evolution..."
 
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Pechar esta fiestra"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
-msgstr "Personali_zar Barras de Tarefas..."
+#: ui/evolution.xml.h:2
+#, fuzzy
+msgid "Add to _Shortcut Bar"
+msgstr "Barra de _Atallos"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Personalizar"
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the name of this folder"
+msgstr "Cambiar as propiedades deste cartafol"
 
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Personalizar barras de tarefas"
+#, fuzzy
+msgid "Copy this folder"
+msgstr "Copiar С cartafol"
 
 #: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "Creando un novo cartafol"
+
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "Eliminar este atallo da barra de atallos"
+
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Creando un novo cartafol"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "Borrar este elemento"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Visualizar un cartafol diferente"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_SaМr"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "_Fiestra do Evolution"
 
-#: ui/evolution.xml.h:10
-msgid "Evolution bar _shortcut"
-msgstr "_Atallo da barra do Evolution"
-
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "SaМr do programa"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "_IniciaciСn"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Importar un formato de ficheiro externo"
 
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "Barra de Ferramentas Principal"
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Open in New _Window"
+msgstr "Abrir nunha Nova Fiestra"
+
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Open this folder in an other window"
+msgstr "Abrir a mensaxe actual nunha nova fiestra"
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Amosar informaciСn sobre o Evolution"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "_Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "_Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "Enviar un informe de erro usando o Bug Buddy"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:30
+#, fuzzy
+msgid "Toggle"
+msgstr "Posto"
+
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Trocar a mosta da barra de cartafoles"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Trocar a mosta da barra de atallos"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "Toggle whether we are working offline."
+msgstr "Trocar mostra do selector de Deste"
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "Uso do Xestor de Co_ntactos"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "Uso da _Axenda"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "Uso do Cliente de _Correo"
 
-#: ui/evolution.xml.h:24
-msgid "Work Offline"
-msgstr "Traballar desconectado"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr "Ver o cartafol seleccionado"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "_Acerca do Evolution..."
 
-#: ui/evolution.xml.h:26
-msgid "_Actions"
-msgstr "_AcciСns"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "_Cita (AMаяAME)"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "_Contacto (AMаяAME)"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Copiar"
+
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "Barra de _Cartafoles"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Ir С Cartafol..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "_Importar ficheiro..."
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "м_ndice"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "_Mensaxe de correo"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "Mover"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Novo"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "_Novo Cartafol"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Abrir..."
+
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "Barra de _Atallos"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "Barra de _Atallos"
 
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "_Tarefa (AMаяAME)"
+
+#: ui/evolution.xml.h:64
+#, fuzzy
+msgid "_Work Offline"
+msgstr "Traballar desconectado"
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "_Preferencias de Correo..."
+
 #: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
+#, fuzzy
+msgid "Address Cards"
 msgstr "Tarxetas de Enderezo"
 
 #: views/addressbook/galview.xml.h:2
@@ -8744,9 +11778,12 @@ msgstr "Mensaxes"
 msgid "With Category"
 msgstr "Coa CategorМa"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "Tentativa"
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d de %B de %Y"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
@@ -8820,68 +11857,139 @@ msgstr "Hora do _final da reuniСn:"
 msgid "All Attendees"
 msgstr "Todas Atendidas"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d de %B de %Y"
-
-#: widgets/menus/gal-view-menus.c:177
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "_Vista Actual"
 
-#: widgets/menus/gal-view-menus.c:196
+#: widgets/menus/gal-view-menus.c:259
 msgid "Define Views"
 msgstr "Definir Vistas"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:422
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "LMMXVSD"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
-msgid "%B %Y"
-msgstr "%B de %Y"
-
-#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Agora"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Hoxe"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "Aceptar"
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "A data ten que ser introducida no formato: %s"
 
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "semana"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "Lixo"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "Fallo na transacciСn"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "Novas"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Erro descoЯecido: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "Outro"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Editor de contactos"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "Gardar BЗsqueda"
 
-#: widgets/misc/e-filter-bar.c:237
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "BЗsqueda Avanzada"
 
-#: widgets/misc/e-filter-bar.c:317 widgets/misc/e-filter-bar.h:97
-msgid "Advanced ..."
-msgstr "Avanzadas..."
-
-#: widgets/misc/e-filter-bar.h:94
-msgid "Save As ..."
-msgstr "Gardar Como..."
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "Ver Todos"
 
-#: widgets/misc/e-filter-bar.h:96
-msgid "Edit ..."
-msgstr "Editar..."
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "Avanzado..."
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
@@ -8891,6 +11999,10 @@ msgstr "InformaciСn"
 msgid "Warning"
 msgstr "Advertencia"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Erro"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Pregunta"
@@ -8904,7 +12016,7 @@ msgstr "Mensaxe"
 msgid "Don't show this message again."
 msgstr "Non amosar esta mensaxe outra vez"
 
-#: widgets/misc/e-search-bar.c:148
+#: widgets/misc/e-search-bar.c:155
 msgid "Sear_ch"
 msgstr "Bus_car"
 
@@ -8927,3 +12039,673 @@ msgstr "init_corba(): non foi posible inicializar GNOME"
 #: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): non foi posible inicializar Bonobo"
+
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "Preferencias alternativas"
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "Preferencias das Tarefas..."
+
+#~ msgid "???"
+#~ msgstr "???"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "C_ontactos..."
+
+#~ msgid "_Company:"
+#~ msgstr "_CompaЯМa:"
+
+#~ msgid "As _Minicards"
+#~ msgstr "Como _Minitarxetas"
+
+#~ msgid "As _Table"
+#~ msgstr "Como unha _TАboa"
+
+#~ msgid ""
+#~ "We were unable to open this addressbook.  This either\n"
+#~ "means you have entered an incorrect URI, or have tried\n"
+#~ "to access an LDAP server and don't have LDAP support\n"
+#~ "compiled in.  If you've entered a URI, check the URI for\n"
+#~ "correctness and reenter.  If not, you probably have\n"
+#~ "attempted to access an LDAP server.  If you wish to be\n"
+#~ "able to use LDAP, you'll need to download and install\n"
+#~ "OpenLDAP and recompile and install Evolution.\n"
+#~ msgstr ""
+#~ "Non fomos capaces de abrir este libro de enderezos. Isto\n"
+#~ "significa que ou introduciches unha URI incorrecta, ou\n"
+#~ "que se tentou acceder a un servidor LDAP e o programa\n"
+#~ "non estА compilado con soporte LDAP. Se introduciches\n"
+#~ "unha URI comproba que sexa correcta e volve introducila.\n"
+#~ "SenСn, probablemente tentaches acceder a un servidor\n"
+#~ "LDAP. Se desexas poder usar LDAP, necesitarАs baixar e\n"
+#~ "instalar OpenLDAP e recompilar e instalar Evolution.\n"
+
+#~ msgid "SASL"
+#~ msgstr "SASL"
+
+#~ msgid "Find..."
+#~ msgstr "Buscar..."
+
+#~ msgid "Open calendar"
+#~ msgstr "Abrir axenda"
+
+#~ msgid "Save calendar"
+#~ msgstr "Gardar axenda"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>Erro cargando a axenda:<br>MИtodo non soportado"
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "As alarmas saltan despois de"
+
+#~ msgid "Colors"
+#~ msgstr "Cores"
+
+#, fuzzy
+#~ msgid "Enable snoozing for"
+#~ msgstr "Activar adiando para"
+
+#~ msgid "Highlight"
+#~ msgstr "Resaltar"
+
+#, fuzzy
+#~ msgid "Items Due Today:"
+#~ msgstr "Cousas esperadas para hoxe:"
+
+#, fuzzy
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Cousas aМnda non esperadas"
+
+#, fuzzy
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Cousas aМnda non esperadas:"
+
+#, fuzzy
+#~ msgid "Overdue Items:"
+#~ msgstr "Retrasar Cousas:"
+
+#, fuzzy
+#~ msgid "TaskPad"
+#~ msgstr "Rota de Tarefas"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Tempo ata que se deba facer"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Alarmas Visuais"
+
+#~ msgid "Work week"
+#~ msgstr "Semana de traballo"
+
+#~ msgid "Edit Task"
+#~ msgstr "Editar Tarefa"
+
+#~ msgid "Percent complete"
+#~ msgstr "Porcentaxe colpleta"
+
+#~ msgid "Mark the task complete"
+#~ msgstr "Marcar a tarefa como completa"
+
+#~ msgid "Edit this task..."
+#~ msgstr "Editar esta tarefa..."
+
+#~ msgid "Edit the task"
+#~ msgstr "Editar Tarefa"
+
+#~ msgid "Go to Today"
+#~ msgstr "Ir a Hoxe"
+
+#~ msgid "Component successfully updated."
+#~ msgstr "CompoЯente actualizada con Иxito."
+
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "║Non foi posible cargar o ficheiro da axenda!\n"
+
+#~ msgid "I couldn't read your calendar file!\n"
+#~ msgstr "║Non foi posible ler o ficheiro da axenda!\n"
+
+#~ msgid "This is a reply from someone who was uninvited!"
+#~ msgstr "║Esta И unha resposta de alguИn que non foi convidado!"
+
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "║Non foi posible actualizar o almacenamento da axenda!"
+
+#~ msgid "I couldn't delete the calendar component!\n"
+#~ msgstr "║Non se puido borrar o compoЯente da axenda!\n"
+
+#~ msgid "Component successfully deleted."
+#~ msgstr "CompoЯente borrado con Иxito."
+
+#~ msgid "I don't recognize this type of calendar component."
+#~ msgstr "Non se recoЯece este tipo de compoЯente de axenda."
+
+#~ msgid "Add to Calendar"
+#~ msgstr "Engadir А Axenda"
+
+#~ msgid " Tentative "
+#~ msgstr " Tentativa "
+
+#~ msgid "Update Calendar"
+#~ msgstr "Actualizar Axenda"
+
+#, fuzzy
+#~ msgid "Attendee address"
+#~ msgstr "Enderezo ocupado"
+
+#, fuzzy
+#~ msgid "Attendees: "
+#~ msgstr "Ocupadas: "
+
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr ""
+#~ "Cancelar\n"
+#~ "ReuniСn"
+
+#~ msgid "Organizer: "
+#~ msgstr "Organizador:"
+
+#~ msgid ""
+#~ "Publish\n"
+#~ "Event"
+#~ msgstr ""
+#~ "Publicar\n"
+#~ "Evento"
+
+#~ msgid "Show a dialog"
+#~ msgstr "Amosar un diАlogo"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "BАsicos sobre Citas"
+
+#~ msgid "_Starting date:"
+#~ msgstr "Data de _comezo:"
+
+#~ msgid "Summary contains"
+#~ msgstr "O resume contИn"
+
+#~ msgid "Comment contains"
+#~ msgstr "O comentario contИn"
+
+#~ msgid "Has category"
+#~ msgstr "Ten a categorМa"
+
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "Non foi posible comprobar o ficheiro de bloqueo para %s: %s"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Explorando cartafol IMAP"
+
+#~ msgid "%s is not a selectable folder"
+#~ msgstr "O cartafol %s non И seleccionable"
+
+#, fuzzy
+#~ msgid "Inline attachment"
+#~ msgstr "Anexo Inline"
+
+#~ msgid "Send as:"
+#~ msgstr "Enviar como:"
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non foi posible abrir o ficheiro de sinatura %s:\n"
+#~ "%s"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "Non И un ficheiro normal."
+
+#~ msgid "That file exists but is not readable."
+#~ msgstr "O ficheiro existe pero non se pode ler."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "O ficheiro parecМa accesible pero a chamada a open(2) fallou."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "O ficheiro И moi longo (mАis de 100K).\n"
+#~ "©EstА seguro de querer inserilo?"
+
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr "%I:%M:%S %p%n"
+
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non foi posible abrir o ficheiro HTML:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "O ficheiro non ten lugar para os servicios."
+
+#~ msgid ""
+#~ "You can select a different HTML page for the background of the Executive "
+#~ "Summary.\n"
+#~ "\n"
+#~ "Just leave it blank for the default"
+#~ msgstr ""
+#~ "Pode seleccionar unha pАxina HTML diferente para o fondo do Resume "
+#~ "Executivo.\n"
+#~ "\n"
+#~ "DИixeo en branco para que apareza a asignada por defecto"
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "Abrir %s coa aplicaciСn por defecto de GNOME"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "Abrir %s co navegador web por defecto de GNOME"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "Enviar unha mensaxe de correo a %s"
+
+#~ msgid "Run %s"
+#~ msgstr "Executar %s"
+
+#~ msgid "Close %s"
+#~ msgstr "Pechar %s"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "Mover %s para a esquerda"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "Mover %s para a dereita"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Mover %s А fileira anterior"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "Mover %s А seguinte fileira"
+
+#~ msgid "Appearance"
+#~ msgstr "Aparencia"
+
+#~ msgid "Background:"
+#~ msgstr "Fondo:"
+
+#~ msgid ""
+#~ "Executive summary component could not initialize Bonobo.\n"
+#~ "If there was a warning message about the RootPOA, it probably means\n"
+#~ "you compiled Bonobo against GOAD instead of OAF."
+#~ msgstr ""
+#~ "O compoЯente Resume Executivo non puido inicializar Bonobo.\n"
+#~ "Se hai unha mensaxe de advertencia sobre RootPOA, probablemente\n"
+#~ "significa que compilou Bonobo contra GOAD no canto de OAF."
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "FАbrica para o resume RDF."
+
+#~ msgid "RDF Summary"
+#~ msgstr "Resume RDF"
+
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "FАbrica para o compoЯente bonobo de probas."
+
+#~ msgid "Factory for the test component."
+#~ msgstr "FАbrica para o compoЯente de probas."
+
+#~ msgid "Test bonobo service"
+#~ msgstr "Comprobar servicio bonobo"
+
+#~ msgid "Test service"
+#~ msgstr "Comprobar servicio"
+
+#~ msgid "Update automatically"
+#~ msgstr "Actualizar automaticamente"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Reenviar С Enderezo"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "Cambiar o cartafol \"%s\" С formato \"%s\""
+
+#~ msgid "Closing current folder"
+#~ msgstr "Pechando o cartafol actual"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Renomeando o cartafol antigo e abrindo"
+
+#~ msgid "Copying messages"
+#~ msgstr "Copiando as mensaxes"
+
+#~ msgid "Do you accept?"
+#~ msgstr "©Acepta?"
+
+#~ msgid "Evolution progress"
+#~ msgstr "Progreso de Evolution"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Recibindo a mensaxe nЗmero %d de %d (uid \"%s\")"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Gardando a mensaxe %d de %d (uid \"%s\")"
+
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "║Mensaxe incompleta escrita na canalizaciСn!"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (mensaxe reenviada)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Fwd: (sen asunto)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Mensaxe reenviada (sen asunto)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Mensaxe Re-enviada-----<br><b>De:</b> %s<br><b>Para:</b> \n"
+#~ "%s<br><b>Asunto:</b> %s <br>"
+
+#~ msgid "Print the selected message"
+#~ msgstr "Imprimir a mensaxe seleccionada"
+
+#~ msgid "Delete this message"
+#~ msgstr "Borrar esta mensaxe"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Ficheiros de Evolution instalados con Иxito."
+
+#~ msgid "Activate"
+#~ msgstr "Activar"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "Activar este atallo"
+
+#~ msgid "Find a contact"
+#~ msgstr "Buscar un contacto"
+
+#~ msgid "View All"
+#~ msgstr "Ver Todos"
+
+#~ msgid "View all contacts"
+#~ msgstr "Ver tСdolos contactos"
+
+#~ msgid "5 Days"
+#~ msgstr "5 DМas"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Crear unha nova axenda"
+
+#~ msgid "Day"
+#~ msgstr "DМa"
+
+#~ msgid "New _Event"
+#~ msgstr "Novo _Evento"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Abrir Axenda"
+
+#~ msgid "Prev"
+#~ msgstr "Ant"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Gardar axenda como outra cousa distinta"
+
+#~ msgid "Week"
+#~ msgstr "Semana"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Abrir axenda"
+
+#~ msgid "About this application"
+#~ msgstr "Acerca desta aplicaciСn"
+
+#~ msgid "About..."
+#~ msgstr "Acerca de..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "AcciС_ns"
+
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "_Libro de enderezos... (AMаяAME)"
+
+#~ msgid "C_lear"
+#~ msgstr "_Limpar"
+
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "Comproba_r Nomes (AMаяAME)"
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "Cop_iar ao Cartafol... (AMаяAME)"
+
+#~ msgid "Dump XML"
+#~ msgstr "Envorcar XML"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "Envorcar a descriciСn Xml da Interface"
+
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "P_rimeiro Obxecto no Cartafol (AMаяAME)"
+
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "Re-en_viar (AMаяAME)"
+
+#~ msgid "Go to the next item"
+#~ msgstr "Ir С elemento seguinte"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "Ir С elemento anterior"
+
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "Tarefa In_completa (AMаяAME)"
+
+#~ msgid "N_ext"
+#~ msgstr "Se_guinte"
+
+#~ msgid "Pre_vious"
+#~ msgstr "An_terior"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "_ConfiguraciСn da ImpresiСn..."
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "Programar algunha clase de reuniСn"
+
+#~ msgid "Select everything"
+#~ msgstr "Seleccionar todo"
+
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "_PeticiСn de Tarefa (AMаяAME)"
+
+#~ msgid "_About..."
+#~ msgstr "_Acerca de..."
+
+#~ msgid "_Item (FIXME)"
+#~ msgstr "_Obxecto (AMаяAME)"
+
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "_Entrada de diario (AMаяAME)"
+
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "_Derradeiro elemento no cartafol (AMаяAME)"
+
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "_Enviar Menxaxe (AMаяAME)"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "_Mover ao Cartafol ... (AMаяAME)"
+
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_Nota (AMаяAME)"
+
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "_Obxecto non Lido (AMаяAME)"
+
+#~ msgid "Add Service"
+#~ msgstr "Engadir Servicio"
+
+#~ msgid "Add a new service to the Executive Summary"
+#~ msgstr "Engadir un novo servicio ao Resume Executivo"
+
+#~ msgid "Create a new email"
+#~ msgstr "Crear unha nova mensaxe de correo"
+
+#~ msgid "Executive Summary Settings..."
+#~ msgstr "Preferencias do Resume Executivo..."
+
+#~ msgid "New Mail"
+#~ msgstr "Nova Mensaxe"
+
+#~ msgid "Apply any new filters to the mail in this box"
+#~ msgstr "Aplicar calquera filtro novo ao correo desta caixa"
+
+#~ msgid "Configure Folder..."
+#~ msgstr "_Configurar cartafol..."
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Copiar a mensaxe a un novo cartafol"
+
+#, fuzzy
+#~ msgid "Expunge"
+#~ msgstr "Limpar"
+
+#~ msgid "Finaly remove all mails tagged for deletion"
+#~ msgstr ""
+#~ "Eliminar definitivamente todas as mensaxes etiquetadas para borralas"
+
+#, fuzzy
+#~ msgid "Forward inline"
+#~ msgstr "Re-enviar inline"
+
+#, fuzzy
+#~ msgid "Forward this message in-line with your mail, so you can edit it"
+#~ msgstr "Reenviar esta mensaxe in-line coa tЗa, asМ podes editala"
+
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "Agochar Mensaxes Borradas"
+
+#~ msgid "Invert Selection"
+#~ msgstr "Inverter SelecciСn"
+
+#~ msgid "Mark As Read"
+#~ msgstr "Marcar como Lida"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Marcar como _non Lida"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Mover mensaxe a un novo cartafol"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "PrevisualizaciСn da ImpresiСn da mensaxe..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Imprimir mensaxe na impresora"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "Redireccionar (AMаяAME: implemИntame)"
+
+#~ msgid "Reply to all"
+#~ msgstr "Responder a Todos"
+
+#~ msgid "Reply to sender"
+#~ msgstr "Responder С autor"
+
+#~ msgid "S_ource"
+#~ msgstr "F_ontes"
+
+#~ msgid "Send a reply to the person who sent you this mail"
+#~ msgstr "Enviar unha resposta А persoa que che enviou esta"
+
+#~ msgid "Send a single mail in reply to all the selected mail"
+#~ msgstr "Enviar unha Зnica mensaxe en resposta a todo o correo seleccionado"
+
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr "Enviar o correo na cola e recibir o correo novo"
+
+#, fuzzy
+#~ msgid "View Raw Message Source"
+#~ msgstr "Ver a Mensaxe en Fontes CrЗas"
+
+#~ msgid "_Reply"
+#~ msgstr "_Responder"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "_Gardar Mensaxe Como..."
+
+#~ msgid "_Threaded"
+#~ msgstr "_Por fМos"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Gardar no _cartafol... (AMаяAME)"
+
+#~ msgid "Send the message now"
+#~ msgstr "Enviar a mensaxe agora"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_Inserir ficheiro de texto... (AMаяAME)"
+
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "Asig_nar Tarefa (AMаяAME)"
+
+#~ msgid "Meeting Re_quest (FIXME)"
+#~ msgstr "_Solicitude de ReuniСn (AMаяAME)"
+
+#~ msgid "Redo"
+#~ msgstr "Refacer"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Refacer a acciСn desfeita"
+
+#~ msgid "Replace"
+#~ msgstr "SubstituМr"
+
+#~ msgid "Replace a string"
+#~ msgstr "SubstituМr unha cadea"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "Responder a _Todos (AMаяAME)"
+
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "_Mandar Informe de Estado (AMаяAME)"
+
+#~ msgid "S_kip Occurrence (FIXME)"
+#~ msgstr "S_altarse a Ocurrencia (AMаяAME)"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "Buscar novamente a mesma cadea"
+
+#~ msgid "Search for a string"
+#~ msgstr "Buscar unha cadea"
+
+#~ msgid "Undo"
+#~ msgstr "Desfacer"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Desfacer a Зltima acciСn"
+
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "_Marcar como Completa (AMаяAME)"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "_Resposta (AMаяAME)"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "_Atallo da barra do Evolution"
+
+#~ msgid "Advanced ..."
+#~ msgstr "Avanzadas..."
+
+#~ msgid "Save As ..."
+#~ msgstr "Gardar Como..."
diff --git a/po/hu.po b/po/hu.po
index 859c8a650e..94e3df7baf 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.10.99\n"
-"POT-Creation-Date: 2001-07-30 12:44+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-07-30 13:02+0200\n"
 "Last-Translator: AndrАs TМmАr <timar@gnome.hu>\n"
 "Language-Team: Hungarian <hu@gnome.hu>\n"
@@ -321,9 +321,9 @@ msgstr "%s VKАrtyАja"
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1202
-#: calendar/conduits/todo/todo-conduit.c:1017
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "A Bonobo inicializАlАsa nem sikerЭlt"
@@ -337,14 +337,14 @@ msgid "EBook not loaded\n"
 msgstr "Az EBook nincs betЖltve\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:776
-#: calendar/conduits/todo/todo-conduit.c:591
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Nem sikerЭlt elindМtani a wombat kiszolgАlСt"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:777
-#: calendar/conduits/todo/todo-conduit.c:592
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Nem sikerЭlt a wombatot elindМtani"
 
@@ -450,7 +450,7 @@ msgstr "FIXME DN csatolАs sЗgСszЖvege"
 
 #. Remember the password?
 #: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:80 mail/mail-mt.c:436
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
 msgid "Remember this password"
 msgstr "JelszС megjegyzИse"
 
@@ -504,15 +504,15 @@ msgstr "FIXME зtvonal sЗgСszЖveg helye"
 msgid "Create path if it doesn't exist."
 msgstr "LИtrehozza az Зtvonalat, ha nem lИtezik"
 
-#: addressbook/gui/component/addressbook-config.c:662
+#: addressbook/gui/component/addressbook-config.c:663
 msgid "Edit Addressbook"
 msgstr "CМmjegyzИk szerkesztИse"
 
-#: addressbook/gui/component/addressbook-config.c:664
+#: addressbook/gui/component/addressbook-config.c:665
 msgid "Add Addressbook"
 msgstr "CМmjegyzИk hozzАadАsa"
 
-#: addressbook/gui/component/addressbook-config.c:682
+#: addressbook/gui/component/addressbook-config.c:683
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
@@ -520,22 +520,22 @@ msgstr ""
 "VАlaszd ki, milyen cМmjegyzИked van, Иs add meg a vele kapcsolatos "
 "informАciСkat."
 
-#: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:894
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr "NИv:"
 
-#: addressbook/gui/component/addressbook-config.c:689
+#: addressbook/gui/component/addressbook-config.c:692
 msgid "FIXME Name help text here"
 msgstr "FIXME NИv sЗgСЭzenetИnek a helye"
 
-#: addressbook/gui/component/addressbook-config.c:691
+#: addressbook/gui/component/addressbook-config.c:694
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2
 msgid "Description:"
 msgstr "LeМrАs:"
 
-#: addressbook/gui/component/addressbook-config.c:692
+#: addressbook/gui/component/addressbook-config.c:695
 msgid "FIXME Description help text here"
 msgstr "FIXME LeМrАs sЗgСЭzenetИnek a helye"
 
@@ -572,7 +572,7 @@ msgstr "HozzА_adАs"
 msgid "_Edit"
 msgstr "S_zerkesztИs"
 
-#: addressbook/gui/component/addressbook-storage.c:115
+#: addressbook/gui/component/addressbook-storage.c:118
 msgid "Other Contacts"
 msgstr "Egyц╘b cц╜mtц║rak"
 
@@ -635,15 +635,6 @@ msgstr "A kategСria tartalmazza"
 msgid "The URI that the Folder Browser will display"
 msgstr "Az URI amit a MappabЖngИszУ meg fog nyitni"
 
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * card.
-#.
-#: addressbook/gui/component/e-address-popup.c:178
-msgid "(none)"
-msgstr "(semmi)"
-
 #: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: addressbook/gui/contact-editor/e-contact-editor.c:1536
@@ -716,10 +707,10 @@ msgstr "Factory a cМmjegyzИk nИvkivАlasztС felЭletИhez"
 #: addressbook/gui/component/select-names/e-select-names.c:630
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
 #: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: my-evolution/e-summary-preferences.c:1181
-#: my-evolution/e-summary-preferences.c:1235
-#: my-evolution/e-summary-preferences.c:1296 shell/e-shortcuts-view.c:272
-#: shell/e-shortcuts-view.c:475
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
 msgid "Remove"
 msgstr "TЖrlИs"
 
@@ -844,10 +835,10 @@ msgstr "_NИvjegyek..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1450
+#: calendar/gui/dialogs/meeting-page.c:1447
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
-#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:79
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_TЖrlИs"
 
@@ -1327,7 +1318,7 @@ msgstr "LevИl kЭldИse ennek a szemИlynek"
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
 #: addressbook/gui/widgets/e-addressbook-view.c:604
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-mail-message.xml.h:55 ui/evolution-tasks.xml.h:9
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "NyomtatАs"
@@ -1342,7 +1333,7 @@ msgstr "BorМtИk nyomtatАsa"
 #: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
 #: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "TЖrlИs"
 
@@ -1724,18 +1715,18 @@ msgstr "SzИlessИg:"
 msgid "_Font..."
 msgstr "_BetШkИszlet..."
 
-#: calendar/conduits/calendar/calendar-conduit.c:733
-#: calendar/conduits/todo/todo-conduit.c:547
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "HibАs kommunikАciС a naptАr kiszolgАlСval"
 
-#: calendar/conduits/calendar/calendar-conduit.c:837
-#: calendar/conduits/calendar/calendar-conduit.c:840
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nem sikerЭlt a pilot Calendar application blokkjАt olvasni"
 
-#: calendar/conduits/todo/todo-conduit.c:652
-#: calendar/conduits/todo/todo-conduit.c:655
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nem sikerЭlt a pilot Calendar ToDo blokkjАt olvasni"
 
@@ -1882,7 +1873,35 @@ msgstr "A gnome-vfs inicializАlАsa nem sikerЭlt"
 msgid "Could not create the alarm notify service factory"
 msgstr "Nem sikerЭlt lИtrehozni az riasztС szolgАltatАs factoryjАt"
 
-#: calendar/gui/calendar-commands.c:497
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%Y %B %d, %A"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%b %d, %a"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%b %d, %a"
+
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%Y %B"
+
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -1890,22 +1909,27 @@ msgstr ""
 "telepМtИsedet."
 
 #: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
-#: calendar/gui/e-calendar-table.c:306
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "NyilvАnos"
 
 #: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
-#: calendar/gui/e-calendar-table.c:307
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "SzemИlyes"
 
 #: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Bizalmas"
 
 #: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
 #: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
 #: camel/providers/smtp/camel-smtp-transport.c:223
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
@@ -1927,56 +1951,58 @@ msgstr "K"
 msgid "W"
 msgstr "Ny"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1182
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
 #: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:625
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Magas"
 
-#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1184
-#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:624
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "NormАlis"
 
-#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1186
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:623
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Alacsony"
 
-#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1238
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "аttetszУ"
 
-#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1240
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "аtlАtszatlan"
 
-#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1292
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
 #: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:402
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Nem indult mИg el"
 
-#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1294
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
 #: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "Folyamatban"
 
-#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1296
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "KИsz"
 
-#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1298
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
 #: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:405 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "MegszakМtva"
@@ -2009,12 +2035,13 @@ msgstr ""
 "A besorolАs csak 'NyilvАnos', 'SzemИlyes', 'Bizalmas' vagy 'Semmi' lehet."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1236
-#: calendar/gui/calendar-model.c:1290
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
 #: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
 #: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:305 calendar/gui/e-calendar-table.c:380
-#: mail/mail-account-gui.c:1379 mail/mail-accounts.c:134
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
 #: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
 #: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
 #: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
@@ -2022,7 +2049,7 @@ msgstr ""
 msgid "None"
 msgstr "Semmi"
 
-#: calendar/gui/calendar-model.c:1086
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2032,38 +2059,42 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1126
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "A szАzalИkos ИrtИk 0 Иs 100 kЖzЖtt lehet."
 
-#: calendar/gui/calendar-model.c:1167
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "A prioritАs 'Magas', 'Alacsony' vagy 'Nem megadott' lehet."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1180
+#: calendar/gui/calendar-model.c:1181
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Nem megadott"
 
-#: calendar/gui/calendar-model.c:1221
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "Az АtlАtszСsАg csak 'аttetszУ', 'аtlАtszatlan' vagy 'Semmi' lehet."
 
-#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "IsmИtlУdУ"
 
-#: calendar/gui/calendar-model.c:1711
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Kiosztva"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Igen"
 
-#: calendar/gui/calendar-model.c:1717
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Nem"
 
@@ -2374,7 +2405,7 @@ msgid "Fri"
 msgstr "PИ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:983
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "PИntek"
 
@@ -2383,7 +2414,7 @@ msgid "Mon"
 msgstr "H"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:979
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "HИtfУ"
 
@@ -2404,7 +2435,7 @@ msgid "Sat"
 msgstr "Szo"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:984
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Szombat"
 
@@ -2425,7 +2456,7 @@ msgid "Sun"
 msgstr "V"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:985
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "VasАrnap"
 
@@ -2442,7 +2473,7 @@ msgid "Thu"
 msgstr "Cs"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:982
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "CsЭtЖrtЖk"
 
@@ -2467,7 +2498,7 @@ msgid "Tue"
 msgstr "K"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:980
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Kedd"
 
@@ -2476,7 +2507,7 @@ msgid "Wed"
 msgstr "Sze"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:981
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Szerda"
 
@@ -2550,27 +2581,27 @@ msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Nem vАltoztattАl, frissМted a szerkesztУt?"
 
 #: calendar/gui/dialogs/comp-editor-util.c:154
-#: calendar/gui/e-itip-control.c:619 calendar/gui/print.c:2116
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
 msgid " to "
 msgstr " - "
 
 #: calendar/gui/dialogs/comp-editor-util.c:158
-#: calendar/gui/e-itip-control.c:623 calendar/gui/print.c:2120
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
 msgid " (Completed "
 msgstr " (KИsz "
 
 #: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:625 calendar/gui/print.c:2122
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
 msgid "Completed "
 msgstr "KИsz "
 
 #: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:630 calendar/gui/print.c:2127
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
 msgid " (Due "
 msgstr " (EsedИkes "
 
 #: calendar/gui/dialogs/comp-editor-util.c:167
-#: calendar/gui/e-itip-control.c:632 calendar/gui/print.c:2129
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
 msgid "Due "
 msgstr "EsedИkes "
 
@@ -2612,7 +2643,7 @@ msgstr ""
 "FelЭlМrod?"
 
 #: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+#: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "MentИs mАskИnt..."
 
@@ -2744,15 +2775,134 @@ msgstr "_BefejezИs idУpontja:"
 msgid "_Start time:"
 msgstr "_KezdИs idУpontja:"
 
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "CsoportosМtАs %i"
+
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "ForrАs"
+
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr "LevezetУ"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr "SzЭksИges rИsztvevУk"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr "Esetleges rИsztvevУ"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr "Nem vesz rИszt"
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "VАlassz egy mШveletet"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr " Elfogad "
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr " Elvet "
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "KМsИrleti"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "TЖrЖlt"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "Folyamatban"
+
 #: calendar/gui/dialogs/meeting-page.c:712
 msgid "That person is already attending the meeting!"
 msgstr "Ez a szemИly mАr rajta van a rИsztvevУk listАjАn!"
 
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "AutСtelefon"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "SzЭksИges rИsztvevУk"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Esetleges rИsztvevУ"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Nem vesz rИszt"
+
 #: calendar/gui/dialogs/meeting-page.c:891
 msgid "Sent By:"
 msgstr "FeladС:"
 
-#: calendar/gui/dialogs/meeting-page.c:1445
+#: calendar/gui/dialogs/meeting-page.c:1442
 msgid "_Delegate To..."
 msgstr "_FeladatkiadАs..."
 
@@ -2789,7 +2939,7 @@ msgid "Role"
 msgstr "Szerep"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:50
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
 #: mail/message-list.etspec.h:8
 msgid "Status"
 msgstr "аllapot"
@@ -2818,34 +2968,34 @@ msgstr "_MАsok meghМvАsa"
 msgid "_Other Organizer"
 msgstr "_MАsik szervezУ"
 
-#: calendar/gui/dialogs/recurrence-page.c:439 calendar/gui/print.c:1839
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
 #: calendar/gui/print.c:1841 calendar/gui/print.c:1842
 msgid "%a %b %d %Y"
 msgstr "%Y %b %d, %a"
 
-#: calendar/gui/dialogs/recurrence-page.c:587
+#: calendar/gui/dialogs/recurrence-page.c:584
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Ez a talАlkozС olyan ismИtlУdИseket tartalmaz, amelyeket az EvolЗciС nem tud "
 "szerkeszteni."
 
-#: calendar/gui/dialogs/recurrence-page.c:952
+#: calendar/gui/dialogs/recurrence-page.c:938
 msgid "on"
 msgstr "ekkor:"
 
-#: calendar/gui/dialogs/recurrence-page.c:978 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
 msgid "day"
 msgstr "nap"
 
-#: calendar/gui/dialogs/recurrence-page.c:1108
+#: calendar/gui/dialogs/recurrence-page.c:1094
 msgid "on the"
 msgstr "ezen:"
 
-#: calendar/gui/dialogs/recurrence-page.c:1116
+#: calendar/gui/dialogs/recurrence-page.c:1102
 msgid "th"
 msgstr "."
 
-#: calendar/gui/dialogs/recurrence-page.c:1286
+#: calendar/gui/dialogs/recurrence-page.c:1274
 msgid "occurrences"
 msgstr "elУfordulАsok"
 
@@ -2938,7 +3088,7 @@ msgid "No one"
 msgstr "Senki"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:902
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
@@ -2971,102 +3121,106 @@ msgstr "_PrioritАs:"
 msgid "_Status:"
 msgstr "аll_apot:"
 
-#: calendar/gui/e-calendar-table.c:350
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:840
-msgid "Edit this task"
-msgstr "A feladat szerkesztИse"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "_MegnyitАs"
 
-#: calendar/gui/e-calendar-table.c:841 calendar/gui/e-calendar-table.c:851
-#: calendar/gui/e-day-view.c:3331 calendar/gui/e-week-view.c:3168
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
-msgid "Cut"
-msgstr "KivАgАs"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "K_ivАgАs"
 
-#: calendar/gui/e-calendar-table.c:842 calendar/gui/e-calendar-table.c:852
-#: calendar/gui/e-day-view.c:3333 calendar/gui/e-week-view.c:3170
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
-msgid "Copy"
-msgstr "MАsolАs"
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_MАsolАs"
 
-#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-table.c:853
-#: calendar/gui/e-day-view.c:3306 calendar/gui/e-day-view.c:3335
-#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3172
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
-msgid "Paste"
-msgstr "BeillesztИs"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "_BeillesztИs"
 
-#: calendar/gui/e-calendar-table.c:845
-msgid "Mark as complete"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
 msgstr "MegjelЖlИs kИszkИnt"
 
-#: calendar/gui/e-calendar-table.c:846
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "A feladat tЖrlИse"
 
-#: calendar/gui/e-calendar-table.c:855
-msgid "Mark tasks as complete"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
 msgstr "Feladatok megjelЖlИse kИszkИnt"
 
-#: calendar/gui/e-calendar-table.c:856 ui/evolution-tasks.xml.h:6
-msgid "Delete selected tasks"
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "KijelЖlt feladatok tЖrlИse"
 
-#: calendar/gui/e-calendar-table.c:1122
+#: calendar/gui/e-calendar-table.c:1137
 msgid "Click here to add a task"
 msgstr "Kattints ide Зj feladat hozzАadАsАhoz"
 
@@ -3140,13 +3294,6 @@ msgstr "%02i perces osztАs"
 msgid "%A %d %B"
 msgstr "%B %d, %A"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:289 calendar/gui/e-day-view.c:1344
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr "%b %d, %a"
-
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
 #: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
@@ -3166,121 +3313,124 @@ msgstr "de"
 msgid "pm"
 msgstr "du"
 
-#: calendar/gui/e-day-view.c:3311 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "зj talАlkozС"
 
-#: calendar/gui/e-day-view.c:3313 calendar/gui/e-week-view.c:3151
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "зj mindennapos esemИny"
 
 #: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-msgid "Go to Today"
-msgstr "UgorАs a mai napra"
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "UgrАs a _mai napra"
 
 #: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
-msgid "Go to Date..."
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "UgrАs dАtumra..."
 
-#: calendar/gui/e-day-view.c:3327 calendar/gui/e-week-view.c:3164
-#: shell/e-shortcuts-view.c:468 ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "MegnyitАs"
-
 #: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
-msgid "Delete this Appointment"
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "A talАlkozС tЖrlИse"
 
-#: calendar/gui/e-day-view.c:3344 calendar/gui/e-week-view.c:3186
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Az elУfordulАs mozgathatСvА tИtele"
 
-#: calendar/gui/e-day-view.c:3346 calendar/gui/e-week-view.c:3188
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "Az elУfordulАs tЖrlИse"
 
-#: calendar/gui/e-day-view.c:3348
-msgid "Delete all Occurrences"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "Az Жsszes elУfordulАs tЖrlИse"
 
-#: calendar/gui/e-itip-control.c:686
+#: calendar/gui/e-itip-control.c:694
 msgid "This is an event that can be added to your calendar."
 msgstr "Ez egy esemИny, amelyet hozzАadhatsz a naptАradhoz."
 
-#: calendar/gui/e-itip-control.c:689
+#: calendar/gui/e-itip-control.c:697
 msgid "This is a meeting request."
 msgstr "Ez egy Иrtekezlet-ЖsszehМvАsi kИrИs."
 
-#: calendar/gui/e-itip-control.c:692
+#: calendar/gui/e-itip-control.c:700
 msgid "This is one or more additions to a current meeting."
 msgstr "Ez egy vagy tЖbb kiegИszМtИs az aktuАlis Иrtekezlethez."
 
-#: calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:703
 msgid "This is a request for the latest event information."
 msgstr "Ez egy legutolsС esemИnyre vonatkozС informАciСkИrИs."
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:706
 msgid "This is a reply to a meeting request."
 msgstr "Ez egy vАlasz az Иrtekezlet-ЖsszehМvАsi kИrИsre."
 
-#: calendar/gui/e-itip-control.c:701
+#: calendar/gui/e-itip-control.c:709
 msgid "This is an event cancellation."
 msgstr "Ez egy esemИny lemondАsa."
 
-#: calendar/gui/e-itip-control.c:704 calendar/gui/e-itip-control.c:744
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 msgid "The message is not understandable."
 msgstr "Ez a levИl nem ИrthetУ."
 
-#: calendar/gui/e-itip-control.c:729
+#: calendar/gui/e-itip-control.c:737
 msgid "This is an task that can be added to your calendar."
 msgstr "Ez egy feladat, amely hozzАadhatС a naptАradhoz."
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:740
 msgid "This is a task request."
 msgstr "Ez egy felkИrИs egy feladatra."
 
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:743
 msgid "This is a request for the latest task information."
 msgstr "Ez a legutolsС feladatra vonatkozС informАciСkИrИs."
 
-#: calendar/gui/e-itip-control.c:738
+#: calendar/gui/e-itip-control.c:746
 msgid "This is a reply to a task request."
 msgstr "Ez egy vАlasz a feladatfelkИrИsre."
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:749
 msgid "This is an task cancellation."
 msgstr "Ez egy feladat lemondАsa."
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:771
 msgid "This is freebusy information."
 msgstr "Ez egy szabad/foglalt informАciС."
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:774
 msgid "This is a request for freebusy information."
 msgstr "Ez egy szabad/foglalt informАciС kИrИs."
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:777
 msgid "This is a reply to a freebusy request."
 msgstr "Ez egy vАlasz a szabad/foglalt kИrИsre."
 
-#: calendar/gui/e-itip-control.c:826
+#: calendar/gui/e-itip-control.c:834
 msgid "The message does not appear to be properly formed"
 msgstr "A levИl Зgy tШnik, nem megfelelУen formАzott"
 
-#: calendar/gui/e-itip-control.c:845
+#: calendar/gui/e-itip-control.c:853
 msgid "The message contains only unsupported requests."
 msgstr "A levИl kizАrСlag nem tАmogatott kИrИseket tartalmaz."
 
-#: calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:877
 msgid "The information contained in this attachment was not valid"
 msgstr "A csatolАsban levУ informАciС nem ИrvИnyes"
 
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:989
 msgid "I couldn't update your calendar file!\n"
 msgstr "Nem lehet frissмteni a naptАrfАjlodat!\n"
 
-#: calendar/gui/e-itip-control.c:1007
+#: calendar/gui/e-itip-control.c:1015
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Nem sikerЭlt eltАvolМtani az elemet a naptАrfАjlodbСl!\n"
 
@@ -3348,20 +3498,17 @@ msgstr "'%s' betЖltИsИhez szЭksИges eljАrАs nem tАmogatott"
 msgid "%d %B"
 msgstr "%B %d"
 
-#: calendar/gui/e-week-view.c:3149 calendar/gui/e-week-view.c:3177
-msgid "New Appointment..."
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
 msgstr "зj _talАlkozС..."
 
-#: calendar/gui/e-week-view.c:3190
-msgid "Delete All Occurrences"
-msgstr "Az Жsszes elУfordulАs tЖrlИse"
-
-#: calendar/gui/gnome-cal.c:969
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nem sikerЭlt megnyitni a mappАt '%s'-ben"
 
-#: calendar/gui/gnome-cal.c:980
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "'%s' megnyitАsАhoz szЭksИges eljАrАs nem tАmogatott"
@@ -3631,7 +3778,7 @@ msgstr "Elem nyomtatАsa"
 msgid "Print Setup"
 msgstr "NyomtatАsi beАllМtАsok"
 
-#: calendar/gui/tasks-control.c:122
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "A megjelenМtendУ feladatmappa URI-ja"
 
@@ -3670,8 +3817,8 @@ msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
 msgstr ""
-"'%s' betЖltИsИhez szЭksИges eljАrАs nem tАmogatott, egyetlen naptАrmappa-"
-"elemet sem lehet Аtmozgatni a feladatok mappАjАba."
+"'%s' betЖltИsИhez szЭksИges eljАrАs nem tАmogatott, egyetlen "
+"naptАrmappa-elemet sem lehet Аtmozgatni a feladatok mappАjАba."
 
 #: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
 msgid "SMTWTFS"
@@ -3740,7 +3887,6 @@ msgid "Unable to process spool folder"
 msgstr "Nem sikerЭlt feldolgozni a spool mappАt"
 
 #: camel/camel-filter-driver.c:667
-#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d. levИl letЖltИse (%d%%)"
 
@@ -5606,11 +5752,11 @@ msgstr "FАjl megnyitАs"
 msgid "Insert File"
 msgstr "FАjl beillesztИse"
 
-#: composer/e-msg-composer.c:1856 composer/e-msg-composer.c:2245
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "LevИl МrАsa"
 
-#: composer/e-msg-composer.c:2339
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "Nem sikerЭlt lИtrehozni a levИlМrС ablakot."
 
@@ -5898,9 +6044,9 @@ msgid "outgoing"
 msgstr "kimenУ"
 
 #: filter/filter.glade.h:1 mail/mail-config.glade.h:8
-#: my-evolution/e-summary-preferences.c:1174
-#: my-evolution/e-summary-preferences.c:1226
-#: my-evolution/e-summary-preferences.c:1288
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
 msgid "Add"
 msgstr "HozzАadАs"
 
@@ -6025,124 +6171,120 @@ msgid "Expression"
 msgstr "KifejezИs"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "A levИl tovАbbМtАsa cМmre"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "Fontos"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "="
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "nagyobb mint"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "kisebb mint"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "nem"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "LevelezУlista"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "LevИltЖrzs"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "LevИl fejlИce"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Az levИl megИrkezett"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "A levИl el lett kЭldve"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "MozgatАs mappАba"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr "akkor vagy utАn volt"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr "akkor vagy elУbb"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Olvasott"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "CМmzettek"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Regex illeszkedИs"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "VАlasz"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "PontszАm"
 
-#: filter/libfilter-i18n.h:43 mail/mail-callbacks.c:1091
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "FeladС"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "аllapot beАllМtАsa"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:44
 msgid "Size (kB)"
 msgstr "MИret (kB)"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "Зgy hangzik, mint"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:46
 msgid "Source Account"
 msgstr "ForrАspostafiСk"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr "Adott fejlИc"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:48
 msgid "starts with"
 msgstr "Мgy kezdУdik:"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "FeldolgozАs leАllМtАsa"
 
-#: filter/libfilter-i18n.h:52 mail/mail-format.c:866
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "TАrgy"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "utАn volt"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:53
 msgid "was before"
 msgstr "elУtte volt"
 
@@ -6332,32 +6474,28 @@ msgstr "SzШrУ a _cМmzettekre"
 msgid "Filter on _Mailing List"
 msgstr "SzШrУ a _levelezУlistАra"
 
-#: mail/folder-browser.c:1271
-msgid "_Open"
-msgstr "_MegnyitАs"
-
 #: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "зjrakЭldИs"
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:87
-#: ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "M_entИs mАskИnt..."
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:16
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "_NyomtatАs"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:86
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "_VАlasz a feladСnak"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:62
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
 msgid "Reply to _List"
 msgstr "VАlasz a _listАnak"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:61
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "VАlasz _mindenkinek"
 
@@ -6365,11 +6503,11 @@ msgstr "VАlasz _mindenkinek"
 msgid "_Forward"
 msgstr "TovАbbМtАs"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:39
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "_Elolvasva"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:41
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "_Olvasatlan"
 
@@ -6389,7 +6527,7 @@ msgstr "_MappАba mozgatАs..."
 msgid "_Copy to Folder..."
 msgstr "_MappАba mАsolАs..."
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:88
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "_VisszaАllМtАs"
 
@@ -6747,7 +6885,7 @@ msgstr ""
 msgid "Evolution Account Wizard"
 msgstr "EvolЗciС PostafiСk varАzslС"
 
-#: mail/mail-config.c:1589 mail/mail-config.c:1592
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 msgid "Connecting to server..."
 msgstr "KapcsolСdАs a kiszЖlgАlСhoz..."
 
@@ -6859,8 +6997,7 @@ msgstr "Piszkozatok"
 msgid "Drafts folder:"
 msgstr "Piszkozatok mappa"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "SzerkesztИs..."
 
@@ -7224,80 +7361,90 @@ msgstr "%d postАzandС"
 msgid "%d total"
 msgstr "Жsszesen %d"
 
-#: mail/mail-format.c:608
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s csatolАs"
 
-#: mail/mail-format.c:657
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nem sikerЭlt Иrtelmezni a MIME-Эzenetet. MegjelenМtИs forrАskИnt."
 
-#: mail/mail-format.c:739
+#: mail/mail-format.c:746
 msgid "Date"
 msgstr "DАtum"
 
-#: mail/mail-format.c:855 mail/message-list.etspec.h:3
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "EmailcМm:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "FeladС"
 
-#: mail/mail-format.c:858
+#: mail/mail-format.c:867
 msgid "Reply-To"
 msgstr "VАlaszcМm"
 
-#: mail/mail-format.c:861 mail/message-list.etspec.h:10
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "CМmzett"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:873
 msgid "Cc"
 msgstr "MАsolat"
 
-#: mail/mail-format.c:1283
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "Nincs beАllМtva GPG/PGP program."
 
-#: mail/mail-format.c:1298
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "A titkosмtott Эzenet nem jelenik meg"
 
-#: mail/mail-format.c:1304
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "TitkosМtott Эzenet"
 
-#: mail/mail-format.c:1305
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "A titkosМtАs visszafejtИsИhez kattints az ikonra."
 
-#: mail/mail-format.c:1361
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Az Эzenetet digitАlisan alАМrtАk, Иs az alАМrАs hiteles."
 
-#: mail/mail-format.c:1369
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Az Эzenetet digitАlisan alАМrtАk, de nem bizonyМthatС, hogy hiteles."
 
-#: mail/mail-format.c:2023
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "MutatС FTP-helyre (%s)"
 
-#: mail/mail-format.c:2035
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "MutatС helyi fАjlra (%s), amely \"%s\" helyen ИrvИnyes"
 
-#: mail/mail-format.c:2039
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "MutatС hely fАjlra (%s)"
 
-#: mail/mail-format.c:2073
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "MutatС FTP-helyre (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "MutatС ismeretlen kЭlsУ adatra (\"%s\" tМpus)"
 
-#: mail/mail-format.c:2078
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr "HibАs kЭlsУ tЖrzsrИsz."
 
@@ -7355,7 +7502,7 @@ msgstr ""
 "Hiba a mШvelet vИgrehajtАsa kЖzben:\n"
 "%s"
 
-#: mail/mail-mt.c:785
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "VАrj"
 
@@ -7553,36 +7700,29 @@ msgstr "KЭldИs"
 msgid "Cancelled."
 msgstr "MegszakМtva"
 
-#: mail/mail-session.c:170
+#: mail/mail-session.c:171
 msgid "User canceled operation."
 msgstr "A felhasznАlС megszakМtotta a mШveletet."
 
-#: mail/mail-tools.c:175
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Nem sikerЭlt lИtrehozni '%s' ideiglenes mbox-ot: %s"
 
-#: mail/mail-tools.c:228
-msgid "[Fwd: No Subject]"
-msgstr "[Fwd: tАrgy nИlkЭl]"
-
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "TovАbbМtott Эzenet - %s"
 
-#: mail/mail-tools.c:247
-msgid "Forwarded message (no subject)"
-msgstr "TovАbbМtott Эzenet (tАrgy nИlkЭl)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "TovАbbМtott levelek"
 
 #: mail/mail-tools.c:469
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
-"s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----TovАbbМtott Эzenet-----<br><b>FeladС:</b> %s<br><b>CМmzett:</b> %"
-"s<br><b>TАrgy:</b> %s<br>"
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "TovАbbМtott levelek"
 
 #: mail/mail-vfolder.c:270
 msgid "VFolders"
@@ -7732,31 +7872,32 @@ msgstr "%a %l:%M%p"
 msgid "Mail summary"
 msgstr "жsszegzИs a levelekrУl"
 
-#: my-evolution/e-summary-preferences.c:424
+#: my-evolution/e-summary-preferences.c:420
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com -- A nap mondАsa"
 
-#: my-evolution/e-summary-preferences.c:446
+#: my-evolution/e-summary-preferences.c:442
 msgid "Quotes of the Day"
 msgstr "A nap mondАsa"
 
-#: my-evolution/e-summary-preferences.c:882
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "зj hМrkiszolgАlС hozzАadАsa"
 
-#: my-evolution/e-summary-preferences.c:890
+#: my-evolution/e-summary-preferences.c:877
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Add meg a hozzАadandС hМrkiszolgАlС URL-jИt"
 
-#: my-evolution/e-summary-preferences.c:1425
+#: my-evolution/e-summary-preferences.c:1408
 msgid "My Evolution Settings"
 msgstr "SajАt EvolЗciС beАllМtАsai"
 
-#: my-evolution/e-summary-rdf.c:311
-msgid "There was an error downloading news feed</b></dt>"
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
 msgstr "Hiba tЖrtИnt a hМrforrАs letЖltИse kЖzben.</b></dt>"
 
-#: my-evolution/e-summary-rdf.c:393 my-evolution/e-summary-rdf.c:419
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Hiba az RDF letЖltИse kЖzben</b>"
 
@@ -7792,38 +7933,6 @@ msgstr "A SajАt EvolЗciС nyomtatАsa sikertelen"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "A VezetУi ЖsszefoglalС komponens nem tudta inicializАlni a BonobСt.\n"
 
-#: my-evolution/metar.c:29
-msgid "╟F"
-msgstr "╟F"
-
-#: my-evolution/metar.c:29
-msgid "╟C"
-msgstr "╟C"
-
-#: my-evolution/metar.c:33
-msgid "knots"
-msgstr "csomС"
-
-#: my-evolution/metar.c:33
-msgid "kph"
-msgstr "km/h"
-
-#: my-evolution/metar.c:38
-msgid "inHg"
-msgstr "Hgin"
-
-#: my-evolution/metar.c:38
-msgid "mmHg"
-msgstr "Hgmm"
-
-#: my-evolution/metar.c:41
-msgid "miles"
-msgstr "mИrfЖld"
-
-#: my-evolution/metar.c:41
-msgid "kilometers"
-msgstr "kilomИter"
-
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Tiszta Иg"
@@ -9071,14 +9180,10 @@ msgid "Weather settings"
 msgstr "IdУjАrАs beАllМtАsa"
 
 #: my-evolution/my-evolution.glade.h:27
-msgid "Wipe trackers"
-msgstr "NyomkЖvetУk tЖrlИse"
-
-#: my-evolution/my-evolution.glade.h:28
 msgid "imperial"
 msgstr "angolszАsz"
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:28
 msgid "metric"
 msgstr "metrikus"
 
@@ -9230,7 +9335,7 @@ msgstr "TИnyleg tЖrЖlni akarod ezt a mappАt: '%s'?"
 msgid "Rename folder '%s'"
 msgstr "%s mappa АtnevezИse"
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -9239,11 +9344,11 @@ msgstr ""
 "Nem sikerЭlt elkИszМteni a megadott mappАt:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "A megadott mappanИv nem jС."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "EvolЗciС - зj mappa kИszМtИse"
 
@@ -9485,91 +9590,95 @@ msgstr ""
 msgid "Don't remove"
 msgstr "Ne tАvolМtsa el"
 
-#: shell/e-shortcuts-view.c:297
+#: shell/e-shortcuts-view.c:300
 msgid "Rename Shortcut Group"
 msgstr "IndМtСikoni-csoport АtnevezИse"
 
-#: shell/e-shortcuts-view.c:298
+#: shell/e-shortcuts-view.c:301
 msgid "Rename selected shortcut group to:"
 msgstr "A kijelЖlt indМtСikon-csoport АtnevezИse erre:"
 
-#: shell/e-shortcuts-view.c:308
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "_Kis ikonok"
 
-#: shell/e-shortcuts-view.c:309
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Kis ikonok mutatАsa az elemeken"
 
-#: shell/e-shortcuts-view.c:311
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "_Nagy ikonok"
 
-#: shell/e-shortcuts-view.c:312
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Nagy ikonok mutatАsa az elemeken"
 
-#: shell/e-shortcuts-view.c:323
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "з_j csoport..."
 
-#: shell/e-shortcuts-view.c:324
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "зj indМtСcsoport lИtrehozАsa"
 
-#: shell/e-shortcuts-view.c:326
+#: shell/e-shortcuts-view.c:332
 msgid "_Remove this Group..."
 msgstr "_Csoport eltАvolМtАsa..."
 
-#: shell/e-shortcuts-view.c:327
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "IndМtСcsoport eltАvolМtАsa az indМtСsАvrСl"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:335
 msgid "Re_name this Group..."
 msgstr "C_soport АtnevezИse..."
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:336
 msgid "Rename this shortcut group"
 msgstr "IndМtСikon-csoport АtnevezИse"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "IndМtСsАv el_rejtИse"
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "IndМtСsАv elrejtИse"
 
-#: shell/e-shortcuts-view.c:455
+#: shell/e-shortcuts-view.c:461
 msgid "Rename shortcut"
 msgstr "IndМtСikon АtnevezИse"
 
-#: shell/e-shortcuts-view.c:456
+#: shell/e-shortcuts-view.c:462
 msgid "Rename selected shortcut to:"
 msgstr "IndМtСikon-csoport АtnevezИse erre:"
 
-#: shell/e-shortcuts-view.c:468
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "MegnyitАs"
+
+#: shell/e-shortcuts-view.c:474
 msgid "Open the folder linked to this shortcut"
 msgstr "Az indМtСikonhoz tartozС mappa megnyitАsa"
 
-#: shell/e-shortcuts-view.c:470 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "MegnyitАs Зj  ablakban"
 
-#: shell/e-shortcuts-view.c:470
+#: shell/e-shortcuts-view.c:476
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Az indМtСikonhoz tartozС mappa megnyitАsa Зj ablakban"
 
-#: shell/e-shortcuts-view.c:473
+#: shell/e-shortcuts-view.c:479
 msgid "Rename"
 msgstr "аtnevezИs"
 
-#: shell/e-shortcuts-view.c:473
+#: shell/e-shortcuts-view.c:479
 msgid "Rename this shortcut"
 msgstr "IndМtСikon-csoport АtnevezИse"
 
-#: shell/e-shortcuts-view.c:475
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Vedd le ezt az elemet az indМtСsАvrСl"
 
@@ -9639,7 +9748,6 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:173
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% kИsz)"
 
@@ -9709,7 +9817,7 @@ msgstr "Ne kИrdezze meg tЖbbet."
 msgid "Evolution has found the following data sources:"
 msgstr "Az EvolЗciС a kЖvetkezУ adatforrАsokat talАlta:"
 
-#: shell/main.c:92
+#: shell/main.c:96
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -9738,7 +9846,7 @@ msgstr ""
 "RemИljЭk, Иlvezni fogod a kemИny munkАnk eredmИnyИt, Иs vАrjuk\n"
 "hozzАjАrulАsod! \n"
 
-#: shell/main.c:113
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -9746,26 +9854,26 @@ msgstr ""
 "KЖszЖnettel\n"
 "Az EvolЗciС Csapat\n"
 
-#: shell/main.c:151
+#: shell/main.c:155
 msgid "Cannot access the Evolution shell."
 msgstr "Az EvolЗciС shell nem elИrhetУ."
 
-#: shell/main.c:211
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "IndМtСkИpernyУ letiltАsa"
 
-#: shell/main.c:212
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr "Minden ЖsszetevУ hibakeresУ Эzeneteit fАjlba irАnyМtja."
 
-#: shell/main.c:247
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nem sikerЭlt inicializАlni a Bonobo komponens rendszert."
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
-msgid "C_ut"
-msgstr "K_ivАgАs"
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "MАsolАs"
 
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
@@ -9779,6 +9887,10 @@ msgstr "зj nИvjegy kИszМtИse"
 msgid "Create new contact list"
 msgstr "зj cМmlista kИszМtИse"
 
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "KivАgАs"
+
 #: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
 msgid "Cut the selection"
 msgstr "KijelЖlИs kivАgАsa"
@@ -9795,6 +9907,10 @@ msgstr "зj nИvjegy"
 msgid "New list"
 msgstr "зj lista"
 
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "BeillesztИs"
+
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "VАgСlap beillesztИse"
@@ -9835,16 +9951,6 @@ msgstr "_NИvjegyek"
 msgid "_Contact Group"
 msgstr "_NИvjegycsoportok"
 
-#: ui/evolution-addressbook.xml.h:25 ui/evolution-calendar.xml.h:31
-#: ui/evolution-tasks.xml.h:13
-msgid "_Copy"
-msgstr "_MАsolАs"
-
-#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:34
-#: ui/evolution-tasks.xml.h:15
-msgid "_Paste"
-msgstr "_BeillesztИs"
-
 #: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
 #: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
@@ -9883,7 +9989,7 @@ msgstr "зj talАlkozС lИtrehozАsa"
 msgid "Create an event for the whole day"
 msgstr "EgИsz napos esemИny lИtrehozАsa"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "UgrАs"
 
@@ -9899,10 +10005,6 @@ msgstr "UgrАs az idУben elУre "
 msgid "Go to _Date"
 msgstr "_DАtumra ugrАs"
 
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
-msgstr "UgrАs a _mai napra"
-
 #: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "UgrАs adott dАtumra"
@@ -9911,6 +10013,10 @@ msgstr "UgrАs adott dАtumra"
 msgid "Go to present time"
 msgstr "UgrАs a jelenre"
 
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "зj talАlkozС"
+
 #: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "A nyomtatandС naptАr nyomtatАsi kИpe"
@@ -9996,7 +10102,7 @@ msgstr "FУ eszkЖztАr"
 msgid "Preview the printed item"
 msgstr "ElУnИzeti kИpet ad a nyomtatandС elemrУl"
 
-#: ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
 msgid "Print Pre_view"
 msgstr "NyomtatАsi _kИp"
 
@@ -10487,171 +10593,207 @@ msgstr "A kijelЖlt levИl tovАbbМtАsa valakinek"
 msgid "Forward the selected message to someone as an attachment"
 msgstr "A kijelЖlt levИl tovАbbМtАsa valakinek csatolАskИnt"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 msgid "Load _Images"
 msgstr "_KИpek betЖltИse"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 msgid "Mark as I_mportant"
 msgstr "_Fontos"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:43
 msgid "Mark as Unimp_ortant"
 msgstr "_Nem fontos"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "A kijelЖlt leveleket elolvasottnak jelЖli meg"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark the selected messages as important"
 msgstr "A kijelЖlt leveleket fontosnak jelЖli meg"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "A kijelЖlt leveleket olvasatlannak jelЖli meg"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected messages as unimportant"
 msgstr "A kijelЖlt leveleket nem fontosnak jelЖli meg"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages for deletion"
 msgstr "A kijelЖlt leveleket tЖrlИsre jelЖli ki"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "MozgatАs"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "A kijelЖlt levelek mozgatАsa egy mАsik mappАba"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Next"
 msgstr "KЖvetkezУ"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "KЖvetkezУ levИl"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "KЖvetkezУ levИl"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "_SzАl kijelЖlИse"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "KЖvetkezУ levИl"
+
+#: ui/evolution-mail-message.xml.h:56
 msgid "Open the selected message in a new window"
 msgstr "Az kijelЖlt levИl megnyitАsa Зj ablakban"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:57
 msgid "Open the selected message in the composer to re-send it"
 msgstr "A kijelЖlt levИl megnyitАsa a szerkesztУben ЗjrakЭldИs cИljАbСl"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:58
 msgid "Previews the message to be printed"
 msgstr "ElУnИzeti kИpet ad a nyomtatandС levИlrУl"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Previous"
 msgstr "ElУzУ"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "ElУzУ levИl"
+
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "ElУzУ levИl"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "ElУzУ levИl"
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Print Message..."
 msgstr "LevИl nyomtatАsa..."
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:65
 msgid "Print Preview..."
 msgstr "NyomtatАsi kИp..."
 
-#: ui/evolution-mail-message.xml.h:58
-msgid "Print message to the printer"
-msgstr "LevИl nyomtatАsa a nyomtatСn"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "LevИl nyomtatАsa"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply"
 msgstr "VАlasz"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:68
 msgid "Reply to All"
 msgstr "VАlasz mindenkinek"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:71
 msgid "S_earch Message"
 msgstr "_KeresИs a levИlben"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:72
 msgid "Save the message as a text file"
 msgstr "LevИl mentИse szЖvegfАjlkИnt"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:73
 msgid "Search for text in the body of the displayed message"
 msgstr "SzЖveg keresИse a megjelenМtett levИl tЖrzsИben"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "LevИl forrАsАnak mutatАsa"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:75
 msgid "Show Full _Headers"
 msgstr "Teljes _fejlИc mutatАsa"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:76
 msgid "Show message in the normal style"
 msgstr "LevИl megjelenМtИse a szokАsos stМlusban"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:77
 msgid "Show message with all email headers"
 msgstr "LevИl megjelenМtИse a teljes fejlИccel"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:78
 msgid "Show the raw email source of the message"
 msgstr "LevИl nyers forrАsАnak mutatАsa"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "A kijelЖlt levelek tЖrlИsИnek visszavonАsa"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:80
 msgid "VFolder on Mailing _List..."
 msgstr "VMappa a _levelezУlistАra..."
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:81
 msgid "VFolder on Se_nder..."
 msgstr "VMappa a _feladСra..."
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:82
 msgid "VFolder on _Recipients..."
 msgstr "VMappa a _cМmzettekre..."
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:83
 msgid "VFolder on _Subject..."
 msgstr "VMappa a _tАrgyra..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_SzШrУk alkalmazАsa"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Copy to Folder"
 msgstr "_MАsolАs mappАba"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "SzШrУ _gyАrtАsa levИlbУl"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:88
 msgid "_Forward Message"
 msgstr "LevИl _tovАbbМtАsa"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:89
 msgid "_Message Display"
 msgstr "LevИl _megjelenМtИse"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Move to Folder"
 msgstr "M_ozgatАs mappАba"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Normal Display"
 msgstr "_SzokАsos megjelenМtИs"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Open Message"
 msgstr "LevИl _megnyitАsa"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Re-send Message"
 msgstr "LevИl З_jrakЭldИse"
 
@@ -10920,45 +11062,47 @@ msgid "Re_fresh Task"
 msgstr "_Feladatok frissМtИse"
 
 #: ui/evolution-tasks.xml.h:2
+#, fuzzy
+msgid "Configure the task view's settings"
+msgstr "A naptАr beАllМtАsai"
+
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "KijelЖlt feladat mАsolАsa"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "зj feladat lИtrehozАsa"
 
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "KijelЖlt feladat kivАgАsa"
 
 #: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
+msgstr "KijelЖlt feladatok tЖrlИse"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "зj feladat"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Paste task from the clipboard"
 msgstr "Feladat beillesztИse a vАgСlaprСl"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Feladat mentИse mАskИnt"
 
-#: ui/evolution-tasks.xml.h:11
-msgid "Set task view preferences"
-msgstr "FeladatnИzet beАllМtАsai"
-
-#: ui/evolution-tasks.xml.h:12
-msgid "TasksPreferences"
-msgstr "Feladatok beАllМtАsai"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "_Feladatok beАllМtАsai"
 
-#: ui/evolution-tasks.xml.h:18
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_Feladat"
 
-#: ui/evolution-tasks.xml.h:19
-msgid "_Tasks Settings..."
-msgstr "_Feladatok beАllМtАsai"
-
 #: ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "EvolЗciС nИvjegye..."
@@ -11194,10 +11338,6 @@ msgstr "KategСriАkkal"
 msgid "%A, %B %d, %Y"
 msgstr "%Y %B %d, %A"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "KМsИrleti"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Foglalt"
@@ -11284,11 +11424,6 @@ msgstr "NИzet megadАsa"
 msgid "MTWTFSS"
 msgstr "HKSCPSV"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1068
-msgid "%B %Y"
-msgstr "%Y %B"
-
 #: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Most"
@@ -11395,11 +11530,11 @@ msgstr "KeresИs mentИse"
 msgid "Advanced Search"
 msgstr "HaladС keresИs"
 
-#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Mutasd mind"
 
-#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "HaladС..."
 
@@ -11452,6 +11587,70 @@ msgstr "init_corba(): nem sikerЭlt a GNOME inicializАlАsa"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): a Bonobo inicializАlАsa nem sikerЭlt"
 
+#~ msgid "Set task view preferences"
+#~ msgstr "FeladatnИzet beАllМtАsai"
+
+#~ msgid "TasksPreferences"
+#~ msgstr "Feladatok beАllМtАsai"
+
+#~ msgid "(none)"
+#~ msgstr "(semmi)"
+
+#~ msgid "Edit this task"
+#~ msgstr "A feladat szerkesztИse"
+
+#~ msgid "Go to Today"
+#~ msgstr "UgorАs a mai napra"
+
+#~ msgid "Delete all Occurrences"
+#~ msgstr "Az Жsszes elУfordulАs tЖrlИse"
+
+#~ msgid "Forward to Address"
+#~ msgstr "A levИl tovАbbМtАsa cМmre"
+
+#~ msgid "[Fwd: No Subject]"
+#~ msgstr "[Fwd: tАrgy nИlkЭl]"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "TovАbbМtott Эzenet (tАrgy nИlkЭl)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----TovАbbМtott Эzenet-----<br><b>FeladС:</b> %s<br><b>CМmzett:</b> "
+#~ "%s<br><b>TАrgy:</b> %s<br>"
+
+#~ msgid "╟F"
+#~ msgstr "╟F"
+
+#~ msgid "╟C"
+#~ msgstr "╟C"
+
+#~ msgid "knots"
+#~ msgstr "csomС"
+
+#~ msgid "kph"
+#~ msgstr "km/h"
+
+#~ msgid "inHg"
+#~ msgstr "Hgin"
+
+#~ msgid "mmHg"
+#~ msgstr "Hgmm"
+
+#~ msgid "miles"
+#~ msgstr "mИrfЖld"
+
+#~ msgid "kilometers"
+#~ msgstr "kilomИter"
+
+#~ msgid "Wipe trackers"
+#~ msgstr "NyomkЖvetУk tЖrlИse"
+
+#~ msgid "Print message to the printer"
+#~ msgstr "LevИl nyomtatАsa a nyomtatСn"
+
 #~ msgid "File not found"
 #~ msgstr "Nem talАlom a fАjlt"
 
@@ -11578,8 +11777,7 @@ msgstr "init_bonobo(): a Bonobo inicializАlАsa nem sikerЭlt"
 #~ msgid ""
 #~ "Notification about your journal entry starting on %s and ending on %s"
 #~ msgstr ""
-#~ "FigyelmeztetИs a naplСbejegyzИsre, amely %s-kor kezdУdik Иs %s-kor "
-#~ "vИgzУdik"
+#~ "FigyelmeztetИs a naplСbejegyzИsre, amely %s-kor kezdУdik Иs %s-kor vИgzУdik"
 
 #~ msgid "Notification about your journal entry starting on %s"
 #~ msgstr "FigyelmeztetИs a naplСbejegyzИsre, amely %s-kor kezdУdik"
@@ -11784,12 +11982,6 @@ msgstr "init_bonobo(): a Bonobo inicializАlАsa nem sikerЭlt"
 #~ msgid "Delete this message"
 #~ msgstr "A levИl tЖrlИse"
 
-#~ msgid "Previous message"
-#~ msgstr "ElУzУ levИl"
-
-#~ msgid "Next message"
-#~ msgstr "KЖvetkezУ levИl"
-
 #~ msgid "Activate"
 #~ msgstr "AktivАlАs"
 
@@ -11838,12 +12030,6 @@ msgstr "init_bonobo(): a Bonobo inicializАlАsa nem sikerЭlt"
 #~ msgid "Add to Calendar"
 #~ msgstr "HozzАadАs a naptАrhoz"
 
-#~ msgid " Accept "
-#~ msgstr " Elfogad "
-
-#~ msgid " Decline "
-#~ msgstr " Elvet "
-
 #~ msgid " Tentative "
 #~ msgstr " KМsИrleti "
 
@@ -11863,15 +12049,6 @@ msgstr "init_bonobo(): a Bonobo inicializАlАsa nem sikerЭlt"
 #~ "иrtekezlet\n"
 #~ "lemondАsa"
 
-#~ msgid "Chair"
-#~ msgstr "LevezetУ"
-
-#~ msgid "Non-Participant"
-#~ msgstr "Nem vesz rИszt"
-
-#~ msgid "Optional Participant"
-#~ msgstr "Esetleges rИsztvevУ"
-
 #~ msgid "Organizer: "
 #~ msgstr "SzervezУ: "
 
@@ -11882,9 +12059,6 @@ msgstr "init_bonobo(): a Bonobo inicializАlАsa nem sikerЭlt"
 #~ "EsemИny\n"
 #~ "kЖzzИtИtele"
 
-#~ msgid "Required Participant"
-#~ msgstr "SzЭksИges rИsztvevУk"
-
 #~ msgid "Could not test lock file for %s: %s"
 #~ msgstr "Nem sikerЭlt tesztelni %s zАrolСfАjljАt: %s"
 
@@ -12799,9 +12973,6 @@ msgstr "init_bonobo(): a Bonobo inicializАlАsa nem sikerЭlt"
 #~ msgid "FIXME: Next"
 #~ msgstr "FIXME: _FeljegyzИs"
 
-#~ msgid "Group %i"
-#~ msgstr "CsoportosМtАs %i"
-
 #~ msgid "C_lassification:"
 #~ msgstr "B_esorolАs"
 
diff --git a/po/it.po b/po/it.po
index dcf5a9a93f..030eef6819 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 0.8\n"
-"POT-Creation-Date: 2001-04-20 02:43+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-03-23 10:23-01:00\n"
 "Last-Translator: Clara Tattoni <clara.tattoni@libero.it>\n"
 "Language-Team: Italiano <it@li.org>\n"
@@ -13,11 +13,21 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import VCard files into Evolution."
+msgstr "Fabbrica per importare i file GnomeCard in Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports VCard files into Evolution."
+msgstr "Importa i file GnomeCard in Evolution."
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Tessera:"
 
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +35,7 @@ msgstr ""
 "\n"
 "Nome:"
 
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,7 +43,7 @@ msgstr ""
 "\n"
 " Prefisso:"
 
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -41,7 +51,7 @@ msgstr ""
 "\n"
 " Dato:"
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -49,7 +59,7 @@ msgstr ""
 "\n"
 " Addizionale:"
 
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -57,7 +67,7 @@ msgstr ""
 "\n"
 " Famigila:"
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -65,7 +75,7 @@ msgstr ""
 "\n"
 " Suffisso:"
 
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -73,7 +83,7 @@ msgstr ""
 "\n"
 "Data di nascita:"
 
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -81,7 +91,7 @@ msgstr ""
 "\n"
 "Indirizzo:"
 
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -89,13 +99,13 @@ msgstr ""
 "\n"
 " Casella Postale: "
 
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -103,7 +113,7 @@ msgstr ""
 "\n"
 " Via:   "
 
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -111,7 +121,7 @@ msgstr ""
 "\n"
 " CittЮ:     "
 
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -119,7 +129,7 @@ msgstr ""
 "\n"
 " Regione:       "
 
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -127,7 +137,7 @@ msgstr ""
 "\n"
 " Codice di avviamento postale:  "
 
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -135,7 +145,7 @@ msgstr ""
 "\n"
 " Stato:    "
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
@@ -143,7 +153,7 @@ msgstr ""
 "\n"
 "Etichetta di spedizione: "
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -151,7 +161,7 @@ msgstr ""
 "\n"
 " Telefoni:\n"
 
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -159,7 +169,7 @@ msgstr ""
 "\n"
 "Telefono:"
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -167,7 +177,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -175,7 +185,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -183,7 +193,7 @@ msgstr ""
 "\n"
 "Programma di posta: "
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -191,7 +201,7 @@ msgstr ""
 "\n"
 "Fuso orario: "
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -199,7 +209,7 @@ msgstr ""
 "\n"
 "Posizione Geografica: "
 
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -207,7 +217,7 @@ msgstr ""
 "\n"
 "Occupazione:"
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -215,7 +225,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -223,7 +233,7 @@ msgstr ""
 "\n"
 " Nome:"
 
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -231,7 +241,7 @@ msgstr ""
 "\n"
 " UnitЮ:"
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -239,7 +249,7 @@ msgstr ""
 "\n"
 " UnitЮ2:"
 
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -247,7 +257,7 @@ msgstr ""
 "\n"
 " UnitЮ3:"
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -255,7 +265,7 @@ msgstr ""
 "\n"
 " UnitЮ4:"
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -263,7 +273,7 @@ msgstr ""
 "\n"
 "Categorie:"
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -281,7 +291,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -289,7 +299,7 @@ msgstr ""
 "\n"
 "Stringa Unica: "
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -297,23 +307,25 @@ msgstr ""
 "\n"
 "Chiave Pubblica: "
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr "Fabbrica per importare i file GnomeCard in Evolution."
+#: addressbook/backend/ebook/e-card.c:4037
+#, fuzzy
+msgid "Multiple VCards"
+msgstr "Messaggi Multipli"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "Importa i file GnomeCard in Evolution."
+#: addressbook/backend/ebook/e-card.c:4045
+#, fuzzy, c-format
+msgid "VCard for %s"
+msgstr "Inserire la password per %s"
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:43
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:99 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Impossibile inizializzare Bonobo"
 
@@ -326,14 +338,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook non caricato\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Impossibile avviare il server wombat"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Impossibile avviare wombat"
 
@@ -342,725 +354,846 @@ msgstr "Impossibile avviare wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Impossibile leggere il blocco Indirizzi del Pilot"
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#, fuzzy
+msgid "A Bonobo control for an address popup."
+msgstr "Un controllo di Bonobo che visualizza un indirizzo."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "Un controllo di Bonobo che visualizza un indirizzo."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "Un semplice controllo di Bonobo che visualizza una rubrica."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Controllo che visualizza una minicard per la rubrica di Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Visore di minicard per la rubrica di Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "Componente di Evolution per gestire i contatti."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Fabbrica per il controllo delle Minicard per la rubrica"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Fabbrica per il visualizzatore di indirizzi della Rubrica"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#, fuzzy
+msgid "Factory for the Addressbook's address popup"
+msgstr "Fabbrica per il visualizzatore di indirizzi della Rubrica"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr "Fabbrica per il componente della rubrica di Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr "Fabbrica per il controllo degli esempi della Rubrica"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "LDAP Server"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "File"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Tipo di rubrica sconosciuto"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "Nessuno (modo anonimo)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Password"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Tipo di auth sconosciuto"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "Base"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "Uno"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr "Tipo di ambito sconosciuto"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr "Bind DN:"
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Ricorda questa password"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "Host:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "Root DN:"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Porta:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "Ambito della Ricerca:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Autenticazione:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Percorso:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "Crea il path se non esiste"
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "Modifica Rubrica"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "Aggiungi rubrica"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"Selezionare il vostr tipo di rubrica, e inserirne le informazioni rilevanti."
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Nome:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Descrizione:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr ""
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "Aggiungi"
+msgid "Addressbook Sources"
+msgstr "Sorgenti della Rubrica"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Elimina"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Nome"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "_Aggiungi"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "_Modifica"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "Altri Contatti"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "Inserire la password per %s"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Impossibile aprire la rubruca"
+
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
+msgstr "Qualunque campo contiene"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "Il nome contiene"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "Email contiene"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "Il nome contiene"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "La URI visualizzata dal Browser delle cartelle"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "Email principale"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "Email 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "Email 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "Scegliere un file"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Crea un nuovo contatto"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "Modifica Rubrica"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "Modifica Informazioni del Contatto"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "Aggiungi ai Contatti"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "Indirizzo Email:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "Disabilita Query"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Abilita Query (Pericoloso!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Interfaccia per la selezione dei nomi della rubrica di Evolution."
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr "Fabbrica per l'interfaccia di selezione dei nomi della Rubrica"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Rimuovere"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "Rimuovere Tutti"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "Invio Email"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Altri Contatti"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "Destinatari del messaggio:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "Seleziona Nomi"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "Seleziona un nome da:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "Categoria:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Cerca"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "Anni_versario:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "_Ufficio"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "_Fax Ufficio"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "C_ontatti..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ca_tegorie..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Editor dei Contatti"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Dettagli"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Memorizza Come:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Generale"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Nuovo tipo di telefono"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "No_te:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Organizzazione:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Tipi di Telefono"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
-msgstr "Email principale"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "Vuole ricevere messaggi in _HTML"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Indirizzo pagina web:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
-msgstr "_Aggiungi"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "_Indirizzo..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "Nome dell'_Assistente:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "Co_mpleanno:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Ufficio"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Compagnia:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "_Contatti..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:93 ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Elimina"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "_Dipartimento:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "_Nome e Cognome..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_Casa"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "_Titolo:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "Nome del _Manager:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "C_ellulare"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "_Nickname:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "_Ufficio:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_Professione:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "_Coniuge:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "Indirizzo a cui _spedire"
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "Cancellare il Contatto?"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "Questo contatto appartiene a queste categorie:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Assistente"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Ufficio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Ufficio2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Fax Ufficio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Richiamare"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Ditta"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Casa 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Fax Casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Altro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Altro fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Impaginatore"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Principale"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
-msgid "Email 2"
-msgstr "Email 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
-msgid "Email 3"
-msgstr "Email 3"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:223
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Aggiunta veloce di un Contatto"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:225
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "Modifica Interamente"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:262
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Nome e cognome"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:268
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Indirizzo _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Canada"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Controlla Indirizzo"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "_Stato:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Finlandia"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "USA"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Indirizzo:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_CittЮ:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "_Casella Postale:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "_Stato/Provincia:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "_ZIP/CAP:"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Verifiare Nome e Cognome"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dott."
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Egr."
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "Sig.na"
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Sig."
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Sig.ra"
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Sig.ra"
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Nome:"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_Cognome:"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Secondo nome:"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "S_uffisso:"
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Titolo:"
 
-#: addressbook/gui/component/addressbook.c:241
-msgid "As _Minicards"
-msgstr "Come _Minicards"
-
-#: addressbook/gui/component/addressbook.c:247
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Come _Tabella"
-
-#: addressbook/gui/component/addressbook.c:399
-#, c-format
-msgid "Enter password for %s"
-msgstr "Inserire la password per %s"
-
-#: addressbook/gui/component/addressbook.c:427
-msgid "Unable to open addressbook"
-msgstr "Impossibile aprire la rubruca"
-
-#: addressbook/gui/component/addressbook.c:432
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Impossibile aprire questa rubruca.  Questo significa che \n"
-"Х stata inserita una URI non corretta, oppure che si Х\n"
-"cercato di accedere a un server LDAP senza avere il supporto \n"
-"LDAP compilato.  Se si Х inserita una URI, controllarne \n"
-"la correttezza ed inserirla nuovamente.  Altrimenti, Х \n"
-"probabile che si sia cercato di accedere ad un server LDAP. \n"
-"Se si desidera usare LDAP, Х necessario scaricare e \n"
-"installare OpenLDAP, ricompilare e reinstallare Evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:555
-msgid "Show All"
-msgstr "Mostra Tutto"
-
-#: addressbook/gui/component/addressbook.c:557
-msgid "Advanced..."
-msgstr "Avanzato..."
-
-#: addressbook/gui/component/addressbook.c:587 calendar/gui/gnome-cal.c:236
-msgid "Any field contains"
-msgstr "Qualunque campo contiene"
-
-#: addressbook/gui/component/addressbook.c:588
-msgid "Name contains"
-msgstr "Il nome contiene"
-
-#: addressbook/gui/component/addressbook.c:589
-msgid "Email contains"
-msgstr "Email contiene"
-
-#: addressbook/gui/component/addressbook.c:732
-msgid "The URI that the Folder Browser will display"
-msgstr "La URI visualizzata dal Browser delle cartelle"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
-msgstr "Altri Contatti"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "LDAP Server"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "File"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Tipo di rubrica sconosciuto"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "Nessuno (modo anonimo)"
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
-msgid "Password"
-msgstr "Password"
-
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:170
-msgid "Unknown auth type"
-msgstr "Tipo di auth sconosciuto"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "Base"
-msgstr "Base"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "One"
-msgstr "Uno"
-
-#: addressbook/gui/component/addressbook-config.c:183
-msgid "Subtree"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Unknown scope type"
-msgstr "Tipo di ambito sconosciuto"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "Nome del file:"
 
-#: addressbook/gui/component/addressbook-config.c:353
-msgid "Bind DN:"
-msgstr "Bind DN:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "Dicembre"
 
-#: addressbook/gui/component/addressbook-config.c:354
-msgid "FIXME Bind DN Help text here"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
-msgstr "Ricorda questa password"
-
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
-msgid "Host:"
-msgstr "Host:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Host help text here."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Port:"
-msgstr "Porta:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
+msgstr "Rimuovere"
 
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "Editor dei Contatti"
 
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
-msgstr "Root DN:"
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "Editor dei Contatti"
 
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:435
-msgid "Search Scope:"
-msgstr "Ambito della Ricerca:"
-
-#: addressbook/gui/component/addressbook-config.c:489
-msgid "Authentication:"
-msgstr "Autenticazione:"
-
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
-msgid "Path:"
-msgstr "Percorso:"
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "FIXME Path Help text here"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:513
-msgid "Create path if it doesn't exist."
-msgstr "Crea il path se non esiste"
-
-#: addressbook/gui/component/addressbook-config.c:647
-msgid "Edit Addressbook"
-msgstr "Modifica Rubrica"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#, fuzzy
+msgid "New Contact:"
+msgstr "Nuovo contatto"
 
-#: addressbook/gui/component/addressbook-config.c:649
-msgid "Add Addressbook"
-msgstr "Aggiungi rubrica"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#, fuzzy
+msgid "Original Contact:"
+msgstr "Altri Contatti"
 
-#: addressbook/gui/component/addressbook-config.c:665
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
 msgstr ""
-"Selezionare il vostr tipo di rubrica, e inserirne le informazioni rilevanti."
 
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
-msgid "Name:"
-msgstr "Nome:"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+msgid "Changed Contact:"
+msgstr "Altri Contatti"
 
-#: addressbook/gui/component/addressbook-config.c:672
-msgid "FIXME Name help text here"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:674
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Descrizione:"
-
-#: addressbook/gui/component/addressbook-config.c:675
-msgid "FIXME Description help text here"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Sorgenti della Rubrica"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/folder-browser.c:597
-#: mail/mail-config.glade.h:19 mail/mail-view.c:156
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Elimina"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "Modifica"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Nome"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "Disabilita Query"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "Abilita Query (Pericoloso!)"
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
-msgstr "Modifica Informazioni del Contatto"
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
-msgid "Add to Contacts"
-msgstr "Aggiungi ai Contatti"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-#, fuzzy
-msgid "A Bonobo control for an address popup."
-msgstr "Un controllo di Bonobo che visualizza un indirizzo."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Un controllo di Bonobo che visualizza un indirizzo."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Un semplice controllo di Bonobo che visualizza una rubrica."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Controllo che visualizza una minicard per la rubrica di Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Visore di minicard per la rubrica di Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "Componente di Evolution per gestire i contatti."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Fabbrica per il controllo delle Minicard per la rubrica"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Fabbrica per il visualizzatore di indirizzi della Rubrica"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-#, fuzzy
-msgid "Factory for the Addressbook's address popup"
-msgstr "Fabbrica per il visualizzatore di indirizzi della Rubrica"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "Fabbrica per il componente della rubrica di Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
-msgstr "Fabbrica per il controllo degli esempi della Rubrica"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Interfaccia per la selezione dei nomi della rubrica di Evolution."
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Fabbrica per l'interfaccia di selezione dei nomi della Rubrica"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
-#: filter/filter-rule.c:550 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
-msgstr "Rimuovere"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
-msgid "Remove All"
-msgstr "Rimuovere Tutti"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Trova..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Destinatari del messaggio:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Seleziona Nomi"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Seleziona un nome da:"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
+msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Cerca"
 
@@ -1172,175 +1305,272 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "Salva come VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 #, fuzzy
 msgid "Send contact to other"
 msgstr "_Invia contatto a altri..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 #, fuzzy
 msgid "Send message to contact"
 msgstr "Invia un _messaggio al contatto..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/folder-browser.c:572
-#: mail/mail-view.c:154 ui/evolution-addressbook.xml.h:9
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:51
-#: ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Stampa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Stampa _Busta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Elimina"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "Errore nel caricare: %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "Sorgenti"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Errore sconosciuto"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "Non collegato"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "Permesso negato"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "File non trovato"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Operazione non supportata"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "Annullato"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "Errore I/O"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "Errore nel caricare: %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Errore nel caricare: %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Errore nel caricare: %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "Errore nel caricare: %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr ""
+"Errore nella lettura dei dati: \n"
+"%s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* Cliccare qui per aggiungere un contatto *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 #, fuzzy
 msgid "File As"
 msgstr "Memorizza Come:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 #, fuzzy
 msgid "Primary Phone"
 msgstr "Principale"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 #, fuzzy
 msgid "Assistant Phone"
 msgstr "Assistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 #, fuzzy
 msgid "Business Phone"
 msgstr "Ufficio2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 #, fuzzy
 msgid "Callback Phone"
 msgstr "Richiamare"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 #, fuzzy
 msgid "Company Phone"
 msgstr "Ditta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 #, fuzzy
 msgid "Home Phone"
 msgstr "Casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 #, fuzzy
 msgid "Business Address"
 msgstr "Ufficio2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 #, fuzzy
 msgid "Home Address"
 msgstr "Controlla Indirizzo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 #, fuzzy
 msgid "Mobile Phone"
 msgstr "Cellulare"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 #, fuzzy
 msgid "Business Phone 2"
 msgstr "Ufficio2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "Casa 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 #, fuzzy
 msgid "Other Phone"
 msgstr "Altri Contatti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 #, fuzzy
 msgid "TTY"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 #, fuzzy
 msgid "Other Address"
 msgstr "Controlla Indirizzo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Sito Internet"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "Dipartimento"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Ufficio"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "Posizione"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Professione"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Manager"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Nickname"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "Coniuge"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Note"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr "Free-busy URL"
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "Completato"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "Caricamento del calendario..."
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Salva nella rubrica"
 
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1383,7 +1613,8 @@ msgid "Dimensions:"
 msgstr "Dimensioni:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Carattere..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1443,7 +1674,6 @@ msgid "Margins"
 msgstr "Margini"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "Numero di colonne:"
 
@@ -1524,145 +1754,321 @@ msgid "Width:"
 msgstr "Larghezza:"
 
 #: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "label26"
+#, fuzzy
+msgid "_Font..."
+msgstr "Carattere..."
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Errore durante la comunicazione con il server del calendario"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "Impossibile leggere il blocco di applicazione del Calendario"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "Impossibile leggere il blocco delle applicazioni da fare del Pilot "
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
-msgstr "File non trovato"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Un semplice controllo di Bonobo che visualizza un calendario."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr "Componente dell'sommario esecutivo del calendario di Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Visore iTip/iMip del calendario di Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr "Componente di Evolution per gestire il calendario."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr "Fabbrica per il componente del Sommario del Calendario."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr "Fabbrica per il componente del calendario di Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr "Fabbrica per il controllo della vista iTip del calendario"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr "Fabbrica per il controllo del Calendario di esempio"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Fabbrica per il componente del calendario di Evolution."
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr "Servizio di notifica dell'avviso sonoro"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr "Fabbrica per il servizio di notifica dell'avviso sonoro"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "Avviso dell'appuntamento alle:%A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "Avviso dell'appuntamento alle:%A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "Avviso dell'appuntamento alle:%A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "Avviso dell'appuntamento alle:%A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "Avviso dell'appuntamento alle:%A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "Avviso dell'appuntamento alle:%A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "Avviso dell'appuntamento alle:%A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "Mostra informazioni su Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "Avviso alle %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Chiudi"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "Suoneria"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "Suoneria (minuti)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "Modifica appuntamenti"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "Indice non disponibile."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "Promemoria appuntamento alle "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "Suoneria"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
+#, c-format
+msgid ""
+"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+"know."
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+msgid "Could not initialize GNOME"
+msgstr "Impossibile inizializzare GNOME"
+
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Impossibile inizializzare Bonobo"
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
-msgstr "Apri calendario"
+#: calendar/gui/alarm-notify/notify-main.c:115
+msgid "Could not create the alarm notify service factory"
+msgstr ""
+"Impossibile creare la babbrica per il servizio di notifica dell'avviso sonoro"
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
-msgstr "Salva calendario"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A, %e %B %Y"
 
-#: calendar/gui/calendar-commands.c:468
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Impossibile creare la vista del calendario.  Controllare le impostazioni di "
 "ORBit e di OAF"
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "Pubblico"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Privato"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Confidenziale"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1606
-#: calendar/gui/event-editor.c:1633
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:662
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Altezza"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
-#: calendar/gui/calendar-model.c:1569
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:661
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normale"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:660
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Basso"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Trasparente"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Opaco"
 
-#: calendar/gui/calendar-model.c:635 calendar/gui/calendar-model.c:1173
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Da cominciare"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1175
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "In corso"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1177
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "Completato"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1179
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
-#: camel/camel-service.c:586
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Annullato"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:799
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1673,7 +2079,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:879
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
@@ -1681,17 +2087,21 @@ msgstr ""
 "'nessuna'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:893 calendar/gui/calendar-model.c:1117
-#: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1179
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:430
-#: widgets/misc/e-dateedit.c:1339 widgets/misc/e-dateedit.c:1454
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Nessuno "
 
-#: calendar/gui/calendar-model.c:967
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1701,145 +2111,293 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1007
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Il valore percentuale deve essere compreso tra 0 e 100, inclusi"
 
-#: calendar/gui/calendar-model.c:1048
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "la prioritЮ dev'essere 'Alta', 'Normale', 'Bassa' oppure 'Non definita.'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1061
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Non definito"
 
-#: calendar/gui/calendar-model.c:1102
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "La trasparenza dev'essere 'Treasparente', 'Opaca' oppure 'Nessuna'."
 
-#: calendar/gui/calendar-model.c:1571
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "Ricorre"
 
-#: calendar/gui/calendar-model.c:1573
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Assegnato"
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "SЛ"
 
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "No"
 
-#: calendar/gui/calendar-summary.c:196
-msgid "%A, %e %B %Y"
-msgstr "%A, %e %B %Y"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "_Visualizza"
 
-#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "_Settimana lavorativa"
 
-#: calendar/gui/calendar-summary.c:437
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Errore nel caricare il calendario</b>"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "Settimana"
 
-#: calendar/gui/calendar-summary.c:449
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Errore nel caricare il calendario:<br>Metodo non supportato"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "Mese"
 
-#: calendar/gui/calendar-summary.c:616
-msgid "Display"
-msgstr "Visualizza"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "La URI che il calendario visualizzerЮ"
 
-#: calendar/gui/calendar-summary.c:621
-msgid "Show appointments"
-msgstr "Mostra appuntamenti"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "Avviso Sonoro"
 
-#: calendar/gui/calendar-summary.c:629
-msgid "Show tasks"
-msgstr "Mostra obiettivi"
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "Destinatari del messaggio:"
 
-#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Caricamento del Calendario"
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "Visualizza opzioni"
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "La URI che il calendario visualizzerЮ"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "Promemoria appuntamento alle "
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Suoneria"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Ok"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr "Servizio di notifica dell'avviso sonoro"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "Header del messaggio"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
-msgstr "Fabbrica per il servizio di notifica dell'avviso sonoro"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Emetti un suono"
 
-#: calendar/gui/alarm-notify/notify-main.c:56
-#, c-format
-msgid ""
-"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
-"know."
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:94 calendar/gui/main.c:52
-msgid "Could not initialize GNOME"
-msgstr "Impossibile inizializzare GNOME"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "Esegui programma"
 
-#: calendar/gui/alarm-notify/notify-main.c:109
-msgid "Could not create the alarm notify service factory"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
 msgstr ""
-"Impossibile creare la babbrica per il servizio di notifica dell'avviso sonoro"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Avviso alle %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "giorni"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Avviso dell'appuntamento alle:%A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "Aggiorna ogni "
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
-msgstr "Indice non disponibile."
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "Ore"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Chiudi"
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "minuti"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Modifica appuntamenti"
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr " %d giorni"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Suoneria (minuti)"
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr " 1 giorno"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr " %d settimane"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr " 1 settimana"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr " %d ore"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr " 1 ora"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr " %d minuti"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr " 1 minuto"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr " %d secondi"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr " 1 secondo"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr "Emetti un suono"
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "Visualizza tutti gli header del messaggio"
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an email"
+msgstr "Invia un email"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr "Esegui programma"
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr " prima dell'inizio di un appuntamento"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr " dopo l'inizio di un appuntamento"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr " prima della fine di un appuntamento"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr " dopo la fine di un appuntamento"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "Base"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "Data  e Ora"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "Promemoria"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Indice:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_Opzioni"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "dopo"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "prima"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "giorno(i)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr "termine dell'appuntamento"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr "Ora (e)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+msgid "minute(s)"
+msgstr "minuto(i)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
+msgstr "inizio dell'appuntamento"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
@@ -1870,36 +2428,38 @@ msgid "60 minutes"
 msgstr "60 minuti"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Interruzione avviso sonoro dopo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Avviso Sonoro"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "Emette un suono quondo appare la finestra di avviso"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Calendario"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "Preferenze del Calendario"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Colori"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+#, fuzzy
+msgid "Compress weekends in month view"
 msgstr "Comprimi i fine settimana"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+#, fuzzy
+msgid "Date Navigator"
 msgstr "Opzioni del navigatore delle date"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1907,436 +2467,932 @@ msgid "Defaults"
 msgstr "Predefinito"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Visualizza opzioni"
+#: mail/mail-config.glade.h:30
+msgid "Display"
+msgstr "Visualizza"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
-msgstr "Scadenza"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Attiva la suoneria per "
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Fine della giornata: "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Primo giorno della settimana:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "Ven"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:484
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "VenerdЛ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Evidenzia"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "Scadenze per oggi"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Scadenze per oggi:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Non ancora scaduti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Non ancora scaduti:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "LunedЛ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Compiti scaduti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "Compiti scaduti:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
-msgstr "Prendi un colore"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "PrioritЮ"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#, fuzzy
+msgid "Overdue tasks"
+msgstr "Compiti scaduti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Ricordami tutti gli appuntamenti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Promemoria"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "Sab"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:485
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Sabato"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Mostra"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "Mostra i termini dell'appuntamento"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Mostra i numeri delle settimane"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "Inizio della giornata:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "Dom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:486
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Domenica"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "TaskPad"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "Obiettivi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "Scadenze per oggi"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "Gio"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "GiovedЛ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Cronometra fino al termine"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Time"
+msgstr "Posizione"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "Suddivisione del tempo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Formato del tempo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"Fuso orario: "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "Mar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "MartedЛ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Avviso visivo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "Mer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "MercoledЛ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "Settimana lavorativa"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
+msgstr "_Settimana lavorativa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "minuti prima che inizino."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
-msgid "seconds."
-msgstr "secondi."
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "Sicuro di voler cancellare questo account?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "Sei sicuro di voler cancellare l'obiettivo `%s'?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "Sei sicuro di voler cancellare la voce dell'agenda `%s'?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "Completato"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "Completato"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#, fuzzy
+msgid "Due "
+msgstr "Scadenza"
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "Modifica Appuntamenti"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "Appuntamento - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "Obiettivo - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Voce nell'agenda - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Niente indice"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "Sovrascrivere il file?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Esiste giЮ un file con questo nome.\n"
+"Sovrascriverlo?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Salva con nome..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Sei sicuro di voler cancellare l'appuntamento `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:73
+#: calendar/gui/dialogs/delete-comp.c:87
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Sei sicuro di voler cancellare questo appuntamento senza nome?"
 
-#: calendar/gui/dialogs/delete-comp.c:79
+#: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Sei sicuro di voler cancellare l'obiettivo `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:82
+#: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Sei sicuro di voler cancellare quest'obiettivo senxa nome?"
 
-#: calendar/gui/dialogs/delete-comp.c:88
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Sei sicuro di voler cancellare la voce dell'agenda `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Sei sicuro di voler cancellare questa voce dell'agenda senza nome?"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Salvare le modifiche?"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "Sei sicuro di voler cancellare l'appuntamento `%s'?"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% Comp_leta:"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "Sei sicuro di voler cancellare l'obiettivo `%s'?"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "Sei sicuro di voler cancellare la voce dell'agenda `%s'?"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Scegliere un file"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Sezioni:"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Fuso orario: "
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
+msgstr "Appuntamento"
+
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
+msgstr "Promemoria"
+
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
+msgstr "Ricorrenza"
+
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "Annulla Riunione"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "_Eventi della giornata"
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Classificazione"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Date & Time"
 msgstr "Data  e Ora"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Completato in data:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Pri_vate"
 msgstr "Pri_vato"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "In corso"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "Pub_blico"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Data di _inizio:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "_Indice:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Obiettivo"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
 msgid "_Confidential"
 msgstr "_Confidenziale"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "_Contatti..."
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "Ora di _fine:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "Sca_denza:"
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "_Ora di inizio:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_PrioritЮ:"
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "_Status:"
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Nome del Gruppo:"
 
-#: calendar/gui/dialogs/task-editor.c:707
-msgid "Edit Task"
-msgstr "Modifica Obiettivo"
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Alimentazione della carta:"
 
-#: calendar/gui/dialogs/task-editor.c:713 calendar/gui/event-editor.c:382
-msgid "No summary"
-msgstr "Niente indice"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:719 calendar/gui/event-editor.c:388
-#, c-format
-msgid "Appointment - %s"
-msgstr "Appuntamento - %s"
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:722 calendar/gui/event-editor.c:391
-#, c-format
-msgid "Task - %s"
-msgstr "Obiettivo - %s"
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr "Partecipante Richiesto"
 
-#: calendar/gui/dialogs/task-editor.c:725 calendar/gui/event-editor.c:394
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Voce nell'agenda - %s"
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr "Partecipante Opzionale"
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
-msgstr "Categorie"
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr "Non Partecipante"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Completion Date"
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Aggiungi Azione"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr "Accetta"
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr "Annulla"
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Tentativo"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Eliminato"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "In corso"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Chair Persons"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Partecipante Richiesto"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Partecipante Opzionale"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Non Partecipante"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "Visto"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "Elimina..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
+msgstr "Partecipante"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
 msgstr "Ultimato il"
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "End Date"
-msgstr "Termine"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "Eliminato"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Start Date"
-msgstr "Inizio"
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "Eliminato"
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
-msgstr "Posizione Geografica"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "Manager"
 
-#: calendar/gui/e-calendar-table.c:164
-msgid "Percent complete"
-msgstr "Percentuale completata"
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "Dicembre"
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Summary"
-msgstr "Indice"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr "RSVP"
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
-msgstr "Trasparenza"
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr "Ruolo"
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
-msgstr "URL"
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Status"
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
-msgstr "Avvisi Sonoro"
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Tipo"
 
-#: calendar/gui/e-calendar-table.c:170
-msgid "Click here to add a task"
-msgstr "Fare clic qui per aggiungere un obiettivo"
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizzatore:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Organizzatore:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "_Invita altri..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Organizzatore:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
+"Questo appuntamento contiene ricorrenze che Evolution non puР modificare."
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr "il"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "giorno"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr "il"
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr " "
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr "ricorrenze"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
+msgstr "Ricorrenza personalizzata"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Ogni"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "Eccezioni"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
+msgstr "Nessuna Ricorrenza"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
+msgstr "Anteprima"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
+msgstr "Regole di ricorrenza"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
+msgstr "Semplice ricorrenza"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "Modifica"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "per"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "sempre"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "mese(i)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr "fino a"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "Settimana(e)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
+msgstr "anno(i)"
+
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr "Salvare le modifiche?"
+
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "Completato in data:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "Eliminato"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "Eliminato"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "Nessuno "
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "Obiettivo"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% Comp_leta:"
+
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
+msgstr "In corso"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "Data di _inizio:"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
+msgstr "Sca_denza:"
+
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
+msgstr "_PrioritЮ:"
+
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
+msgstr "_Status:"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "Segna come Completato"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+#, fuzzy
+msgid "_Open"
+msgstr "Apri"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
-msgstr "Segna l'obiettivo come raggiunto"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "_Taglia"
 
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit this task..."
-msgstr "Modifica questo obiettivo..."
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Copia"
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "Modifica obiettivo"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "_Incolla"
+
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "Segna come Completato"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Elimina questo obiettivo"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
+msgstr "Segna come Completato"
+
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Elimina questo obiettivo"
 
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "Fare clic qui per aggiungere un obiettivo"
+
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% Comp_leta:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Avvisi Sonoro"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Categorie"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+#, fuzzy
+msgid "Complete"
+msgstr "Completato"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "Ultimato il"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "Scadenza"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Termine"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "Posizione Geografica"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "PrioritЮ"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Inizio"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "Indice"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "Obiettivi"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "Trasparenza"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
 #: calendar/gui/e-day-view-time-item.c:519
 #, c-format
 msgid "%02i minute divisions"
@@ -2344,150 +3400,156 @@ msgstr "%02i divisioni per minuto"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Nuovo Appuntamento"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "Nuovo Evento dell'intera giornata"
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
-msgid "Go to Today"
-msgstr "Vai a Oggi"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "Vai a _Oggi"
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "Vai alla data..."
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: mail/folder-browser.c:566 ui/evolution-calendar.xml.h:19
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Apri"
-
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Elimina questo Appuntamento"
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Pianifica una Riunione"
-
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Rendi rimandabile questa Ricorrenza"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "Elimina questa Ricorrenza"
 
-#: calendar/gui/e-day-view.c:3179
-msgid "Delete all Occurrences"
-msgstr "Elimina tutte le Ricorrenze"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
+msgstr "Elimina Tutte le Ricorrenze"
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
-msgstr "Impossibile aggiornare il file del calendario!\n"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
-msgid "Component successfully updated."
-msgstr "Compnente aggiornata con successo."
+#: calendar/gui/e-itip-control.c:697
+#, fuzzy
+msgid "This is a meeting request."
+msgstr "Indirizzo a cui _spedire"
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
-msgstr "Si И verificato un errore nel caricare il file del calendario."
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
-msgstr "Impossibile aprire il file del calendario!\n"
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
-msgstr "Impossibile caricare il file del calendario!\n"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+#, fuzzy
+msgid "The message is not understandable."
+msgstr ""
+"Questo messaggio non ha l'oggetto.\n"
+"Inviare lo stesso?"
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
-msgstr "Impossibile leggere il file del calendario!\n"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
-msgstr "Questa И la risposta di qualcuno che non era stato invitato!"
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:499
-msgid "I couldn't update your calendar store."
-msgstr "Impossibile aggiornare l'archivio del calendario."
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
-msgstr "Impossibile cancellare il componente del calendario!\n"
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Component successfully deleted."
-msgstr "Componente aggiornato con successo."
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-msgid "I don't recognize this type of calendar component."
-msgstr "Tipo di componente del calendario non riconosciuto."
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
-msgstr "Aggiungi al Calendario"
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
-#, fuzzy
-msgid " Accept "
-msgstr "Accetta"
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:815
+#: calendar/gui/e-itip-control.c:834
 #, fuzzy
-msgid " Decline "
-msgstr "Annulla"
+msgid "The message does not appear to be properly formed"
+msgstr "La cartella appare irrimediabilmente corrotta."
 
-#: calendar/gui/e-itip-control.c:816
-#, fuzzy
-msgid " Tentative "
-msgstr "Tentativo"
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
-msgstr "Aggiorna Calendario"
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
-msgstr "Annulla Riunione"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr "Impossibile aggiornare il file del calendario!\n"
+
+#: calendar/gui/e-itip-control.c:1015
+#, fuzzy
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "Impossibile aprire il file del calendario!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -2502,27 +3564,23 @@ msgstr "--a--"
 msgid "Calendar Message"
 msgstr "Messaggio del Calendario"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:623
+#: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Data:"
 
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "Caricamento del Calendario"
+
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Caricamento del calendario..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizzatore:"
-
 #: calendar/gui/e-itip-control.glade.h:10
 #, fuzzy
 msgid "Server Message:"
 msgstr "Salva Messaggio con nome..."
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Indice:"
-
 #: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "termine"
@@ -2531,102 +3589,21 @@ msgstr "termine"
 msgid "date-start"
 msgstr "inizio"
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "Partecipante"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "Indirizzo del partecipante"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "Partecipanti:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"Annulla \n"
-"Riunione"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "Inviti alla riunione"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "Non Partecipante"
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "Partecipante Opzionale"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "Organizzatore: "
-
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"Pubblica\n"
-"Evento"
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"Richiesta\n"
-"Riunione"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Required Participant"
-msgstr "Partecipante Richiesto"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid "Role"
-msgstr "Ruolo"
-
-#: calendar/gui/e-meeting-dialog.glade.h:22
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"Organizza\n"
-"Tempo"
-
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1054
-msgid "Status"
-msgstr "Status"
-
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "Tutti"
 
-#: calendar/gui/e-tasks.c:155
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "Categoria:"
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Impossibile caricare l'obiettivo in `%s'"
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Il metodo richiesto per caricare `%s' non Х supportato"
@@ -2634,325 +3611,22 @@ msgstr "Il metodo richiesto per caricare `%s' non Х supportato"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-msgid "New Appointment..."
-msgstr "Nuovo Appuntamento..."
-
-#: calendar/gui/e-week-view.c:3314
-msgid "Delete All Occurrences"
-msgstr "Elimina Tutte le Ricorrenze"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "_Eventi della giornata"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Appuntamento"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "Appuntamenti di Base:"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Ricorrenza personalizzata"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Ogni"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Eccezioni"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Modifica"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Nessuna Ricorrenza"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1593
-msgid "Play a sound"
-msgstr "Emetti un suono"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Anteprima"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Ricorrenza"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Regole di ricorrenza"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Promemoria"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1602
-msgid "Run a program"
-msgstr "Esegui programma"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1599
-msgid "Send an email"
-msgstr "Invia un email"
-
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "Impostazioni..."
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1596
-msgid "Show a dialog"
-msgstr "Mostra un dialogo"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Semplice ricorrenza"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "Ora di _fine:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "_Ora di inizio:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "Data di _inizio:"
-
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "dopo"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
-msgid "before"
-msgstr "prima"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "giorno(i)"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "termine dell'appuntamento"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "per"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "sempre"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "Ora (e)"
-
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label21"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "label55"
-
-#: calendar/gui/event-editor-dialog.glade.h:42 mail/mail-config.glade.h:77
-msgid "minute(s)"
-msgstr "minuto(i)"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "month(s)"
-msgstr "mese(i)"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "start of appointment"
-msgstr "inizio dell'appuntamento"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr "fino a"
-
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr "Settimana(e)"
-
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "anno(i)"
-
-#: calendar/gui/event-editor.c:376
-msgid "Edit Appointment"
-msgstr "Modifica Appuntamenti"
-
-#: calendar/gui/event-editor.c:454
-msgid "on"
-msgstr "il"
-
-#: calendar/gui/event-editor.c:479 filter/filter-datespec.c:81
-msgid "day"
-msgstr "giorno"
-
-#: calendar/gui/event-editor.c:606
-msgid "on the"
-msgstr "il"
-
-#: calendar/gui/event-editor.c:613
-msgid "th"
-msgstr " "
-
-#: calendar/gui/event-editor.c:759
-msgid "occurrences"
-msgstr "ricorrenze"
-
-#: calendar/gui/event-editor.c:876
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-"Questo appuntamento contiene ricorrenze che Evolution non puР modificare."
-
-#: calendar/gui/event-editor.c:1548
-#, c-format
-msgid " %d days"
-msgstr " %d giorni"
-
-#: calendar/gui/event-editor.c:1550
-msgid " 1 day"
-msgstr " 1 giorno"
-
-#: calendar/gui/event-editor.c:1553
-#, c-format
-msgid " %d weeks"
-msgstr " %d settimane"
-
-#: calendar/gui/event-editor.c:1555
-msgid " 1 week"
-msgstr " 1 settimana"
-
-#: calendar/gui/event-editor.c:1558
-#, c-format
-msgid " %d hours"
-msgstr " %d ore"
-
-#: calendar/gui/event-editor.c:1560
-msgid " 1 hour"
-msgstr " 1 ora"
-
-#: calendar/gui/event-editor.c:1563
-#, c-format
-msgid " %d minutes"
-msgstr " %d minuti"
-
-#: calendar/gui/event-editor.c:1565
-msgid " 1 minute"
-msgstr " 1 minuto"
-
-#: calendar/gui/event-editor.c:1568
-#, c-format
-msgid " %d seconds"
-msgstr " %d secondi"
-
-#: calendar/gui/event-editor.c:1570
-msgid " 1 second"
-msgstr " 1 secondo"
-
-#: calendar/gui/event-editor.c:1617
-msgid " before start of appointment"
-msgstr " prima dell'inizio di un appuntamento"
-
-#: calendar/gui/event-editor.c:1619
-msgid " after start of appointment"
-msgstr " dopo l'inizio di un appuntamento"
-
-#: calendar/gui/event-editor.c:1627
-msgid " before end of appointment"
-msgstr " prima della fine di un appuntamento"
-
-#: calendar/gui/event-editor.c:1629
-msgid " after end of appointment"
-msgstr " dopo la fine di un appuntamento"
-
-#: calendar/gui/event-editor.c:3137 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Un semplice controllo di Bonobo che visualizza un calendario."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr "Componente dell'sommario esecutivo del calendario di Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Visore iTip/iMip del calendario di Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "Componente di Evolution per gestire il calendario."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr "Fabbrica per il componente del Sommario del Calendario."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "Fabbrica per il componente del calendario di Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr "Fabbrica per il controllo della vista iTip del calendario"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr "Fabbrica per il controllo del Calendario di esempio"
-
-#: calendar/gui/gnome-cal.c:223
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
 #, fuzzy
-msgid "Show all "
-msgstr "Mostra Tutto"
-
-#: calendar/gui/gnome-cal.c:237
-#, fuzzy
-msgid "Summary contains"
-msgstr "Email contiene"
-
-#: calendar/gui/gnome-cal.c:238
-#, fuzzy
-msgid "Description contains"
-msgstr "Descrizione:"
-
-#: calendar/gui/gnome-cal.c:239
-#, fuzzy
-msgid "Comment contains"
-msgstr "Il nome contiene"
-
-#: calendar/gui/gnome-cal.c:240
-#, fuzzy
-msgid "Has category"
-msgstr "Categoria:"
+msgid "New _Appointment..."
+msgstr "Nuovo Appuntamento..."
 
-#: calendar/gui/gnome-cal.c:843
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Impossibile aprire la cartella in `%s'"
 
-#: calendar/gui/gnome-cal.c:854
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Il metodo richiesto per aprire `%s' non Х supportato"
@@ -2978,236 +3652,256 @@ msgid "Go To Date"
 msgstr "Vai alla data"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Vai a oggi"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Gennaio"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "Luglio"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "Giugno"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "Marzo"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "Maggio"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "Novembre"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "Ottobre"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Settembre"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Vai a oggi"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Gi"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "Sa"
 
-#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Obiettivi"
 
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "Data odierna (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1104
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Settimana corrente (%s  - %s) "
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Mese corrente (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Anno corrente (%Y)"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Stampa Calendario"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1465
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:53
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Anteprima di stampa"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Stampa questo articolo"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "Impostazione pagina"
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "La URI della cartella degli obiettivi da visualizzare"
 
@@ -3253,94 +3947,113 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "DLMMGVS"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 #, fuzzy
 msgid "Signing is not supported by this cipher"
 msgstr "Tipo on supportato"
 
-#: camel/camel-cipher-context.c:209
+#: camel/camel-cipher-context.c:211
 #, fuzzy
 msgid "Clearsigning is not supported by this cipher"
 msgstr "Tipo on supportato"
 
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:251
 #, fuzzy
 msgid "Verifying is not supported by this cipher"
 msgstr "Tipo on supportato"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:294
 #, fuzzy
 msgid "Encryption is not supported by this cipher"
 msgstr "Tipo on supportato"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:336
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "Tipo on supportato"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 #, fuzzy
 msgid "Syncing folders"
 msgstr "Sincronizzazione cartella"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Impossibile aprire la rubruca"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Impossibile aprire la rubruca"
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 #, fuzzy
 msgid "Getting message %d (%d%%)"
 msgstr "Scaricamento del messaggio %s"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, fuzzy, c-format
-msgid "Failed message %d"
+msgid "Failed on message %d"
 msgstr "_Invia messaggio"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 #, fuzzy
 msgid "Cannot open message"
 msgstr ""
 "Impossibile prendere il messaggio: %s\n"
 "%s"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Sincronizzazione cartella"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-#, fuzzy
-msgid "Complete"
-msgstr "Completato"
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "Salvare messaggio %d di %d (uid \"%s\")"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "Salvare messaggio %d di %d (uid \"%s\")"
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Errore nel filtro di smistamento: %s: %s"
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Errore nell'esecuzione del filtro: %s: %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Errore nell'esecuzione della ricerca con filtro: %s: %s"
@@ -3376,14 +4089,33 @@ msgstr "и stata effettuata una ricerca su un header sconosciuto: %s"
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Tipo non valido in body-contains, ci si aspettava una stringa"
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Impossibile ridirigere: %s  "
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Impossibile avere la cartella %s: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "Impossibile fare un fork: %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Impossibile creare il file di blocco per %s; %s"
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3400,114 +4132,109 @@ msgstr "Rimozione del lock usando fcntl(2) non riuscita: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Rimozione del lock usando flock(2) non riuscita: %s"
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Impossibile controllare il file di posta %s: %s"
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Impossibile aprire il file di posta %s: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Impossibile aprire il file di posta temporaneo %s: %s"
 
-#: camel/camel-movemail.c:199
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Impossibile verificare il file di blocco per %s: %s"
-
-#: camel/camel-movemail.c:245
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Errore nella lettura del file di posta: %s"
-
-#: camel/camel-movemail.c:256
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Errore nella scrittura del file temp di posta: %s"
-
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Fallita l'archiviazione della posta nel file temporaneo %s: %s"
 
-#: camel/camel-movemail.c:306
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Impossibile ridirigere: %s  "
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Impossibile fare un fork: %s"
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Fallito lo spostamento della posta: %s"
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Errore sconosciuto)"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Errore nella lettura del file di posta: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Errore nella scrittura del file temp di posta: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, fuzzy, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Errore nella scrittura del file temp di posta: %s"
 
-#: camel/camel-pgp-context.c:190
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Digitare la %s passphrase per %s"
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Digitare la %s passphrase"
 
-#: camel/camel-pgp-context.c:513
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:520 camel/camel-pgp-context.c:692
-#: camel/camel-pgp-context.c:1061 camel/camel-pgp-context.c:1273
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Non Х stata fornita alcuna password."
 
-#: camel/camel-pgp-context.c:526 camel/camel-pgp-context.c:698
-#: camel/camel-pgp-context.c:881 camel/camel-pgp-context.c:1068
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Impossibile ridirigere verso GPG/PGP: %s  "
 
-#: camel/camel-pgp-context.c:685
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:875
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr ""
 
-#: camel/camel-pgp-context.c:892
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Impossibile creare file temporaneo: %s  "
 
-#: camel/camel-pgp-context.c:1051
+#: camel/camel-pgp-context.c:1063
 #, fuzzy
 msgid "No plaintext to encrypt."
 msgstr "Cliccare l'icona per decifrare."
 
-#: camel/camel-pgp-context.c:1077
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "Nessun destinatario specificato"
 
-#: camel/camel-pgp-context.c:1265
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -3526,37 +4253,37 @@ msgstr "Impossibile caricare %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Impossibile caricare %s: nessun codice di inizializzazione nel modulo."
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s server %s"
 
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s servizio per %s su  %s"
 
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr "Connessione annullata"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Impossibile connettersi a %s (porta %d): %s"
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr "(host sconosciuto)"
 
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:264
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "Operazione annullata"
 
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "Il server si И disconnesso inaspettatamente"
 
@@ -3666,71 +4393,80 @@ msgstr ""
 " %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:420
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "Cattiva risposta di autenticazione dal server."
 
-#: camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
+msgstr ""
+
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 #, fuzzy
 msgid "This option will connect to the server using a simple password."
 msgstr ""
 "Con questa opzione ci si connette al server IMAP usando una password di "
 "testo semplice."
 
-#: camel/camel-search-private.c:110
+#: camel/camel-sasl-login.c:127
+#, fuzzy
+msgid "Unknown authentication state."
+msgstr "Autenticazione fallita"
+
+#: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Compilazione dell'espressione regolare fallita: %s: %s"
 
-#: camel/camel-service.c:152
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' necessita di un componente per lo username "
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' necessita di un componente per l'host"
 
-#: camel/camel-service.c:168
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' necessita di un componente per il percorso"
 
-#: camel/camel-service.c:554
+#: camel/camel-service.c:548
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:581
+#: camel/camel-service.c:575
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:606
+#: camel/camel-service.c:600
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:608
+#: camel/camel-service.c:602
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr "Fornitore di cartelle email virtuali "
 
-#: camel/camel-session.c:58
+#: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
 msgstr "Per leggere la posta come una ricerca di un altro insieme di cartelle"
 
-#: camel/camel-session.c:273 camel/camel-session.c:363
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Nessun fornitore disponibile per il protocollo `%s'"
 
-#: camel/camel-session.c:462
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3739,11 +4475,73 @@ msgstr ""
 "Impossibile creare la directory %s:\n"
 "%s"
 
-#. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:994 mail/mail-ops.c:1001
-#: mail/mail-ops.c:1019 mail/mail-ops.c:1020
-msgid "Trash"
-msgstr "Cestino"
+#: camel/camel-smime-context.c:173
+#, fuzzy, c-format
+msgid "Please enter your password for %s"
+msgstr "Digitare la %s passphrase per %s"
+
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "Il file noon esiste."
+
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "Il file noon esiste."
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, fuzzy, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "Fallito l'invio dello username al server"
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
+#, fuzzy
+msgid "Failed to decode message."
+msgstr "_Invia messaggio"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
+#, c-format
+msgid ""
+"Issuer: %s\n"
+"Subject: %s"
+msgstr ""
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
 
 #: camel/camel-url.c:289
 #, fuzzy, c-format
@@ -3752,67 +4550,95 @@ msgstr ""
 "Impossibile il file %s:\n"
 "%s "
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "Non И presente il messaggio: %s"
 
-#: camel/camel-vee-folder.c:545
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "Non И presente il messaggio: %s"
 
-#: camel/providers/imap/camel-imap-command.c:209
+#: camel/camel-vtrash-folder.c:109
+#, fuzzy
+msgid "You cannot copy messages from this trash folder."
+msgstr ""
+"х possibile modificare solo i messaggi\n"
+"salvati nella cartella Bozze."
+
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Risposta inaspettata dal server IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:217
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Comando IMAP fallito: %s"
 
-#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Errore sconosciuto"
-
-#: camel/providers/imap/camel-imap-command.c:272
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "La risposta del server Х terminata troppo presto."
 
-#: camel/providers/imap/camel-imap-command.c:456
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "La risposta del server IMAP non contiene informazione %s"
 
-#: camel/providers/imap/camel-imap-command.c:490
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Risposta OK inattesa dal server IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:170
+#: camel/providers/imap/camel-imap-folder.c:192
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr "Impossibile creare la directory %s: %s"
+
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Impossibile caricare l'indice per %s"
 
-#: camel/providers/imap/camel-imap-folder.c:349
-msgid "Scanning IMAP folder"
-msgstr "Scansione delle cartelle IMAP in corso"
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
+msgstr ""
+
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "Salvataggio messaggi"
 
-#: camel/providers/imap/camel-imap-folder.c:984
-#: camel/providers/imap/camel-imap-folder.c:1195
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 #, fuzzy
 msgid "This message is not currently available"
 msgstr ""
 "Questo messaggio non ha l'oggetto.\n"
 "Inviare lo stesso?"
 
-#: camel/providers/imap/camel-imap-folder.c:1014
-#: camel/providers/imap/camel-imap-folder.c:1229
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Salvataggio messaggi"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "Impossibile trovare il corpo del messaggio nella risposta di FETCH."
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, fuzzy, c-format
+msgid "Could not open cache directory: %s"
+msgstr "Impossibile creare la directory %s: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 #, fuzzy
 msgid "Checking for new mail"
 msgstr "Crea una nuova email"
@@ -3822,7 +4648,7 @@ msgstr "Crea una nuova email"
 msgid "Check for new messages in all folders"
 msgstr "Copia messaggio in una nuova cartella"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:534
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Cartelle"
 
@@ -3858,28 +4684,28 @@ msgstr ""
 "Con questa opzione ci si connette al server IMAP usando una password di "
 "testo semplice."
 
-#: camel/providers/imap/camel-imap-store.c:443
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Il server IMAP %s non supporta il tipo di autenticazione richiesto %s "
 
-#: camel/providers/imap/camel-imap-store.c:453
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Nessun supporto per il tipo di autenticazione %s"
 
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sInserire la password IMAP per %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:493
-#: camel/providers/smtp/camel-smtp-transport.c:403
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "Non Х stata inserita la password."
 
-#: camel/providers/imap/camel-imap-store.c:521
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3890,98 +4716,108 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:868
-#, fuzzy, c-format
-msgid "%s is not a selectable folder"
-msgstr "Mostra la cartella selezionata"
-
-#: camel/providers/imap/camel-imap-store.c:882
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Impossibile creare la directory %s: %s"
+msgid "No such folder %s"
+msgstr "Non Х presente la cartella %s"
 
-#: camel/providers/imap/camel-imap-store.c:1385
-msgid "You must be working online to complete this operation"
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "Formato MH di UNIX delle directory della posta"
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr "Per archiviare la posta locale in directory di posta di tipo MH"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr "File di mailbox standard per Unix"
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr "Per archiviare la posta locale in formato mbox standard"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr "File di posta UNIX qmail maildir-format"
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr "Per archiviare la posta locale nelle directory qmail maildir"
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-provider.c:70
+#, fuzzy
+msgid "Unix mbox spool-format mail files"
+msgstr "File di posta UNIX qmail maildir-format"
+
+#: camel/providers/local/camel-local-provider.c:71
+#, fuzzy
+msgid "For storing local mail in standard Unix spool directories"
+msgstr "Per archiviare la posta locale nelle directory qmail maildir"
+
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:136
+#: camel/providers/local/camel-local-store.c:134
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:144
-#: camel/providers/local/camel-local-store.c:160
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Impossibile avere la cartella %s: %s"
 
-#: camel/providers/local/camel-local-store.c:175
+#: camel/providers/local/camel-local-store.c:173
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr "File di posta locale: %s"
 
-#: camel/providers/local/camel-local-store.c:241
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Impossibile rinominare la cartella %s con %s: %s"
 
-#: camel/providers/local/camel-local-store.c:283
+#: camel/providers/local/camel-local-store.c:279
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Impossibile cancellare l'indice della cartella `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:293
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Impossibile cancellare il file indice della cartella `%s': %s"
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
+msgid "Unable to add message to summary: unknown reason"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Impossibile accodare il messaggio alla cartella maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3990,18 +4826,19 @@ msgstr ""
 "Impossibile prendere il messaggio: %s\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "Messaggio assente"
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr "Contenuto del messaggio non valido"
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4011,14 +4848,14 @@ msgstr ""
 "Impossibile aprire la cartella `%s':\n"
 "%s "
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "La cartella `%s' non esiste."
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4028,28 +4865,43 @@ msgstr ""
 "Impossibile creare la cartella `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' non Х una directory maildir."
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Impossibile cancellare la cartella `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "non Х una directory maildir"
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"Impossibile creare la cartella `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
+#, fuzzy, c-format
+msgid "Cannot open maildir directory path: %s: %s"
+msgstr "Impossibile aprire la casella di posta: %s: %s\n"
+
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Impossibile avere la cartella %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Impossibile aprire la casella di posta: %s: %s\n"
@@ -4059,9 +4911,12 @@ msgstr "Impossibile aprire la casella di posta: %s: %s\n"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Inpossibile accodare il messaggio al file mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4070,11 +4925,13 @@ msgstr ""
 "Impossibile prendere il messaggio: %s dalla cartella: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "La cartella appare irrimediabilmente corrotta."
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Fallita la costruziono del messaggio: mailbox corrotta?"
 
@@ -4119,85 +4976,102 @@ msgstr "La Cartella `%s' non Х vuota.  Non cancellata."
 
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "Creazione indice della cartella"
 
-#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 "Impossibile aprire la cartella: %s: indice creato a partire dalla posizione "
 "%ld: %s "
 
-#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 "Errore fatale di simistamento della posta vicino alla posizione %ld nella "
 "cartella %s"
 
-#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Impossibile creare indice per la cartella: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:501
-#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Sincronizzazione cartella"
 
-#: camel/providers/local/camel-mbox-summary.c:506
-#: camel/providers/local/camel-mbox-summary.c:707
+#: camel/providers/local/camel-mbox-summary.c:507
+#: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Impossibile aprire la cartella per la quale creare l'indice %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:523
+#: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Impossibile creare una mbox temporanea: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:556
-#: camel/providers/local/camel-mbox-summary.c:745
-#: camel/providers/local/camel-mbox-summary.c:753
+#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:557
+#: camel/providers/local/camel-mbox-summary.c:746
+#: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Indice e cartella non corrispondono, nemmeno dopo una sincronizzazione"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Errore di scrittura nella mbox temporanea: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:616
+#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Scrittura fallita su casella di posta temporanea %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:634
-#: camel/providers/local/camel-mbox-summary.c:803
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Impossibile chiudere la cartella sorgente %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:643
+#: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Impossibile chiudere la cartella temporanea: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:654
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Impossibile rinominare la cartella: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Errore sconosciuto: %s"
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Impossibile accodare il messaggio alla cartella mh: %s: %s"
@@ -4207,39 +5081,97 @@ msgstr "Impossibile accodare il messaggio alla cartella mh: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "`%s' non Х una directory."
 
+#: camel/providers/local/camel-mh-summary.c:218
+#, fuzzy, c-format
+msgid "Cannot open MH directory path: %s: %s"
+msgstr "Impossibile aprire la casella di posta: %s: %s\n"
+
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "Inpossibile accodare il messaggio al file mbox: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "`%s' non Х un file regolare."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "La cartella `%s' non esiste."
+
+#: camel/providers/local/camel-spool-store.c:176
+msgid "Spool stores do not have an inbox"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "File di posta locale: %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "Impossibile aprire il file di posta temporaneo %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "Impossibile chiudere la cartella sorgente %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Inserire la passwoed NNTP di %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "Username rifiutato dal server"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "Fallito l'invio dello username al server"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "Il server ha rifiutato username/password"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "Messaggio %s non trovato."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "Impossibile prendere la lista dei gruppi dal server."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Impossibile caricare il file con la lista dei gruppi di %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Impossibile salvare il file con la lista dei gruppi di %s: %s"
@@ -4252,17 +5184,17 @@ msgstr "USENET news"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Questo Х un fornitore per la lettura e l'invio a newsgroups USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Impossibile aprire la directory per il news server: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4270,8 +5202,8 @@ msgstr ""
 "Con questa opzione l'autenticazione con il server NNTP avviene usando una "
 "password in testo semplice."
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Impossibile aprire o creare il file .newsrc per %s: %s"
@@ -4324,7 +5256,7 @@ msgstr "Non cancellare i messaggi dal server"
 msgid "Delete after %s day(s)"
 msgstr "Elimina questo obiettivo"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4362,27 +5294,27 @@ msgstr ""
 "Con questa ci si connette al server POP usando Kerberos 4 per "
 "l'autenticazione."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Impossibile autenticare il KPOP server: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:225
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, fuzzy, c-format
 msgid "Could not connect to server: %s"
 msgstr "Impossibile connettersi al server POP su %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:329
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Impossibile connettersi al server POP su %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:368
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sPrego inserire la password del POP3 di %s@%s "
 
-#: camel/providers/pop3/camel-pop3-store.c:387
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4391,12 +5323,12 @@ msgstr ""
 "Impossibile connettersi al server POP.\\n\n"
 "Errore nell'invio dello username: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:390
-#: camel/providers/pop3/camel-pop3-store.c:427
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr "(Sconosciuto)"
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4404,7 +5336,7 @@ msgstr ""
 "Impossibile connettersi al server POP.\\n\n"
 "Non Х presente il supporto per il meccaniscmo di autenticazione richiesto."
 
-#: camel/providers/pop3/camel-pop3-store.c:425
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4413,13 +5345,13 @@ msgstr ""
 "Impossibile connettersi al server POP.\\n\n"
 "Errore nell'invio della password: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:493
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Cartella `%s' non presente."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4474,7 +5406,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Posta consegnata attraverso il programma sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4483,128 +5415,128 @@ msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "Per consegnare la posta connettendosi a un mail hub remoto usando SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "Errore di sintassi, comando non riconosciuto"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "Errore di sintassi nei parametri o negli argomenti"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Comando non implementato"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "Parametro del comando non implementato"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr "Stato del sistema, o risposta di aiuto del sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "Messaggio di Aiuto"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Servizio pronto"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr "Il servizio sta chiudendo il canale di trasmissione"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr "Servizio non disponibile, chiusura del canale di trasmissione"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr "L'azione di posta richiesta Х corretta, completata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr "Utente non locale; inoltrare a <percorso-a-cui-inoltrare> "
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 "L'azione di posta richiesta non Х stata effettuata: casella non disponibile"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Azione richiesta non effettuata: casella non disponibile"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr "Azione richiesta interrotta: errore di processo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr "Utente non locale; tentare <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Azione richiesta non effettuata: archivio di sistema insufficiente"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 "L'azione di posta richiesta Х stata interrotta: si Х ecceduta l'allocazione "
 "per l'archivio"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 "L'azione di posta richiesta non Х stata effettuata: il nome della casella "
 "non Х permesso"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Inizio dell'imput della posta, termin con <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "Transazione fallita"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr "и necessaria una password di transizione."
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "Il meccanismo di autenticazione И troppo debole"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 "и richiesta la crittografia per il meccanismo di autenticazione richiesto"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "Autenticazione temporaneamente non riuscita"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "Autenticazione richiesta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Errore nella risposta di benvenuto: %s: probabilmente non fatale"
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "Il server IMAP %s non supporta il tipo di autenticazione richiesto %s "
 
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sInserire la password SMTP per %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4615,237 +5547,243 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:527
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Posta SMTP consegnata attraverso il programma %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 "Impossibile inviare il messaggio: l'indirizzo del mittente non Х stato "
 "definito."
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Impossibile inviare il messaggio: l'indirizzo del mittente non Х valido."
 
-#: camel/providers/smtp/camel-smtp-transport.c:575
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "Invio messaggio"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "Impossibile inviare il messaggio: senza destinatari."
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Richiesta di HELO scaduta: %s: non fatale"
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Errore di risposta di HELO scaduta: %s: non fatale"
 
-#: camel/providers/smtp/camel-smtp-transport.c:721
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:736
 #: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Autenticazione"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Richiesta AUTH scaduta: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:782
+#, fuzzy
+msgid "AUTH request failed."
+msgstr "Richiesta AUTH scaduta: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr "Cattiva risposta di autenticazione dal server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:824
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Richiesta MAIL FROM scaduta: %s: posta non inviata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:843
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Errore nella risposta MAIL FROM: %s: posta non inviata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "La richiesta di RCPT TO: %s: posta non inviata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:887
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Errore nella risposta di RCPT TO: %s: posta non inviata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "RIchiesta di DATA scaduta: %s: posta non inviata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Errore nella risposta di DATA: %s: posta non inviata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:952
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA ha inviato il segnale di tempo scaduto: terminazione del messaggio: %s "
 "posta non inviata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 "Errore nella risposta di DATA: terminazione del messaggio: %s posta non "
 "inviata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Richiesta RSET scaduta: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Errore nella risposta di RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Richiesta QUIT scaduta: %s: non fatale"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Errore nella risposta di QUIT: %s: non fatale<"
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "allegato"
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Allega un file"
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "Rimuovere gli oggetti selezionati dalla lista degli allegati"
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Aggiungere allegato..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "Allegare un file al messaggio"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1054
-msgid "Attachment"
-msgstr "Allegato"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "ProprietЮ dell'allegato"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Nome del file:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "allegato inlinea"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "Tipo MIME:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Invia come :"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
+msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:321
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "Cliccare qui per la rubrica"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:719
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "Da:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:721
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "Rispondi-a:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:643
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Oggetto:"
 
-#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:723
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:384
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "Inserire i destinatari del messaggio"
 
-#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:725
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 "Inserire gli indirizzi che riceveranno una copia conforme del messaggio"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4853,41 +5791,100 @@ msgstr ""
 "Inserire gli indirizzi che riceveranno una copia conforme del messaggio "
 "senza apparire nell'elenco dei destinatari del messaggio."
 
-#: composer/e-msg-composer.c:528
-#, c-format
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Allega un file"
+
+#: composer/e-msg-composer.c:670
+#, fuzzy, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
 "%s"
 msgstr ""
-"Impossibile aprire il file firma: %s\n"
+"Impossibile il file %s:\n"
 "%s "
 
-#: composer/e-msg-composer.c:716
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr "Errore nel caricare il file: %s"
+
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Salva come..."
 
-#: composer/e-msg-composer.c:727
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "Avviso"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Errore nel salvare il file: %s"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Errore nel caricare il file: %s"
 
-#: composer/e-msg-composer.c:819
+#: composer/e-msg-composer.c:997
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: composer/e-msg-composer.c:877 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
-msgstr "Evolution"
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Errore nel salvare il file: %s"
+
+#: composer/e-msg-composer.c:1055
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "Impossibile scaricare messaggi dal server POP %s: %s"
+
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"Impossibile creare il file di output: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"Impossibile creare il file di output: %s\n"
+" %s"
 
-#: composer/e-msg-composer.c:883
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"Errore nel salvare i messaggi in: %s\n"
+"%s"
+
+#: composer/e-msg-composer.c:1173
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4897,47 +5894,29 @@ msgstr ""
 "\n"
 "Salvare le modifiche?"
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Apri file"
 
-#: composer/e-msg-composer.c:1034
-msgid "That file does not exist."
-msgstr "Il file noon esiste."
-
-#: composer/e-msg-composer.c:1044
-msgid "That is not a regular file."
-msgstr "Non Х un file regolare."
-
-#: composer/e-msg-composer.c:1054
-msgid "That file exists but is not readable."
-msgstr "File esistente ma illeggibile."
-
-#: composer/e-msg-composer.c:1064
-msgid "That file appeared accesible but open(2) failed."
-msgstr "File apparentemente accessibile ma open(2) non ha funzionato."
-
-#: composer/e-msg-composer.c:1086
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"Questo file Х molto grande (piЫ di 100K).\n"
-"Inserire ugualmente?"
-
-#: composer/e-msg-composer.c:1107
-msgid "An error occurred while reading the file."
-msgstr "Si Х verificato un errore durante le lettura del file."
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "Inserici un file di testo..."
 
-#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Componi un nuovo messaggio"
 
-#: composer/e-msg-composer.c:1829
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "Impossibile creare la finestra di composizione."
 
-#: composer/evolution-composer.c:355
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -4945,7 +5924,7 @@ msgstr ""
 "Impossibile creare una finestra di composizione, poichХ non И\n"
 "stata ancora configurata nessuna identitЮ nel componente della posta."
 
-#: composer/evolution-composer.c:370
+#: composer/evolution-composer.c:374
 msgid "Cannot initialize Evolution's composer."
 msgstr "Impossibile inizializzare il composer di Evolution."
 
@@ -4962,304 +5941,122 @@ msgid "calendar information"
 msgstr "informazioni sul calendario"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%m/%d/%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %m/%d/%Y"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1257
-#: widgets/misc/e-dateedit.c:1316 widgets/misc/e-dateedit.c:1495
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1260
-#: widgets/misc/e-dateedit.c:1319 widgets/misc/e-dateedit.c:1498
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Componente di Evolution per il sommario esecutivo."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Fabbrica per il componente del sommario esecutivo di Evolution"
-
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
-"Impossibile inizializzare il componente del Sommario Esecutivo di Evolution."
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"и possibile selezionare una pagina HTML diversa per lo sfondo del Sommario "
-"Esecutivo.\n"
-"\n"
-"Lasciare in bianco per la pagina predefinita. "
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "Apre %s con l'applicazione di GNOME predefinita"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Apre %s con il browser di GNOME predefinito"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Invia un email a %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Cambia la vista con %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Esegui %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Chiudi %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Sposta %s a sinistra"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Sposta %s a destra"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Sposta %s alla riga precedente"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Sposta %s alla riga successiva"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "Configura %s"
-
-#: executive-summary/component/e-summary.c:924
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Impossibile aprire il file HTML:\n"
-"%s "
-
-#: executive-summary/component/e-summary.c:938
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Errore nella lettura dei dati: \n"
-"%s"
-
-#: executive-summary/component/e-summary.c:956
-msgid "File does not have a place for the services.\n"
-msgstr "Il file non ha un posto per i servizi.\n"
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "Aspetto"
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "Sfondo:"
-
-#: executive-summary/component/main.c:62
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"Il componente del sommario esecutivo non riesce a inizializzare Bonobo.\n"
-"Nel caso ci sia un messaggio circa il RootPOA, probabilmente significa che\n"
-"Bonobo И stato compilato con GOAD invece che con OAF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "Fabbrica per il sommario RDF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "Indice RDF"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "Fabbrica per il componente di prova di bonobo."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "Fabbrica per il componente di prova."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Prova servizio bonobo"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Prova servizio"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "Errore"
-
-#: executive-summary/test-service/rdf-summary.c:768
-msgid "Update automatically"
-msgstr "Aggiorna automaticamente"
-
-#: executive-summary/test-service/rdf-summary.c:778
-msgid "Update now"
-msgstr "Aggiorna adesso"
-
-#: executive-summary/test-service/rdf-summary.c:788
-msgid "Update every "
-msgstr "Aggiorna ogni "
-
-#: executive-summary/test-service/rdf-summary.c:796
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "minuti"
-
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "anno"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "anni"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "mese"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "mesi"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "settimana"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "settimane"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "giorni"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "Ora"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "Ore"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "Minuto"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "secondo"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr " secondi"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Oops. Ti sei dimenticato di scegliere una data."
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Oops. Hai scelto un adata non valida"
 
-#: filter/filter-datespec.c:276
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -5269,7 +6066,7 @@ msgstr ""
 "con la data di avvio del filtro o di apertura\n"
 "del vfolder, qualunque essa sia"
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5277,7 +6074,7 @@ msgstr ""
 "La data del messaggio verrЮ confrontata\n"
 "con quella specificata qui."
 
-#: filter/filter-datespec.c:339
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5288,28 +6085,36 @@ msgstr ""
 "\"una settimana fa\", ad esempio."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "L'ora corrente"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "una data specifica"
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "una data relativa a quellla corrente"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Confronta con"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "adesso"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<clicca qui per selezionare una data>"
 
@@ -5334,8 +6139,8 @@ msgstr ""
 "Oops, ti sei dimenticato di scegliere una cartella.\n"
 "Tornare indietro e specificare una cartella valida per consegnarvi la posta."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Scegli Cartella"
 
@@ -5356,38 +6161,59 @@ msgstr ""
 "Errore nell'espressione regolare `%s':\n"
 "%s"
 
-#: filter/filter-part.c:474
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:627
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr "Nome della Regola:"
 
-#: filter/filter-rule.c:631
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr "Senza nome"
 
-#: filter/filter-rule.c:647
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:665
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Esegui le azioni"
 
-#: filter/filter-rule.c:669
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "se tutti i criteri sonon soddisfatti"
 
-#: filter/filter-rule.c:674
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "se qualche criterio Х soddisfatto"
 
-#: filter/filter-rule.c:685
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "Aggiungi criterio"
 
+#: filter/filter-rule.c:771
+#, fuzzy
+msgid "incoming"
+msgstr "In entrata:"
+
+#: filter/filter-rule.c:771
+#, fuzzy
+msgid "outgoing"
+msgstr "In uscita:"
+
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Aggiungi"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Modifica"
+
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Modifica Filtri"
@@ -5429,7 +6255,8 @@ msgid "with all local folders"
 msgstr "con tutte le cartelle locali"
 
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
+#, fuzzy
+msgid "Assign Color"
 msgstr "Assegna Colore"
 
 #: filter/libfilter-i18n.h:4
@@ -5505,90 +6332,91 @@ msgid "Expression"
 msgstr "Espressione"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "Inoltra all'Indirizzo"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "Importante"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "Х"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "Х maggiore di"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "Х minore di"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "non Х"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Mailing list"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Corpo del messaggio"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Header del messaggio"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Il messaggio Х stato ricevuto"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Il messaggio Х stato inviato"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Sposta nella Cartella..."
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr "alle o dopo"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr "Alle o prima"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Leggi"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Destinatari"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Corrispindenza con l'espressione regolare"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Risposto a"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.c:1054
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Punteggio"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Mittente"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Imposta _Status"
 
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Dimensione"
+
 #: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "Assomiglia a"
@@ -5610,7 +6438,8 @@ msgstr "comincia per"
 msgid "Stop Processing"
 msgstr "Arresta processo in corso"
 
-#: filter/libfilter-i18n.h:51 mail/message-list.c:1055
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Oggetto"
 
@@ -5622,162 +6451,313 @@ msgstr "era dopo"
 msgid "was before"
 msgstr "era prima"
 
+#: filter/rule-editor.c:147
+#, fuzzy
+msgid "Rules"
+msgstr "Ruolo"
+
+#: filter/rule-editor.c:240
+#, fuzzy
+msgid "Add Rule"
+msgstr "Aggiungi una regola di Filtro"
+
+#: filter/rule-editor.c:299
+#, fuzzy
+msgid "Edit Rule"
+msgstr "Modifica Interamente"
+
 #: filter/score-editor.c:130
 msgid "Score Rules"
 msgstr "Regole di punteggio"
 
-#: mail/component-factory.c:329
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
+msgstr "Importa"
+
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "Mail"
+msgstr "Email"
+
+#: importers/elm-importer.c:498
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: importers/elm-importer.c:527
+#, fuzzy
+msgid "Elm mail"
+msgstr "Email"
+
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "Aggiungi rubrica"
+
+#: importers/evolution-gnomecard-importer.c:253
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "Impostazioni..."
+
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: importers/pine-importer.c:691
+#, fuzzy
+msgid "Pine mail"
+msgstr "Email principale"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "Componente di Evolution per gestire la posta."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr "Compositore della posta di Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr "Componente dell'indice esecutivo della posta di Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr "Componente di Evolution per visualizzare le cartelle di posta."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr "Fabbrica per il componente delle cartelle di posta di Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr "Fabbrica per il compositore di Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr "Fabbrica per il componente della posta di Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr "Fabbrica per il componente del Sommario della Posta"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "Configurazione della Posta"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "_ProprietЮ"
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Modifica le proprietЮ del file"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Impossibile inizializzare il componente della posta di Evolution."
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-factory.c:211
+#: mail/folder-browser-ui.c:254
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "ProprietЮ per \"%s\""
 
-#: mail/folder-browser-factory.c:213 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
+#: mail/folder-browser-ui.c:256
 msgid "Properties"
 msgstr "ProprietЮ"
 
-#: mail/folder-browser.c:225
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Impossibile creare una directory temporanea: %s"
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "Archivia la ricerca come Cartella Virtuale"
 
-#: mail/folder-browser.c:533
-msgid "VFolder on Subject"
-msgstr "Cartella Virtuale per Oggetto"
+#: mail/folder-browser.c:1238
+msgid "VFolder on _Subject"
+msgstr "Cartella Virtuale per _Oggetto"
 
-#: mail/folder-browser.c:536
-msgid "VFolder on Sender"
-msgstr "Cartella Virtuale per Mittente"
+#: mail/folder-browser.c:1241
+msgid "VFolder on Se_nder"
+msgstr "Cartella virtuale sul _Mittente"
 
-#: mail/folder-browser.c:539
-msgid "VFolder on Recipients"
-msgstr "Cartella Virtuale per Destinatari"
+#: mail/folder-browser.c:1244
+msgid "VFolder on _Recipients"
+msgstr "Cartella virtuale sui _Destinatari"
 
-#: mail/folder-browser.c:542 mail/folder-browser.c:733
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1247
+#, fuzzy
+msgid "VFolder on Mailing _List"
 msgstr "Cartella virtuale sulla Mailng List"
 
-#: mail/folder-browser.c:548
-msgid "Filter on Subject"
+#: mail/folder-browser.c:1253
+#, fuzzy
+msgid "Filter on Sub_ject"
 msgstr "Filtra sull'Oggetto"
 
-#: mail/folder-browser.c:551
-msgid "Filter on Sender"
+#: mail/folder-browser.c:1256
+#, fuzzy
+msgid "Filter on Sen_der"
 msgstr "Filtro sul Mittente"
 
-#: mail/folder-browser.c:554
-msgid "Filter on Recipients"
+#: mail/folder-browser.c:1259
+#, fuzzy
+msgid "Filter on Re_cipients"
 msgstr "Filtro sui Destinatari:"
 
-#: mail/folder-browser.c:557 mail/folder-browser.c:732
-msgid "Filter on Mailing List"
+#: mail/folder-browser.c:1262
+#, fuzzy
+msgid "Filter on _Mailing List"
 msgstr "Filtra sulla Mailng List"
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:1273
 #, fuzzy
 msgid "Resend"
 msgstr "secondo"
 
-#: mail/folder-browser.c:570
-msgid "Save As..."
-msgstr "Salva con nome..."
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
+msgid "_Save As..."
+msgstr "_Salva con nome..."
+
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+msgid "_Print"
+msgstr "S_tampa"
 
-#: mail/folder-browser.c:577
-msgid "Reply to Sender"
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#, fuzzy
+msgid "_Reply to Sender"
 msgstr "Rispondi al Mittente"
 
-#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:61
-msgid "Reply to All"
-msgstr "Rispondi a Tutti"
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "Rispondi a _Tutti"
 
-#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:25
-msgid "Forward"
-msgstr "Inoltra"
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+msgid "Reply to _All"
+msgstr "Rispondi a _Tutti"
 
-#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:27
-msgid "Forward inline"
-msgstr "Vai avanti"
+#: mail/folder-browser.c:1288
+msgid "_Forward"
+msgstr "_Inoltra"
+
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+msgid "Mar_k as Read"
+msgstr "Segna come _Letto"
+
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+msgid "Mark as U_nread"
+msgstr "Segna come _Non Letto"
 
-#: mail/folder-browser.c:586
-msgid "Mark as Read"
-msgstr "Segna come Letto"
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "Importante"
 
-#: mail/folder-browser.c:588
-msgid "Mark as Unread"
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
 msgstr "Segna come Non Letto"
 
-#: mail/folder-browser.c:593
-msgid "Move to Folder..."
-msgstr "Sposta nella Cartella..."
+#: mail/folder-browser.c:1302
+msgid "_Move to Folder..."
+msgstr "_Sposta nella Cartella..."
 
-#: mail/folder-browser.c:595
-msgid "Copy to Folder..."
-msgstr "Copia nella Cartella..."
+#: mail/folder-browser.c:1304
+msgid "_Copy to Folder..."
+msgstr "_Copia nella cartella..."
 
-#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:82
-msgid "Undelete"
-msgstr "Ripristina"
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+msgid "_Undelete"
+msgstr "_Ripristina"
+
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Aggiungi rubrica"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Applica Filtri"
 
-#: mail/folder-browser.c:613
-msgid "Create Rule From Message"
+#: mail/folder-browser.c:1322
+#, fuzzy
+msgid "Create Ru_le From Message"
 msgstr "Crea Regola dal Messaggio"
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:1479
+msgid "Filter on Mailing List"
+msgstr "Filtra sulla Mailng List"
+
+#: mail/folder-browser.c:1480
+msgid "VFolder on Mailing List"
+msgstr "Cartella virtuale sulla Mailng List"
+
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtra sulla Mailng List (%s)"
 
-#: mail/folder-browser.c:736
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Cartella Virtuale sulla Mailng List (%s)"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "Componente di Evolution per gestire la posta."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Compositore della posta di Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Componente dell'indice esecutivo della posta di Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Componente di Evolution per visualizzare le cartelle di posta."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Fabbrica per il componente delle cartelle di posta di Evolution."
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import mbox into Evolution"
+msgstr "Fabbrica per importare i file GnomeCard in Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Fabbrica per il compositore di Evolution."
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports mbox files into Evolution"
+msgstr "Importa i file GnomeCard in Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Fabbrica per il componente della posta di Evolution."
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgstr "Fabbrica per importare i file GnomeCard in Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "Fabbrica per il componente del Sommario della Posta"
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports Outlook Express 4 files into Evolution"
+msgstr "Importa i file GnomeCard in Evolution."
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -5813,41 +6793,73 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+msgid "You have not filled in all of the required information."
+msgstr ""
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Editor degli Account di Evolution"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
+msgid "Evolution Account Editor"
+msgstr "Editor degli Account di Evolution"
+
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "File con la firma:"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Questo messaggio non Х stato inviato\n"
+"\n"
+"Salvare le modifiche?"
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr "(predefinito)"
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 #, fuzzy
 msgid "Disable"
 msgstr "Disabilita."
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "Sicuro di voler cancellare questo account?"
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Ripristina"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "Imposta come mio account predefinito"
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr "Sicuro di voler cancellare questo aaccount delle news?"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:536
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Gestione degli Account di Evolution"
 
-#: mail/mail-account-editor.c:105
-msgid "You have not filled in all of the required information."
-msgstr ""
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
-msgid "Evolution Account Editor"
-msgstr "Editor degli Account di Evolution"
-
 #: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
@@ -5868,11 +6880,11 @@ msgstr "Mail da %s"
 msgid "%s mailing list"
 msgstr "%s mailing list"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
 msgid "Add Filter Rule"
 msgstr "Aggiungi una regola di Filtro"
 
-#: mail/mail-callbacks.c:94
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5884,7 +6896,7 @@ msgstr ""
 "ricevere o scrivere posta.\n"
 "Si desidera configurarlo subito?"
 
-#: mail/mail-callbacks.c:147
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5892,7 +6904,7 @@ msgstr ""
 "х necessario configurare un' identitЮ\n"
 "prima di poter comporre una email."
 
-#: mail/mail-callbacks.c:159
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5900,11 +6912,11 @@ msgstr ""
 "х necessario configurare un trasporto\n"
 "della posta prima di comporla."
 
-#: mail/mail-callbacks.c:203
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr "Non Х stato impostato un sistema di trasporto per la posta"
 
-#: mail/mail-callbacks.c:236
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5912,33 +6924,46 @@ msgstr ""
 "Questo messaggio non ha l'oggetto.\n"
 "Inviare lo stesso?"
 
-#: mail/mail-callbacks.c:309
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr "х necessario specificare dei destinatari per inviare questo messaggio."
 
-#: mail/mail-callbacks.c:352
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr ""
 "х necessario configurare un' identitЮ prima di poter inviare questa email."
 
-#: mail/mail-callbacks.c:592
-#, c-format
-msgid "On %s, %s wrote:\n"
+#: mail/mail-callbacks.c:653
+#, fuzzy, c-format
+msgid "On %s, %s wrote:"
 msgstr "Su %s, %s ha scritto:\n"
 
-#: mail/mail-callbacks.c:774
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Messaggio inoltrato:\n"
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "Sposta messaggio(i) in"
 
-#: mail/mail-callbacks.c:879
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Copia messaggio(i) in"
 
-#: mail/mail-callbacks.c:1147
+#: mail/mail-callbacks.c:1374
+#, fuzzy, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr "Sei sicuro di voler cancellare l'obiettivo `%s'?"
+
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5946,7 +6971,7 @@ msgstr ""
 "х possibile modificare solo i messaggi\n"
 "salvati nella cartella Bozze."
 
-#: mail/mail-callbacks.c:1179
+#: mail/mail-callbacks.c:1430
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
@@ -5955,27 +6980,25 @@ msgstr ""
 "х possibile modificare solo i messaggi\n"
 "salvati nella cartella Bozze."
 
-#: mail/mail-callbacks.c:1212 mail/mail-display.c:90
-msgid "Overwrite file?"
-msgstr "Sovrascrivere il file?"
+#: mail/mail-callbacks.c:1442
+#, fuzzy, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "Sei sicuro di voler cancellare l'obiettivo `%s'?"
 
-#: mail/mail-callbacks.c:1216 mail/mail-display.c:94
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Esiste giЮ un file con questo nome.\n"
-"Sovrascriverlo?"
+#: mail/mail-callbacks.c:1463
+#, fuzzy
+msgid "No Message Selected"
+msgstr "Il messaggio Х stato ricevuto"
 
-#: mail/mail-callbacks.c:1260
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Salva Messaggio con nome..."
 
-#: mail/mail-callbacks.c:1262
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Salva messaggi con nome..."
 
-#: mail/mail-callbacks.c:1376
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5984,15 +7007,60 @@ msgstr ""
 "Errore nel caricare le informazioni dei filtri:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1425 ui/evolution-mail.xml.h:52
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "_Filtri..."
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Stampa Messaggio"
 
-#: mail/mail-callbacks.c:1472
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "Stampa Messaggio non riuscita"
 
-#: mail/mail-config.c:1043 mail/mail-config.c:1046
+#: mail/mail-callbacks.c:1966
+#, fuzzy, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr "Sicuro di voler cancellare questo aaccount delle news?"
+
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+
+#. set window title
+#: mail/mail-config-druid.c:466
+msgid "Evolution Account Wizard"
+msgstr "Guida agli Account di Evolution"
+
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 msgid "Connecting to server..."
 msgstr ""
 
@@ -6006,37 +7074,67 @@ msgid " color"
 msgstr "Colori"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Tipo on supportato"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Account"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Informazioni sull'Account"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "Gestione degli Account"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Accounts"
 msgstr "Account"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Allegato"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Autenticazione"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Authentication Type: "
 msgstr "Tipo di Autenticazione:"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Automatically check for new mail every"
 msgstr "Controlla la posta automaticamente ogni"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "Scrivi"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6052,178 +7150,293 @@ msgstr ""
 "\n"
 "Cliccare su \"Fine\" per salvare le impostazioni."
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "Pr_edefinito"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Completato"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid "Drafts"
 msgstr "Bozza"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Drafts folder:"
 msgstr "Creazione nuova cartella"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "Modifica"
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "Indirizzo Email:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+msgid "Enabled"
+msgstr ""
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Nome e cognome:"
 
-#: mail/mail-config.glade.h:27
-msgid "Highlight citations with "
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "File con la firma:"
+
+#: mail/mail-config.glade.h:43
+msgid "Highlight citations with"
+msgstr ""
+
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "IdentitЮ"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Inline"
+msgstr "_In linea"
+
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Kerberos "
 msgstr "Kerberos 4"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "Configurazione della Posta"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Formato della Mailbox"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "Imposta come mio account predefinito"
 
-#: mail/mail-config.glade.h:34
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "Segna i messaggi come \"Letti\" dopo:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "LDAP Server"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "News"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Optional Information"
 msgstr "Nessuna informazione"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organizzazione:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "Percorso binario di PGP:"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "Prendi un colore"
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "Impossibile inviare il messaggio: senza destinatari."
+
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "maildir"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "_Citato"
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "Ricezione Email"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Ricezione Email"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Ricezione"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Required Information"
 msgstr "Informazioni Utente"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
+
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Security"
+msgstr "_Sicurezza"
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "Scegliere un file binario PGP"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "Invia la posta in formato HTML come predefinito."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "Invio Email"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Invio Email"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 #, fuzzy
 msgid "Sent"
 msgstr "Visto"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Messaggio del Calendario"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "Sposta il messaggio in una nuova cartella"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Configurazione del Server"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Tipo di Server:"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Il Server richiede l'autenticazione"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "File con la firma:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "Sorgenti"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Nessuna informazione"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Sorgenti"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Special Folders"
 msgstr "Cartelle Virtuali"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Standard Unix mbox"
 msgstr "File di mailbox standard per Unix"
 
-#: mail/mail-config.glade.h:68
-msgid "Type"
-msgstr "Tipo"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Username:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6233,203 +7446,243 @@ msgstr ""
 "\n"
 "Cliccare \"successivo\" per cominciare."
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "_Modifica"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
+msgstr ""
 
-#: mail/mail-config-druid.c:99
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config-druid.c:101
-msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what kind of server you use, contact your system administrator or "
-"Internet Service Provider."
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr "secondi."
+
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "Impossibile connettersi al server POP su %s"
+
+#: mail/mail-crypto.c:86
+#, fuzzy
+msgid "Could not create a PGP verification context."
+msgstr "Impossibile connettersi al server POP su %s"
+
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr "Impossibile creare la finestra di composizione."
+
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
 msgstr ""
+"Impossibile creare la directory %s:\n"
+"%s"
 
-#: mail/mail-config-druid.c:105
-msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know which protocol you use, contact your system administrator or "
-"Internet Service Provider."
+#: mail/mail-crypto.c:177
+msgid "Could not create a S/MIME signature context."
 msgstr ""
 
-#: mail/mail-config-druid.c:107
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#. set window title
-#: mail/mail-config-druid.c:445
-msgid "Evolution Account Wizard"
-msgstr "Guida agli Account di Evolution"
+#: mail/mail-crypto.c:240
+msgid "Could not create a S/MIME encryption context."
+msgstr ""
+
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "Impossibile creare la finestra di composizione."
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr "Impossibile creare la finestra di composizione."
 
-#: mail/mail-display.c:194
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Salva Allegati"
 
-#: mail/mail-display.c:234
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Impossibile creare una directory temporanea: %s"
-
-#: mail/mail-display.c:295
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Salva su Disco..."
 
-#: mail/mail-display.c:297
-#, c-format
-msgid "Open in %s..."
-msgstr "Apri in %s..."
-
-#: mail/mail-display.c:299
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "Visualizza In linea"
 
-#: mail/mail-display.c:334
-msgid "External Viewer"
-msgstr "Visualizzatore Esterno"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "Apri in %s..."
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "View Inline (via %s)"
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Nascondi"
 
-#: mail/mail-display.c:1102
-msgid "Open link in browser"
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "Visualizzatore Esterno"
+
+#: mail/mail-display.c:1048
+msgid "Loading message content"
+msgstr "Caricamento del contenuto del messaggio"
+
+#: mail/mail-display.c:1404
+msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1104
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "_Contatto"
+
+#: mail/mail-display.c:1408
 #, fuzzy
-msgid "Save as (FIXME)"
+msgid "Save Link as (FIXME)"
 msgstr "_Obiettivo"
 
-#: mail/mail-display.c:1106
+#: mail/mail-display.c:1410
 #, fuzzy
-msgid "Copy location (FIXME)"
-msgstr "_Contatto"
+msgid "Save Image as..."
+msgstr "Salva come..."
+
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr " %d secondi"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
 
-#: mail/mail-format.c:522
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s allegato"
 
-#: mail/mail-format.c:564
+#: mail/mail-format.c:662
 #, fuzzy
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Impossibile aprire la cartella: la lista dei messaggi era incompleta."
 
 #: mail/mail-format.c:746
-msgid "Loading message content"
-msgstr "Caricamento del contenuto del messaggio"
+msgid "Date"
+msgstr "Data"
 
-#: mail/mail-format.c:1040
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "Indirizzo Email:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr "Da"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "Rispondi-a:"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "A"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Cc:"
+
+#: mail/mail-format.c:1291
 #, fuzzy
 msgid "No GPG/PGP program configured."
 msgstr "Programma GPG/PGP non disponibile."
 
-#: mail/mail-format.c:1055
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "Messaggi cifrati non visualizzati"
 
-#: mail/mail-format.c:1061
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Messaggio cifrato"
 
-#: mail/mail-format.c:1062
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Cliccare l'icona per decifrare."
 
-#: mail/mail-format.c:1152 mail/mail-format.c:1540
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Questo messaggio ha una firma digitale riscontrata come autentica."
 
-#: mail/mail-format.c:1160 mail/mail-format.c:1548
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Questo messaggio ha una firma digitale di cui non Х possibile provare "
 "l'autenticitЮ."
 
-#: mail/mail-format.c:1761
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntatore al sito FTP (%s)"
 
-#: mail/mail-format.c:1773
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntatore al file locale (%s) valido al sito \"%s\""
 
-#: mail/mail-format.c:1777
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntatore a un file locale (%s)"
 
-#: mail/mail-format.c:1811
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Puntatore al sito FTP (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntatore a dati esterni sconosciuti (tipo \"%s\")"
 
-#: mail/mail-format.c:1816
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr "Parte esterna del messaggio malformata."
 
-#: mail/mail-local.c:337
-#, c-format
-msgid "No such folder %s"
-msgstr "Non Х presente la cartella %s"
-
-#: mail/mail-local.c:509
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "Apertura di '%s'"
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiamento del formato della cartella da  \"%s\" a  \"%s\" "
 
-#: mail/mail-local.c:791
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Cambia il formato della cartella da \"%s\" a \"%s\""
-
-#: mail/mail-local.c:814
-msgid "Reconfiguring folder"
-msgstr "Riconfigura Cartella"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:843
-msgid "Closing current folder"
-msgstr "Chiusura cartella corrente"
-
-#: mail/mail-local.c:875
-msgid "Renaming old folder and opening"
-msgstr "Rinomina vecchia cartella e apertura in corso"
-
-#: mail/mail-local.c:893
-msgid "Creating new folder"
-msgstr "Creazione nuova cartella"
-
-#: mail/mail-local.c:907
-msgid "Copying messages"
-msgstr "Copia messaggi"
-
-#: mail/mail-local.c:924
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6438,7 +7691,7 @@ msgstr ""
 "Impossibile salvare le metainfo della cartella; probabilmente non \n"
 "sarЮ piЫ possibile riaprire questa cartella: %s"
 
-#: mail/mail-local.c:963
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6446,7 +7699,16 @@ msgstr ""
 "Se non si riesce piЫ ad aprire questa mailbox, puР essere necessario\n"
 "ripararla manualmente."
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+msgid "You cannot change the format of a non-local folder."
+msgstr ""
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "Configura %s"
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6455,7 +7717,7 @@ msgstr ""
 "Errore durante '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6464,43 +7726,30 @@ msgstr ""
 "Errore durante l'operazione:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:892
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Sto lavorando"
 
-#: mail/mail-mt.c:680 mail/session.c:98
-msgid "Do you accept?"
-msgstr "Accetti?"
-
-#: mail/mail-mt.c:874
-#, fuzzy
-msgid "Evolution progress"
-msgstr "Evolution progress"
-
-#: mail/mail-ops.c:587
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Invio di \"%s\" in corso"
 
-#: mail/mail-ops.c:589
-msgid "Sending message"
-msgstr "Invio messaggio"
-
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:698
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Invio messaggio"
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:717
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "Salvare messaggio %d di %d (uid \"%s\")"
 
-#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "Completato."
 
-#: mail/mail-ops.c:811
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Sposta il messaggio in una nuova cartella"
 
@@ -6514,56 +7763,68 @@ msgstr "Sposta messaggii in %s"
 msgid "Copying messages to %s"
 msgstr "Copia messaggi in %s"
 
-#: mail/mail-ops.c:900
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Spostamento in corso"
 
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Copia in corso"
 
-#: mail/mail-ops.c:978
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scansione delle cartelle in \"%s\" in corso"
 
-#: mail/mail-ops.c:1139
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "Cestino"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "Messaggio inoltrato"
 
-#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "Apertura cartella %s"
 
-#: mail/mail-ops.c:1247
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr "Apertura archivio %s"
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "Apertura cartella %s"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "Riconfigura Cartella"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "Eliminazione cartella"
 
-#: mail/mail-ops.c:1483
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Scaricamento del messaggio %s"
 
-#: mail/mail-ops.c:1550
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Scaricamento messaggi"
 
-#: mail/mail-ops.c:1560
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Scarica in corso del messaggio numero %d di %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1634
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Salvataggio messaggi"
 
-#: mail/mail-ops.c:1713
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6572,12 +7833,7 @@ msgstr ""
 "Impossibile creare il file di output: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1726
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Salvare messaggio %d di %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1740
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6586,11 +7842,11 @@ msgstr ""
 "Errore nel salvare i messaggi in: %s\n"
 "%s"
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "Salvataggio Allegati"
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6599,198 +7855,196 @@ msgstr ""
 "Impossibile creare il file di output: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1857
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Impossibile srivere i dati: %s"
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "_Cerca"
+#: mail/mail-ops.c:2101
+#, c-format
+msgid "Disconnecting from %s"
+msgstr ""
+
+#: mail/mail-search.c:138
+#, fuzzy
+msgid "(Untitled Message)"
+msgstr "(Senza nome)"
+
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Messaggi Multipli"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "Stampa Messaggio"
+
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "Stampa Messaggio"
 
-#: mail/mail-send-recv.c:138
-msgid "Cancelling ..."
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-search.c:315
+#, fuzzy
+msgid "Search Forward"
+msgstr "Inoltra"
+
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
+msgstr "Trova"
+
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "Percorso:"
+
+#: mail/mail-send-recv.c:141
+#, fuzzy
+msgid "Cancelling..."
 msgstr "Annullamento..."
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "Invia e Ricevi la posta"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "Ricezione"
 
-#: mail/mail-send-recv.c:285
-msgid "Updating ..."
+#: mail/mail-send-recv.c:302
+#, fuzzy
+msgid "Updating..."
 msgstr "Aggiornamento in corso..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
-msgid "Waiting ..."
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#, fuzzy
+msgid "Waiting..."
 msgstr "In Attesa..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "Invio"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "Annullato."
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
-msgstr "E` stato scritto un messaggio incompleto nella pipe!"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
+msgstr ""
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Impossibile creare una mbox temporanea `%s': %s"
 
-#: mail/mail-tools.c:188
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (messagio inoltrato)"
-
-#: mail/mail-tools.c:198
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (nessun oggetto)"
-
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Messaggio inoltrato - %s"
 
-#: mail/mail-tools.c:217
-msgid "Forwarded message (no subject)"
-msgstr "Messaggio inoltrato (senza oggetto)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Messaggio inoltrato"
 
-#: mail/mail-tools.c:414
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Messagio Inoltrato-----<br><b>Da:</b> %s<br><b>A:</b> \"\n"
-"\"%s<br><b>Oggetto:</b> %s<br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Messaggio inoltrato"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "Cartelle virtuali"
 
-#: mail/mail-vfolder.c:427
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Nuova Cartella Virtuale"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:60
-msgid "Reply"
-msgstr "Rispondi"
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:66
-msgid "Reply to the sender of this message"
-msgstr "Rispondi all'autore di questo messaggio"
-
-#: mail/mail-view.c:147 ui/evolution-mail.xml.h:64
-msgid "Reply to all recipients of this message"
-msgstr "Rispondi a tutti i destinatari di questo messaggio"
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:29
-msgid "Forward this message"
-msgstr "Inoltra questo messaggio"
-
-#: mail/mail-view.c:154 ui/evolution-mail.xml.h:57
-msgid "Print the selected message"
-msgstr "Stampa il messaggio selezionato"
-
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
-msgid "Delete this message"
-msgstr "Elimina questo messaggio"
-
-#: mail/message-list.c:650
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "Non visto"
 
-#: mail/message-list.c:651
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:652
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Risposto"
 
-#: mail/message-list.c:653
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "Messaggi Multipli Non Visti"
 
-#: mail/message-list.c:654
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "Messaggi Multipli"
 
-#: mail/message-list.c:658
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "Il piЫ basso"
 
-#: mail/message-list.c:659
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "PiЫ basso"
 
-#: mail/message-list.c:663
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "PiЫ alto"
 
-#: mail/message-list.c:664
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "Il piЫ alto"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:921
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "Oggi %I:%M %p"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "Ieri %l %M %p"
 
-#: mail/message-list.c:942
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:952
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1054
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Salvataggio messaggi"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Con la bandierina"
 
-#: mail/message-list.c:1055
-msgid "From"
-msgstr "Da"
-
-#: mail/message-list.c:1055
-msgid "Date"
-msgstr "Data"
-
-#: mail/message-list.c:1055
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Ricevuto"
 
-#: mail/message-list.c:1056
-msgid "To"
-msgstr "A"
-
-#: mail/message-list.c:1056
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "Dimensione"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Cartella"
 
@@ -6818,148 +8072,1456 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Annullare sottoscrizione cartella \"%s\""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 #, fuzzy
 msgid "Manage Subscriptions"
 msgstr "Gestione _Sottoscrizioni..."
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Nome della cartella:"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr "Componente di Evolution per il sommario esecutivo."
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
-msgstr "Tipo di cartella:"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr "Fabbrica per il componente del sommario esecutivo di Evolution"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
-msgstr "Specificare dove creare la cartella:"
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr ""
+"Impossibile inizializzare il componente del Sommario Esecutivo di Evolution."
 
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+#, fuzzy
+msgid "Appointments"
+msgstr "Appuntamento"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "Mostra appuntamenti"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%I:%M%p"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%a %I:%M %p"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Niente indice"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
 msgstr ""
-"Scegliere il file che si vuole importare in Evolution, e selezionare che "
-"tipo di file sia dalla lista.\n"
-"\n"
-"Si puР selezionare \"Automatico\" se non si conosce, Evolution tenterЮ di "
-"arrangiarsi."
 
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
 msgstr ""
-"Importazione di %s\n"
-"Importatore non pronto.\n"
-"Attendere 5 secondi per riprovare."
 
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
 msgstr ""
-"Importazione %s\n"
-"Importazione dell'oggetto %d."
 
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
-"Non c'И un importatore adatto a gestire\n"
-"%s"
 
-#: shell/importer/importer.c:351
-msgid "Importing"
-msgstr "Importazione"
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "Installazione di Evolution"
 
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
+msgstr "Si И verificato un errore nel caricare il file del calendario."
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Errore nel caricare il calendario</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "Mostra obiettivi"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
 msgstr ""
-"Importazione di %s.\n"
-"Avvio di %s"
 
-#: shell/importer/importer.c:372
-#, fuzzy, c-format
-msgid "Error starting %s"
-msgstr "Errore nel caricare: %s"
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
 
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
-msgstr "Errore nel caricare: %s"
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "Sezioni:"
 
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A, %e %B %Y"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "Stampa Messaggio non riuscita"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): impossibile inizializzare Bonobo"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "Annulla"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
 msgstr ""
-"Importazione %s\n"
-"Importazione dell'oggetto 1."
 
-#: shell/importer/importer.c:473
-msgid "Automatic"
-msgstr "Automatico"
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
 
-#: shell/importer/importer.c:523
-msgid "Filename:"
-msgstr "Nome del file:"
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
-msgstr "Scegliere un file"
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
 
-#: shell/importer/importer.c:538
-msgid "File type:"
-msgstr "Tipo di file:"
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
-msgstr "Importa"
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "Variable"
+msgstr "Disabilita."
 
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "Note"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
 msgstr ""
-"Cliccare \"Importa\" per iniziare l'importazione del file in Evolution. "
 
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
-msgstr "UtilitЮ Inportazione di Evolution"
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "No_te:"
 
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
-msgstr "UtilitЮ Importatore di Evolution"
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
 
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "Esistente"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "Sorgenti"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "mese"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "Il piЫ basso"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Test"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "Il piЫ basso"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "Mostra"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "Radio"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Drifting rain"
+msgstr "Descrizione:"
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "Cerca ancora"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "adesso"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Moderate snow"
+msgstr "Aggiorna adesso"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+#, fuzzy
+msgid "Drifting snow grains"
+msgstr "Descrizione:"
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "Email"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
 msgstr ""
-"UtilitЮ di Importazione di Evolution, benvenuti.\n"
-"Questa guida vi accompagnerЮ attraverso il processo \n"
-"di importazione di file esterni in Evoution."
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "Mostra Tutto"
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "Email principale"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "Ricezione Email"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Shallow small hail"
+msgstr "Mostra Tutto"
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Showers of small hail"
+msgstr "Mostra Tutto"
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+msgid "Unknown precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "Errore sconosciuto"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "Inviti alla riunione"
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "Sig.na"
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "Verticale"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Drifting mist"
+msgstr "Mailing list"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Shallow fog"
+msgstr "Mostra Tutto"
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "Chiudi questa finestra"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "Punteggio"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "Mostra obiettivi"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "Chiudi questa finestra"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "Invia"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "Intestazione"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "giorni"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "Agosto"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Raging tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Thunderous tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "Risposto"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Cartelle"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "Tutti i partecipanti"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Visualizza le cartelle a partire da:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "Visualizza opzioni"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "Visualizza"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "VenerdЛ"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "MercoledЛ"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "mese"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr " 1 settimana"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr ""
+"Organizza\n"
+"Tempo"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Mostra obiettivi"
+
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "con tutte le cartelle remote attive"
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "Mostra obiettivi"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "Obiettivi"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
+msgstr ""
+"\n"
+" UnitЮ:"
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Altro"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "Annulla la Selezione"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "Aprile"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "La shell di Evolution."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "Dettagli"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "Annulla Riunione"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Cartelle Virtuali"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Installazione di Evolution"
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6967,27 +9529,23 @@ msgstr ""
 "Questa nuova versione di Evolution richiede l'installazione di file \n"
 "addizionali nella directory personale di Evolution"
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "Cliccare \"OK\" per installare i files, o \"Annulla\" per uscire."
 
-#: shell/e-setup.c:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "Impossibile aggiornare i file correttamente"
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr "File di Evolution installati con successo."
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Sembra che si stia usando Evolution per la prima volta. "
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "Cliccare \"OK\" per installare i files di utente di Evolution sotto"
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6998,16 +9556,14 @@ msgstr ""
 "%s\n"
 "Errore: %s"
 
-#: shell/e-setup.c:230
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
-msgstr ""
-"Impossibile copiare i file in\n"
-"`%s'"
+msgstr "Si Х verificato un errore durante le lettura del file."
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7018,7 +9574,16 @@ msgstr ""
 "Spostarla per permettere l'installazione\n"
 "dei file utente di Evolution."
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7029,7 +9594,58 @@ msgstr ""
 "directorydi Evolution. Spostarla per permettere \n"
 "l'installazione dei file utente di Evolution."
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "Impossibile avere la cartella %s: %s"
+
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"Impossibile copiare i file in\n"
+"`%s'"
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "Copia nella Cartella"
+
+#: shell/e-shell-folder-commands.c:313
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "Sposta nella Cartella..."
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "Elimina questo obiettivo"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "Sei sicuro di voler cancellare l'obiettivo `%s'?"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "Apertura cartella %s"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -7038,15 +9654,15 @@ msgstr ""
 "Impossibile creare la cartella specificata:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "Il nome specificato della cartella non Х valido."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crea nuova cartella"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -7054,27 +9670,133 @@ msgstr ""
 "Il tipo di cartella selezionata non Х valido\n"
 "per l'operazione richiesta. "
 
-#: shell/e-shell-folder-selection-dialog.c:321
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Nuovo..."
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Senza nome)"
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"Scegliere il file che si vuole importare in Evolution, e selezionare che "
+"tipo di file sia dalla lista.\n"
+"\n"
+"Si puР selezionare \"Automatico\" se non si conosce, Evolution tenterЮ di "
+"arrangiarsi."
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+"Importazione di %s\n"
+"Importatore non pronto.\n"
+"Attendere 5 secondi per riprovare."
+
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"Importazione %s\n"
+"Importazione dell'oggetto %d."
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"Non c'И un importatore adatto a gestire\n"
+"%s"
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr "Importazione"
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"Importazione di %s.\n"
+"Avvio di %s"
+
+#: shell/e-shell-importer.c:383
+#, fuzzy, c-format
+msgid "Error starting %s"
+msgstr "Errore nel caricare: %s"
+
+#: shell/e-shell-importer.c:402
+#, c-format
+msgid "Error loading %s"
+msgstr "Errore nel caricare: %s"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"Importazione %s\n"
+"Importazione dell'oggetto 1."
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr "Automatico"
+
+#: shell/e-shell-importer.c:538
+msgid "Filename:"
+msgstr "Nome del file:"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "Scegliere un file"
+
+#: shell/e-shell-importer.c:553
+msgid "File type:"
+msgstr "Tipo di file:"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "Scegli Cartella"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Impossibile trovare Bug Buddy nel tuo $PATH. "
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy non puР essere eseguito."
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -7084,30 +9806,71 @@ msgstr ""
 "per posta, calendario e gestione dei contatti\n"
 "nell'ambito dell'ambiente GNOME desktop.  "
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Vai alla cartella..."
 
-#: shell/e-shell-view.c:148
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Crea un nuovo gruppo di collegamento"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
+msgstr "Non collegato"
+
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
+msgstr "Non collegato"
+
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr "(Nessuna cartella mostrata)"
 
-#: shell/e-shell-view.c:1184
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1411
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s -Evolution %s"
 
-#: shell/e-shell-view.c:1186
+#: shell/e-shell-view.c:1413
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell.c:378
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Impossibile impostare il local storage --%s"
 
-#: shell/e-shell.c:1248
+#: shell/e-shell.c:1311
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -7116,15 +9879,15 @@ msgstr ""
 "Ooops! La visualizzazione di `%s' Х morta inaspettatamente. :-(\\n\n"
 "Il che significa che probabilmente il componente %s si Х impallato"
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Crea un nuovo gruppo di collegamento "
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Nome del Gruppo:"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -7133,144 +9896,269 @@ msgstr ""
 "Si desidera veramente rimuovere il gruppo\n"
 "`%s' dalla barra dei collegamenti?"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "Non rimuovere"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "Rimuovi questo gruppo di collegamento"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "Rimuovi questo gruppo di collegamento"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "Icone _Piccole"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Mostra i collegamenti come icone piccole "
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "Icone _Grandi"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Mostra i collegamenti come icone grandi"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_Nuovo Gruppo..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Crea un nuovo gruppo di collegamento"
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "_Rimuovi Questo Gruppo..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Rimuovi questo gruppo di collegamento"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "_Rimuovi Questo Gruppo..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "Rimuovi questo gruppo di collegamento"
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "_Nascondi la Barra di Collegamento"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Nasconde la barra di collegamento"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "Attiva"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "Rimuovi questo gruppo di collegamento"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
-msgstr "Attiva questo collegamento"
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "Rimuovi questo gruppo di collegamento"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Apri"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Invia il messaggio adesso"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "Nome della Regola:"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "Rimuovi questo gruppo di collegamento"
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Rimuovi il collegamento dalla barra dei collegamenti"
 
-#: shell/e-shortcuts.c:379
+#: shell/e-shortcuts.c:585
 msgid "Error saving shortcuts."
 msgstr "Errore di salvataggio dei collegamenti."
 
-#: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:44
-msgid "_View"
-msgstr "_Visualizza"
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "_Barra di Collegamento"
 
-#: shell/e-storage-set-view.c:649
-msgid "View the selected folder"
-msgstr "Mostra la cartella selezionata"
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "_Contatti"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Senza nome)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Nessun errore"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Errore generico"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "Esiste giЮ una cartella con questo nome"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "Il tipo di cartella specificato non Х valido"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "Errore I/O"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "Spazio insufficiente per creare la cartella"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "Cartella non trovata"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "Funzione non implementata"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "Permesso negato"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "Operazione non supportata"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "Tipo on supportato"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "La shell di Evolution."
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
 
-#: shell/main.c:83
-#, no-c-format
+#: shell/e-task-widget.c:173
+#, fuzzy
+msgid "%s (%d%% complete)"
+msgstr "% Comp_leta:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "Qualunque campo contiene"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "Host:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Nome della cartella:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder type:"
+msgstr "Tipo di cartella:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Specify where to create the folder:"
+msgstr "Specificare dove creare la cartella:"
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+"Cliccare \"Importa\" per iniziare l'importazione del file in Evolution. "
+
+#: shell/importer/import.glade.h:2
+msgid "Evolution Import Utility"
+msgstr "UtilitЮ Inportazione di Evolution"
+
+#: shell/importer/import.glade.h:3
+msgid "Evolution Importer Utility"
+msgstr "UtilitЮ Importatore di Evolution"
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+"UtilitЮ di Importazione di Evolution, benvenuti.\n"
+"Questa guida vi accompagnerЮ attraverso il processo \n"
+"di importazione di file esterni in Evoution."
+
+#: shell/importer/intelligent.c:191
+#, fuzzy
+msgid "Importers"
+msgstr "Importa"
+
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "Non rimuovere"
+
+#: shell/importer/intelligent.c:199
+#, fuzzy
+msgid "Don't ask me again"
+msgstr "Non mostrare questo messagio in futuro."
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
@@ -7294,7 +10182,7 @@ msgstr ""
 "Ci auguriamo che apprezziate il risultato del nostro duro lavoro, e\n"
 "aspettiamo ansiosamente i vostri contributi!\n"
 
-#: shell/main.c:108
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7302,247 +10190,324 @@ msgstr ""
 "Grazie\n"
 "il Team di Evolution.\n"
 
-#: shell/main.c:139
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "Impossibile inizializzare la shell di Evolution."
 
-#: shell/main.c:185
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:186
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:219
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Impossibile inizializzare il sistema di componenti Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Copia"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
+msgstr "Copia selezionato"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "Crea un nuovo contatto"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Cancella un contatto"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "Crea un nuovo contatto"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Trova"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Taglia"
+
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr "Taglia selezionato"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Trova un contatto"
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "Cancella un contatto"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Nuovo contatto"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:50
-msgid "Previews the message to be printed"
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New list"
+msgstr "News"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Incolla"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "Incolla agli appunti"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
 msgstr "Anteprime del messaggio da stampare"
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "Stampa contatti"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:79
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "Seleziona Tutto"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "Cancella un contatto"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Stop"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Arresta caricamento"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "Visualizza Tutto"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "Visualizza tutti i contatti"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "Sorgenti della _Rubrica..."
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "_Contatti"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "_Contatti"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "S_tampa..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "_Ceca Contatti"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:112
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:43
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
+msgstr "_Seleziona Tutto"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "S_trumenti"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 Giorni"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Cambia preferenze"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a new all day Event"
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "Crea un nuovo Evento dell'intera giornata"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Crea un nuovo appuntamento"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Crea un nuovo calendario"
+msgid "Create a new appointment"
+msgstr "Crea un nuovo appuntamento"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "Giorno"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Vai al"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Torna indietro nel tempo"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Vai avanti nel tempo"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "Vai alla _Data"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
-msgstr "Vai a _Oggi"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Vai ad una data specifica"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Vai al presente"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "Mese"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr "Nuovo _Evento"
-
-#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Successivo"
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "Apri calendario"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "Prec"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Nuovo Appuntamento"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 #, fuzzy
 msgid "Previews the calendar to be printed"
 msgstr "Anteprime del messaggio da stampare"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Stampa calendario"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Stampa questo calendario"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Salva con Nome"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "Informazioni Utente"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "Salva calendario con altro nome"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Mostra 1 giorno"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Mostra 1 mese"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Mostra 1 settimana"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Mostra la settimana lavorativa"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
-#: widgets/misc/e-dateedit.c:422
-msgid "Today"
-msgstr "Oggi"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "_Settimana lavorativa"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "Settimana"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "_Appuntamento"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "Impostazioni _Posta..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "_Giorno"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "_Mese"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:39
-msgid "_New"
-msgstr "_Nuovo"
+#: ui/evolution-calendar.xml.h:37
+msgid "_Week"
+msgstr "_Settimana"
 
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "_Apri calendario"
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Chiudi"
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:108
-#: ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "_Salva con nome..."
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "Chiudi questo appuntamento"
 
-#: ui/evolution-calendar.xml.h:45
-msgid "_Week"
-msgstr "_Settimana"
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "Elimina questo appuntamento"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "Barra dagli strimenti principale"
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "Anteprime del messaggio da stampare"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "_Anteprima di stampa"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "Impostazione pagina"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Stampa questo articolo"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "Stampa..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "Salva ed Esci"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "Salva l'appuntamento e chiudi la finestra di dialogo"
+
+#: ui/evolution-comp-editor.xml.h:17
+#, fuzzy
+msgid "Save this item to disk"
+msgstr "Cambia la vista con %s"
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr "Imposta i parametri della pagina per la stampante corrente"
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "_Azioni"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "_File"
 
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Elimina quest'oggetto"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "Elimina..."
 
@@ -7554,27 +10519,12 @@ msgstr "Aiuto"
 msgid "Print En_velope..."
 msgstr "Stampa _Busta..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Stampa questo articolo"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:58 ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Stampa..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Salva _come..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Salva ed Esci"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Salva il contatto e chiudi la finestra di dialogo"
@@ -7591,940 +10541,1011 @@ msgstr "Vedere aiuto in linea"
 msgid "Send _message to contact..."
 msgstr "Invia un _messaggio al contatto..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
-msgid "_File"
-msgstr "_File"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Salva"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Informazioni su questa applicazione"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "Elimina quest'oggetto"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Informazioni su..."
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "Salva l'impegno e chiudi la finestra di dialogo"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "Azio_ni"
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "_Invia contatto a altri..."
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "FIXME: Address _Book..."
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "Invia un _messaggio al contatto..."
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "_Annulla"
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "Annulla Riunione"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "_Taglia"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+msgid "Cancel the meeting for this item"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "Controlla i Nomi"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Forward as i_Calendar"
+msgstr "Inoltra come v_Calendar"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "Annulla"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "Inoltra questo messaggio"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "Annulla la Selezione"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Chiudi questo appuntamento"
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr ""
+"Richiesta\n"
+"Riunione"
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "Cop_ia nella Cartella..."
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr "Pianifica una _Riunione"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Copia"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#, fuzzy
+msgid "Schedule a meeting for this item"
+msgstr "Pianifica una Riunione"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Copia selezionato"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "_Azioni"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Taglia"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "%s -Evolution %s"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Taglia selezionato"
+#: ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "Annullato"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Elimina questo appuntamento"
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "Salva il file corrente"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "Dump XML"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "Scrivi"
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "Fa un Dump della descrizione UI Xml"
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Scrivi un nuovo messaggio"
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "P_rimo oggetto della cartella"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "Editor dei Contatti"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "Inoltra come v_Calendar"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "Vai al successivo"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr "Vuota _Cestino"
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Vai al precedente"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "Dimantica _Password"
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "Obiettivo incompleto"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "Modifica le proprietЮ del file"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
+msgstr "Gestione _Sottoscrizioni..."
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "S_uccessivo"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Incolla"
+#: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Sposta il messaggio in una nuova cartella"
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Incolla agli appunti"
+#: ui/evolution-mail-global.xml.h:14
+#, fuzzy
+msgid "Send / Receive"
+msgstr "Invia e Ricevi"
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "_Precedente"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "Invia la posta in coda e ricevi quella nuova"
 
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Precedente"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "_Anteprima di stampa"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "_Impostazioni Stampa..."
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
+msgstr "_Editor delle Cartelle Virtuali..."
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Impostazione pagina"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
+msgstr "_Filtri..."
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
-msgid "Save"
-msgstr "Salva"
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr "Invia _Messaggio"
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "Salva l'appuntamento e chiudi la finestra di dialogo"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "Impostazioni _Posta..."
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "Salva il file corrente"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "Anteprima"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "Pianifica una _Riunione"
+#: ui/evolution-mail-global.xml.h:23
+#, fuzzy
+msgid "_Send / Receive"
+msgstr "_Invia e Ricevi"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "Pianifica un tipo di riunione"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "Seleziona Tutto"
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "Seleziona ogni cosa"
+#: ui/evolution-mail-list.xml.h:5
+#, fuzzy
+msgid "Cut selected messages"
+msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "Imposta i parametri della pagina per la stampante corrente"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "Nascondi i Messaggi _Selezionati"
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "Richiesta _obiettivo"
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "Nascondi i Messaggi _Cancellati"
+
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
+msgstr "Nascondi i messaggi _Letti"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "_Informazioni su"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Chiudi"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "Segna _Tutti come Letti"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
-msgid "_Contact (FIXME)"
-msgstr "_Contatto"
+#: ui/evolution-mail-list.xml.h:11
+#, fuzzy
+msgid "Mark all visible messages as read"
+msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_Copia"
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "Incolla agli appunti"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_Debug"
+#: ui/evolution-mail-list.xml.h:14
+#, fuzzy
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Sposta il messaggio in una nuova cartella"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:35
-msgid "_Help"
-msgstr "_Aiuto"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "Seleziona _Tutto"
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "_Oggetto"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "Seleziona _Thread"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "_Voce dell'agenda"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "_Ultimo oggetto della Cartella"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "_Invia messaggio"
+#: ui/evolution-mail-list.xml.h:19
+#, fuzzy
+msgid "Select all visible messages"
+msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "_Sposta nella Cartella..."
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "Mostra _Tutto"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "_Note"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "_Incolla"
+#: ui/evolution-mail-list.xml.h:22
+#, fuzzy
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "S_tampa"
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "Stampa il messaggio selezionato"
+
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "LIsta di Messaggi a Thread"
+
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "_Elimina per sempre"
+
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Cartelle"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:104
-#: ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_Inverti Selezione"
+
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Properties..."
 msgstr "_ProprietЮ"
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "_Seleziona Tutto"
-
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:42
-msgid "_Task (FIXME)"
-msgstr "_Obiettivo"
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "LIsta di Messaggi a Thread"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "_Non letto"
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "Apply filter rules to the selected messages"
+msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Aggiungi Servizio"
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "Rispondi a tutti i destinatari di questo messaggio"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "Aggiungi un servizio al Sommario Esecutivo"
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Crea una nuova email"
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Rispondi all'autore di questo messaggio"
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "Impostazioni Sommario Esecutivo..."
+#: ui/evolution-mail-message.xml.h:6
+#, fuzzy
+msgid "Copy selected messages to another folder"
+msgstr "Copia messaggio in una nuova cartella"
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Nuovi Messaggi"
+#: ui/evolution-mail-message.xml.h:7
+msgid "Create _Virtual Folder From Message"
+msgstr "Crea una Cartella Virtuale dal Messaggio"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:3
-msgid "Change the properties of this folder"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:4
-msgid "Compose"
-msgstr "Scrivi"
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
-msgstr "Scrivi un nuovo messaggio"
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail-message.xml.h:12
 #, fuzzy
-msgid "Configure Folder..."
-msgstr "Sposta nella Cartella..."
-
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
-msgstr "Copia messaggio in una nuova cartella"
+msgid "Create a virtual folder for these recipients"
+msgstr "Crea una Cartella Virtuale dal Messaggio"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail-message.xml.h:13
 #, fuzzy
-msgid "Copy selected messages to another folder"
-msgstr "Copia messaggio in una nuova cartella"
-
-#: ui/evolution-mail.xml.h:10
-msgid "Create _Virtual Folder From Message"
+msgid "Create a virtual folder for this mailing list"
 msgstr "Crea una Cartella Virtuale dal Messaggio"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail-message.xml.h:14
 #, fuzzy
-msgid "Delete the selected messages"
-msgstr "Stampa il messaggio selezionato"
+msgid "Create a virtual folder for this sender"
+msgstr "Crea una Cartella Virtuale dal Messaggio"
 
-#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
-msgstr "Visualizza tutti gli header del messaggio"
+#: ui/evolution-mail-message.xml.h:15
+#, fuzzy
+msgid "Create a virtual folder for this subject"
+msgstr "Crea una Cartella Virtuale dal Messaggio"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail-message.xml.h:17
 #, fuzzy
-msgid "Edit Message"
-msgstr "Stampa Messaggio"
+msgid "Display the next important message"
+msgstr "Rispondi all'autore di questo messaggio"
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail-message.xml.h:18
 #, fuzzy
-msgid "Edit the current message"
+msgid "Display the next message"
 msgstr "L'ora corrente"
 
-#: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
-msgstr "Vuota _Cestino"
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
+msgstr "Stampa il messaggio selezionato"
+
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail-message.xml.h:21
+msgid "Display the previous important message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:22
 #, fuzzy
-msgid "Expunge"
-msgstr "_Elimina per sempre"
+msgid "Display the previous message"
+msgstr "Elimina questo messaggio"
+
+#: ui/evolution-mail-message.xml.h:23
+msgid "Display the previous unread message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail-message.xml.h:24
 #, fuzzy
-msgid "Filter on Mailing _List"
+msgid "Filter on Mailing _List..."
 msgstr "Filtra sulla Mailng List"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "Filtro sul _Mittente"
 
-#: ui/evolution-mail.xml.h:21
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "Filtro sui _Destinatari"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "Filtra sull'_Oggetto"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Finaly remove all mails tagged for deletion"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:24
-msgid "Forget _Passwords"
-msgstr "Dimantica _Password"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "Inoltra"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "Inoltra come"
 
-#: ui/evolution-mail.xml.h:28
-msgid "Forward the selected mail to someone"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:30
-msgid "Forward this message in-line with your mail, so you can edit it"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:31
-msgid "Full _Headers"
-msgstr "_Headers completi"
-
-#: ui/evolution-mail.xml.h:32
+#: ui/evolution-mail-message.xml.h:31
 #, fuzzy
-msgid "Hide Deleted Messages"
-msgstr "Nascondi i Messaggi _Cancellati"
-
-#: ui/evolution-mail.xml.h:33
-msgid "Hide S_elected Messages"
-msgstr "Nascondi i Messaggi _Selezionati"
+msgid "Forward _Attached"
+msgstr "Inoltra come"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Hide _Deleted Messages"
-msgstr "Nascondi i Messaggi _Cancellati"
+#: ui/evolution-mail-message.xml.h:32
+#, fuzzy
+msgid "Forward _Inline"
+msgstr "Vai avanti"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Hide _Read messages"
-msgstr "Nascondi i messaggi _Letti"
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Forward _Quoted"
+msgstr "Inoltra come"
 
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail-message.xml.h:34
 #, fuzzy
-msgid "Invert Selection"
-msgstr "_Inverti Selezione"
+msgid "Forward the selected message in the body of a new message"
+msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-mail.xml.h:37
-msgid "Manage _Subscriptions..."
-msgstr "Gestione _Sottoscrizioni..."
+#: ui/evolution-mail-message.xml.h:35
+#, fuzzy
+msgid "Forward the selected message quoted like a reply"
+msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-mail.xml.h:38
-msgid "Mar_k as Read"
-msgstr "Segna come _Letto"
+#: ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward the selected message to someone"
+msgstr "Sposta il messaggio in una nuova cartella"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Mark All as R_ead"
-msgstr "Segna _Tutti come Letti"
+#: ui/evolution-mail-message.xml.h:37
+#, fuzzy
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail-message.xml.h:39
 #, fuzzy
-msgid "Mark As Read"
-msgstr "Segna come Letto"
+msgid "Load _Images"
+msgstr "Messaggio inoltrato"
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail-message.xml.h:41
 #, fuzzy
-msgid "Mark As U_nread"
-msgstr "Segna come _Non Letto"
+msgid "Mark as I_mportant"
+msgstr "Importante"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Mark as U_nread"
-msgstr "Segna come _Non Letto"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
+msgstr "Segna come Non Letto"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 #, fuzzy
 msgid "Mark the selected messages as having been read"
 msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "Stampa il messaggio selezionato"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Stampa il messaggio selezionato"
+
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "Stampa il messaggio selezionato"
+
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Sposta"
 
-#: ui/evolution-mail.xml.h:46
-msgid "Move message to a new folder"
-msgstr "Sposta il messaggio in una nuova cartella"
-
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Move selected messages to another folder"
 msgstr "Sposta il messaggio in una nuova cartella"
 
-#: ui/evolution-mail.xml.h:48
-msgid "Open in New Window"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "Successivo"
 
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail-message.xml.h:52
 #, fuzzy
-msgid "Open the current message in a new window"
+msgid "Next Important Message"
+msgstr "Rispondi all'autore di questo messaggio"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Messaggio"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Seleziona _Thread"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Messaggi Multipli"
+
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Open the selected message in a new window"
 msgstr "Invia il messaggio adesso"
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
-msgid "Print Preview of message..."
-msgstr "Anteprima di stampa"
+msgid "Open the selected message in the composer to re-send it"
+msgstr "Stampa il messaggio selezionato"
+
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "Anteprime del messaggio da stampare"
 
-#: ui/evolution-mail.xml.h:55
-msgid "Print message to the printer"
-msgstr "Stampa messaggio con la stampante"
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "Precedente"
 
-#: ui/evolution-mail.xml.h:56
+#: ui/evolution-mail-message.xml.h:60
 #, fuzzy
-msgid "Print message..."
+msgid "Previous Important Message"
 msgstr "Stampa Messaggio"
 
-#: ui/evolution-mail.xml.h:59
-msgid "Redirect (FIXME: implement me)"
-msgstr ""
-
-#: ui/evolution-mail.xml.h:62
-msgid "Reply to _All"
-msgstr "Rispondi a _Tutti"
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Stampa Messaggio"
 
-#: ui/evolution-mail.xml.h:63
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
-msgid "Reply to all"
-msgstr "Rispondi a Tutti"
+msgid "Previous Unread Message"
+msgstr "Stampa Messaggio"
 
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
-msgid "Reply to sender"
-msgstr "Rispondi al Mittente"
+msgid "Print Message..."
+msgstr "Stampa Messaggio"
 
-#: ui/evolution-mail.xml.h:67
-msgid "S_ource"
-msgstr "S_orgente"
+#: ui/evolution-mail-message.xml.h:65
+#, fuzzy
+msgid "Print Preview..."
+msgstr "Anteprima di stampa"
 
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
-msgid "Save the message into a new file"
-msgstr "Salva il messaggio in una cartella specificata"
+msgid "Print this message"
+msgstr "Stampa Messaggio"
 
-#: ui/evolution-mail.xml.h:70 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Seleziona _Tutto"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "Rispondi"
 
-#: ui/evolution-mail.xml.h:71
-msgid "Select _Thread"
-msgstr "Seleziona _Thread"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "Rispondi a Tutti"
 
-#: ui/evolution-mail.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
-msgid "Send / Receive"
-msgstr "Invia e Ricevi"
+msgid "S_earch Message"
+msgstr "Salva Messaggio con nome..."
 
-#: ui/evolution-mail.xml.h:73
-msgid "Send a reply to the person who sent you this mail"
+#: ui/evolution-mail-message.xml.h:72
+#, fuzzy
+msgid "Save the message as a text file"
+msgstr "Salva il messaggio in una cartella specificata"
+
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:74
-msgid "Send a single mail in reply to all the selected mail"
+#: ui/evolution-mail-message.xml.h:74
+msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:75
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
-msgstr "Invia la posta in coda e ricevi quella nuova"
+msgid "Show Full _Headers"
+msgstr "_Headers completi"
 
-#: ui/evolution-mail.xml.h:77
-msgid "Send queued mail and retrieve new mail"
-msgstr "Invia la posta in coda e ricevi quella nuova"
+#: ui/evolution-mail-message.xml.h:76
+#, fuzzy
+msgid "Show message in the normal style"
+msgstr ""
+"La data deve essere inserita nel formato:\n"
+"\n"
+"%s"
 
-#: ui/evolution-mail.xml.h:78
-msgid "Show _All"
-msgstr "Mostra _Tutto"
+#: ui/evolution-mail-message.xml.h:77
+#, fuzzy
+msgid "Show message with all email headers"
+msgstr "Copia messaggio in una nuova cartella"
 
-#: ui/evolution-mail.xml.h:80
-msgid "Threaded Message list"
-msgstr "LIsta di Messaggi a Thread"
+#: ui/evolution-mail-message.xml.h:78
+#, fuzzy
+msgid "Show the raw email source of the message"
+msgstr "Allegare un file al messaggio"
 
-#: ui/evolution-mail.xml.h:81
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Stampa il messaggio selezionato"
 
-#: ui/evolution-mail.xml.h:83
+#: ui/evolution-mail-message.xml.h:80
 #, fuzzy
-msgid "VFolder on Mailing _List"
+msgid "VFolder on Mailing _List..."
 msgstr "Cartella virtuale sulla Mailng List"
 
-#: ui/evolution-mail.xml.h:84
-msgid "VFolder on Se_nder"
+#: ui/evolution-mail-message.xml.h:81
+#, fuzzy
+msgid "VFolder on Se_nder..."
 msgstr "Cartella virtuale sul _Mittente"
 
-#: ui/evolution-mail.xml.h:85
-msgid "VFolder on _Recipients"
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "VFolder on _Recipients..."
 msgstr "Cartella virtuale sui _Destinatari"
 
-#: ui/evolution-mail.xml.h:86
-msgid "VFolder on _Subject"
+#: ui/evolution-mail-message.xml.h:83
+#, fuzzy
+msgid "VFolder on _Subject..."
 msgstr "Cartella Virtuale per _Oggetto"
 
-#: ui/evolution-mail.xml.h:87
-msgid "View Raw Message Source"
-msgstr "Vedi la sorgente grezza del messaggio"
-
-#: ui/evolution-mail.xml.h:88
-msgid "Virtual Folder _Editor..."
-msgstr "_Editor delle Cartelle Virtuali..."
-
-#: ui/evolution-mail.xml.h:89
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_Applica Filtri"
 
-#: ui/evolution-mail.xml.h:90
-msgid "_Attachment"
-msgstr "_Allegato"
-
-#: ui/evolution-mail.xml.h:91
-msgid "_Copy to Folder..."
-msgstr "_Copia nella cartella..."
+#: ui/evolution-mail-message.xml.h:85
+#, fuzzy
+msgid "_Copy to Folder"
+msgstr "Copia nella Cartella"
 
-#: ui/evolution-mail.xml.h:92
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "_Crea Filtro dal Messaggio"
 
-#: ui/evolution-mail.xml.h:94
-msgid "_Expunge"
-msgstr "_Elimina per sempre"
-
-#: ui/evolution-mail.xml.h:95
-msgid "_Filters..."
-msgstr "_Filtri..."
-
-#: ui/evolution-mail.xml.h:96 ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "_Cartelle"
-
-#: ui/evolution-mail.xml.h:97
-msgid "_Forward"
-msgstr "_Inoltra"
-
-#: ui/evolution-mail.xml.h:98
-msgid "_Inline"
-msgstr "_In linea"
-
-#: ui/evolution-mail.xml.h:99 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Inverti Selezione"
-
-#: ui/evolution-mail.xml.h:100
-msgid "_Mail Message"
-msgstr "Invia _Messaggio"
-
-#: ui/evolution-mail.xml.h:101
-msgid "_Mail Settings..."
-msgstr "Impostazioni _Posta..."
-
-#: ui/evolution-mail.xml.h:102
-msgid "_Move to Folder..."
-msgstr "_Sposta nella Cartella..."
+#: ui/evolution-mail-message.xml.h:88
+#, fuzzy
+msgid "_Forward Message"
+msgstr "Messaggio inoltrato"
 
-#: ui/evolution-mail.xml.h:103
-msgid "_Open Selected Items"
-msgstr "_Apri i Selezionati"
+#: ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Message Display"
+msgstr "Messaggio"
 
-#: ui/evolution-mail.xml.h:105
-msgid "_Quoted"
-msgstr "_Citato"
+#: ui/evolution-mail-message.xml.h:90
+#, fuzzy
+msgid "_Move to Folder"
+msgstr "Sposta nella Cartella..."
 
-#: ui/evolution-mail.xml.h:106
-msgid "_Reply"
-msgstr "_Rispondi"
+#: ui/evolution-mail-message.xml.h:91
+#, fuzzy
+msgid "_Normal Display"
+msgstr "Visualizza"
 
-#: ui/evolution-mail.xml.h:107
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
-msgid "_Resend Messages"
+msgid "_Open Message"
 msgstr "Messaggio del Calendario"
 
-#: ui/evolution-mail.xml.h:109
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
-msgid "_Save Message As..."
-msgstr "Salva Messaggio con nome..."
+msgid "_Re-send Message"
+msgstr "Messaggio del Calendario"
 
-#: ui/evolution-mail.xml.h:110
-#, fuzzy
-msgid "_Send / Receive"
-msgstr "_Invia e Ricevi"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Chiudi questa finestra"
 
-#: ui/evolution-mail.xml.h:111
-msgid "_Threaded"
-msgstr "A _Thread"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr "Personali_zza barre degli strumenti..."
 
-#: ui/evolution-mail.xml.h:113
-msgid "_Undelete"
-msgstr "_Ripristina"
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "Personalizza"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "Personalizza barre degli strumenti"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "_Chiudi"
+
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "_Visualizza"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Allega"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Chiudi il file corrente"
 
 #: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Delete all but signature"
+msgstr "Elimina tutte le Ricorrenze"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Cifra Messaggio con PGP"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "F_ormato"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "Inserici un file di testo..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Inserici un file come testo nel messaggio"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Inserici un file di testo..."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Apri un file"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "Cifra con PGP"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "Firma con PGP"
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "Salva _Bozza"
+#, fuzzy
+msgid "S/MIME Encrypt"
+msgstr "Cifra con PGP"
 
 #: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Salva nella cartella..."
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "Salva"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Salva con Nome"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr "Salva _Bozza"
+
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Salva nella cartella..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "Salva il file corrente"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Salva il file corrente con un nome diverso"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Salva il messaggio in una cartella specificata"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Invia"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Invia piЫ _Tardi"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Invia piЫ _tardi"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Invia la posta in formato HTML"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Invia il messaggio piЫ tardi"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Invia il messaggio adesso"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Invia questo messaggio adesso"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Mostra / nascondi allegati"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Mostra _allegati"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Mostra allegati"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "Frima questo messaggio con la chiave PGP"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Frima questo messaggio con la chiave PGP"
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Mostra/nasconde il campo BCC"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr "Mostra/nasconde il campo CC"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Mostra/nasconde il campo di selezione Da"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Mostra/nasconde il campo Rispondi A"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "_Allegato"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "Campo _Bcc"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "_Debug"
+
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Delete all"
+msgstr "_Elimina"
+
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "Campo _Da"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Inserisci"
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
-msgstr "Inserisci un file di testo..."
-
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Apri..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "Campo _Rispondi-a:"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "_Sicurezza"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "_Aiuto"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Aggiungi una cartella alla lista di cartelle a cui sei iscritto"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "C_artelle"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Aggiorna Lista"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Aggiorna la Lista delle Cartelle"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Elimina una cartella dalla lista delle cartelle a cui sei iscritto"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Iscrizione"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Annulla iscrizione"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "Asseg_na obiettivo"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Cerca ancora"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "Richiesta _appuntamento"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Rifai"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Rifai l'azione annullata"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Sostituisci"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Sostituisci una stringa"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "Rispondi a _Tutti"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "_Invia un report"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "_Salta ricorrenza"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "Salva l'impegno e chiudi la finestra di dialogo"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "Cerca ancora la stessa stringa"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "Cerca una stringa"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Annulla"
+#: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Task"
+msgstr "Nuovo Obiettivo"
 
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "Annulla l'ultima azione"
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "Elimina questo obiettivo"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
-msgid "_Appointment (FIXME)"
-msgstr "_Appuntamento"
+#: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Re_fresh Task"
+msgstr "Aggiorna Lista"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "_Segna come Completato"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "_Rispondi"
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "Copy selected task"
+msgstr "_Apri i Selezionati"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Crea un nuovo obiettivo"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "Elimina questo obiettivo"
+
+#: ui/evolution-tasks.xml.h:7
+#, fuzzy
+msgid "Delete selected tasks"
+msgstr "Elimina questo obiettivo"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Nuovo Obiettivo"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "Incolla agli appunti"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Salva obiettivo come qualcos'altro"
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "Preferenze degli Obiettivi..."
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "Impostazioni _Posta..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_Obiettivo"
 
@@ -8532,242 +11553,363 @@ msgstr "_Obiettivo"
 msgid "About Evolution..."
 msgstr "Informazioni su Evolution..."
 
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Chiudi questa finestra"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
-msgstr "Personali_zza barre degli strumenti..."
+#: ui/evolution.xml.h:2
+#, fuzzy
+msgid "Add to _Shortcut Bar"
+msgstr "_Barra di Collegamento"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Personalizza"
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the name of this folder"
+msgstr "Cambia la vista con %s"
 
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Personalizza barre degli strumenti"
+#, fuzzy
+msgid "Copy this folder"
+msgstr "Copia nella Cartella"
 
 #: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "Creazione nuova cartella"
+
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "Rimuovi il collegamento dalla barra dei collegamenti"
+
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Creazione nuova cartella"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "Elimina quest'oggetto"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Visualizza un'altra cartella"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "E_sci"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:16
 #, fuzzy
-msgid "Evolution _Window"
+msgid "Evolution _FAQ"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:10
-msgid "Evolution bar _shortcut"
-msgstr "_Barra del Collegamenti di Evolution"
+#: ui/evolution.xml.h:17
+#, fuzzy
+msgid "Evolution _Window"
+msgstr "Evolution"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Esci dal Programma"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "Primi _Passi"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Importa un formato di file esterno"
 
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "Barra dagli strimenti principale"
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "Sposta il messaggio in una nuova cartella"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:24
+msgid "Open in New _Window"
+msgstr ""
+
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Open this folder in an other window"
+msgstr "Invia il messaggio adesso"
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Mostra informazioni su Evolution"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Invia un Bug Report"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "Invia un _Bug Report"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "Inoltra un Bug Report usando Bug Buddy."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:30
+#, fuzzy
+msgid "Toggle"
+msgstr "Ruolo"
+
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Mostra/nasconde la barra delle cartelle"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Mostra/nasconde la barra dei collegamenti"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "Toggle whether we are working offline."
+msgstr "Mostra/nasconde il campo di selezione Da"
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "Uso del manger dei C_ontatti"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "Uso del _Calendario"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "Uso del programma di _Posta"
 
-#: ui/evolution.xml.h:24
-msgid "Work Offline"
-msgstr "Non collegato"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr "Mostra la cartella selezionata"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "_Informazioni su Evolution..."
 
-#: ui/evolution.xml.h:26
-msgid "_Actions"
-msgstr "_Azioni"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "_Appuntamento"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "_Contatto"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Copia"
+
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "Barra delle _Cartelle"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Vai alla cartella..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "_Importa un file..."
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "_Indice"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "_Invia messaggio"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "Sposta"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Nuovo"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "_Nuova Cartella"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Apri..."
+
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "_Barra di Collegamento"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "_Barra di Collegamento"
 
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "_Obiettivo"
+
+#: ui/evolution.xml.h:64
+#, fuzzy
+msgid "_Work Offline"
+msgstr "Non collegato"
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "Impostazioni _Posta..."
+
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "Address Cards"
+msgstr "biglietto da visita"
+
+#: views/addressbook/galview.xml.h:2
+#, fuzzy
+msgid "By Company"
+msgstr "Ditta"
+
+#: views/addressbook/galview.xml.h:3
+#, fuzzy
+msgid "Phone List"
+msgstr "Tipi di Telefono"
+
+#: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "By Sender"
+msgstr "Mittente"
+
+#: views/mail/galview.xml.h:2
+#, fuzzy
+msgid "By Status"
+msgstr "Status"
+
+#: views/mail/galview.xml.h:3
+#, fuzzy
+msgid "By Subject"
+msgstr "Oggetto"
+
+#: views/mail/galview.xml.h:4
+#, fuzzy
+msgid "Messages"
+msgstr "Messaggio"
+
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With Category"
+msgstr "Categoria:"
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
-msgid "Tentative"
-msgstr "Tentativo"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Occupato"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "Assente"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr "Nessuna informazione"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr "_Invita altri..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 msgid "_Options"
 msgstr "_Opzioni"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
 msgstr "Mostra s_olo le ore lavorative"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr "Vista _allargata"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
 msgstr "A_ggiorna libero/Occupato"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
 msgstr "_Autopick"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
 msgstr "_Tutto il Personale e le Risorse"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr "Tutto il _Personale e una Risorsa"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
 msgstr "Personale _Richiesto"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
 msgstr "Personale Richiesto e _una risorsa"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 msgid "Meeting _start time:"
 msgstr "_Inizio appuntamento ore:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 msgid "Meeting _end time:"
 msgstr "T_ermine dell' appuntamento ore:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
 msgstr "Tutti i partecipanti"
 
-#: widgets/menus/gal-view-menus.c:177
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "Vista _Corrente"
 
-#: widgets/menus/gal-view-menus.c:196
+#: widgets/menus/gal-view-menus.c:259
 msgid "Define Views"
 msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "LMMGVSD"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Adesso"
 
-#: widgets/misc/e-cell-date-edit.c:242
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Oggi"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: widgets/misc/e-cell-date-edit.c:723
+#: widgets/misc/e-cell-date-edit.c:731
 #, fuzzy, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -8775,21 +11917,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "settimana"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "Cestino"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "Transazione fallita"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "News"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Errore sconosciuto: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "Altro"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
+#: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Editor dei Contatti"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "Salva Ricerca"
 
-#: widgets/misc/e-filter-bar.c:237
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "Ricerca Avanzata"
 
-#: widgets/misc/e-filter-bar.c:317
-msgid "Advanced ..."
-msgstr "Avanzato ..."
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "Mostra Tutto"
+
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "Avanzato..."
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
@@ -8799,6 +12028,10 @@ msgstr "Informazione"
 msgid "Warning"
 msgstr "Avviso"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Errore"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Domanda"
@@ -8812,67 +12045,692 @@ msgstr "Messaggio"
 msgid "Don't show this message again."
 msgstr "Non mostrare questo messagio in futuro."
 
-#: widgets/misc/e-search-bar.c:148
+#: widgets/misc/e-search-bar.c:155
 msgid "Sear_ch"
 msgstr "_Cerca"
 
-#: views/addressbook/galview.xml.h:1
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
+msgid "The Personal Addressbook Server"
+msgstr "Server Personale della Rubrica"
+
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
+msgid "The Personal Calendar Server; calendar factory"
+msgstr "Server personale del Calendario; fabbrica del calendario"
+
+#: wombat/wombat.c:173
+msgid "setup_vfs(): could not initialize GNOME-VFS"
+msgstr "setup_vfs(): impossibile inizializzare GNOME-VFS"
+
+#: wombat/wombat.c:185
+msgid "init_corba(): could not initialize GNOME"
+msgstr "init_corba(): impossibile inizializzare GNOME"
+
+#: wombat/wombat.c:198
+msgid "init_bonobo(): could not initialize Bonobo"
+msgstr "init_bonobo(): impossibile inizializzare Bonobo"
+
 #, fuzzy
-msgid "Adress Cards"
-msgstr "biglietto da visita"
+#~ msgid "Set task view preferences"
+#~ msgstr "Cambia preferenze"
 
-#: views/addressbook/galview.xml.h:2
 #, fuzzy
-msgid "By Company"
-msgstr "Ditta"
+#~ msgid "TasksPreferences"
+#~ msgstr "Preferenze degli Obiettivi..."
+
+#~ msgid "C_ontacts..."
+#~ msgstr "C_ontatti..."
+
+#~ msgid "_Company:"
+#~ msgstr "_Compagnia:"
+
+#~ msgid "As _Minicards"
+#~ msgstr "Come _Minicards"
+
+#~ msgid "As _Table"
+#~ msgstr "Come _Tabella"
+
+#~ msgid ""
+#~ "We were unable to open this addressbook.  This either\n"
+#~ "means you have entered an incorrect URI, or have tried\n"
+#~ "to access an LDAP server and don't have LDAP support\n"
+#~ "compiled in.  If you've entered a URI, check the URI for\n"
+#~ "correctness and reenter.  If not, you probably have\n"
+#~ "attempted to access an LDAP server.  If you wish to be\n"
+#~ "able to use LDAP, you'll need to download and install\n"
+#~ "OpenLDAP and recompile and install Evolution.\n"
+#~ msgstr ""
+#~ "Impossibile aprire questa rubruca.  Questo significa che \n"
+#~ "Х stata inserita una URI non corretta, oppure che si Х\n"
+#~ "cercato di accedere a un server LDAP senza avere il supporto \n"
+#~ "LDAP compilato.  Se si Х inserita una URI, controllarne \n"
+#~ "la correttezza ed inserirla nuovamente.  Altrimenti, Х \n"
+#~ "probabile che si sia cercato di accedere ad un server LDAP. \n"
+#~ "Se si desidera usare LDAP, Х necessario scaricare e \n"
+#~ "installare OpenLDAP, ricompilare e reinstallare Evolution.\n"
+
+#~ msgid "SASL"
+#~ msgstr "SASL"
+
+#~ msgid "Find..."
+#~ msgstr "Trova..."
+
+#~ msgid "label26"
+#~ msgstr "label26"
+
+#~ msgid "Open calendar"
+#~ msgstr "Apri calendario"
+
+#~ msgid "Save calendar"
+#~ msgstr "Salva calendario"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>Errore nel caricare il calendario:<br>Metodo non supportato"
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "Interruzione avviso sonoro dopo"
+
+#~ msgid "Colors"
+#~ msgstr "Colori"
+
+#~ msgid "Enable snoozing for"
+#~ msgstr "Attiva la suoneria per "
+
+#~ msgid "Highlight"
+#~ msgstr "Evidenzia"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "Scadenze per oggi:"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Non ancora scaduti"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Non ancora scaduti:"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "Compiti scaduti:"
+
+#~ msgid "TaskPad"
+#~ msgstr "TaskPad"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Cronometra fino al termine"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Avviso visivo"
+
+#~ msgid "Work week"
+#~ msgstr "Settimana lavorativa"
+
+#~ msgid "Edit Task"
+#~ msgstr "Modifica Obiettivo"
+
+#~ msgid "Percent complete"
+#~ msgstr "Percentuale completata"
+
+#~ msgid "Mark the task complete"
+#~ msgstr "Segna l'obiettivo come raggiunto"
+
+#~ msgid "Edit this task..."
+#~ msgstr "Modifica questo obiettivo..."
+
+#~ msgid "Edit the task"
+#~ msgstr "Modifica obiettivo"
+
+#~ msgid "Go to Today"
+#~ msgstr "Vai a Oggi"
+
+#~ msgid "Component successfully updated."
+#~ msgstr "Compnente aggiornata con successo."
+
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "Impossibile caricare il file del calendario!\n"
+
+#~ msgid "I couldn't read your calendar file!\n"
+#~ msgstr "Impossibile leggere il file del calendario!\n"
+
+#~ msgid "This is a reply from someone who was uninvited!"
+#~ msgstr "Questa И la risposta di qualcuno che non era stato invitato!"
+
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "Impossibile aggiornare l'archivio del calendario."
+
+#~ msgid "I couldn't delete the calendar component!\n"
+#~ msgstr "Impossibile cancellare il componente del calendario!\n"
+
+#~ msgid "Component successfully deleted."
+#~ msgstr "Componente aggiornato con successo."
+
+#~ msgid "I don't recognize this type of calendar component."
+#~ msgstr "Tipo di componente del calendario non riconosciuto."
+
+#~ msgid "Add to Calendar"
+#~ msgstr "Aggiungi al Calendario"
 
-#: views/addressbook/galview.xml.h:3
 #, fuzzy
-msgid "Phone List"
-msgstr "Tipi di Telefono"
+#~ msgid " Tentative "
+#~ msgstr "Tentativo"
+
+#~ msgid "Update Calendar"
+#~ msgstr "Aggiorna Calendario"
+
+#~ msgid "Attendee address"
+#~ msgstr "Indirizzo del partecipante"
+
+#~ msgid "Attendees: "
+#~ msgstr "Partecipanti:"
+
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr ""
+#~ "Annulla \n"
+#~ "Riunione"
+
+#~ msgid "Organizer: "
+#~ msgstr "Organizzatore: "
+
+#~ msgid ""
+#~ "Publish\n"
+#~ "Event"
+#~ msgstr ""
+#~ "Pubblica\n"
+#~ "Evento"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "Appuntamenti di Base:"
+
+#~ msgid "Show a dialog"
+#~ msgstr "Mostra un dialogo"
+
+#~ msgid "_Starting date:"
+#~ msgstr "Data di _inizio:"
+
+#~ msgid "label21"
+#~ msgstr "label21"
+
+#~ msgid "label55"
+#~ msgstr "label55"
 
-#: views/mail/galview.xml.h:1
 #, fuzzy
-msgid "By Sender"
-msgstr "Mittente"
+#~ msgid "Summary contains"
+#~ msgstr "Email contiene"
 
-#: views/mail/galview.xml.h:2
 #, fuzzy
-msgid "By Status"
-msgstr "Status"
+#~ msgid "Comment contains"
+#~ msgstr "Il nome contiene"
 
-#: views/mail/galview.xml.h:3
 #, fuzzy
-msgid "By Subject"
-msgstr "Oggetto"
+#~ msgid "Has category"
+#~ msgstr "Categoria:"
+
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "Impossibile verificare il file di blocco per %s: %s"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Scansione delle cartelle IMAP in corso"
 
-#: views/mail/galview.xml.h:4
 #, fuzzy
-msgid "Messages"
-msgstr "Messaggio"
+#~ msgid "%s is not a selectable folder"
+#~ msgstr "Mostra la cartella selezionata"
+
+#~ msgid "Inline attachment"
+#~ msgstr "allegato inlinea"
+
+#~ msgid "Send as:"
+#~ msgstr "Invia come :"
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Impossibile aprire il file firma: %s\n"
+#~ "%s "
+
+#~ msgid "That is not a regular file."
+#~ msgstr "Non Х un file regolare."
+
+#~ msgid "That file exists but is not readable."
+#~ msgstr "File esistente ma illeggibile."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "File apparentemente accessibile ma open(2) non ha funzionato."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "Questo file Х molto grande (piЫ di 100K).\n"
+#~ "Inserire ugualmente?"
+
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr "%I:%M:%S %p%n"
+
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#~ msgid ""
+#~ "You can select a different HTML page for the background of the Executive "
+#~ "Summary.\n"
+#~ "\n"
+#~ "Just leave it blank for the default"
+#~ msgstr ""
+#~ "и possibile selezionare una pagina HTML diversa per lo sfondo del Sommario "
+#~ "Esecutivo.\n"
+#~ "\n"
+#~ "Lasciare in bianco per la pagina predefinita. "
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "Apre %s con l'applicazione di GNOME predefinita"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "Apre %s con il browser di GNOME predefinito"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "Invia un email a %s"
+
+#~ msgid "Run %s"
+#~ msgstr "Esegui %s"
+
+#~ msgid "Close %s"
+#~ msgstr "Chiudi %s"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "Sposta %s a sinistra"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "Sposta %s a destra"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Sposta %s alla riga precedente"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "Sposta %s alla riga successiva"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Impossibile aprire il file HTML:\n"
+#~ "%s "
+
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "Il file non ha un posto per i servizi.\n"
+
+#~ msgid "Appearance"
+#~ msgstr "Aspetto"
+
+#~ msgid "Background:"
+#~ msgstr "Sfondo:"
+
+#~ msgid ""
+#~ "Executive summary component could not initialize Bonobo.\n"
+#~ "If there was a warning message about the RootPOA, it probably means\n"
+#~ "you compiled Bonobo against GOAD instead of OAF."
+#~ msgstr ""
+#~ "Il componente del sommario esecutivo non riesce a inizializzare Bonobo.\n"
+#~ "Nel caso ci sia un messaggio circa il RootPOA, probabilmente significa che\n"
+#~ "Bonobo И stato compilato con GOAD invece che con OAF."
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "Fabbrica per il sommario RDF."
+
+#~ msgid "RDF Summary"
+#~ msgstr "Indice RDF"
+
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Fabbrica per il componente di prova di bonobo."
+
+#~ msgid "Factory for the test component."
+#~ msgstr "Fabbrica per il componente di prova."
+
+#~ msgid "Test bonobo service"
+#~ msgstr "Prova servizio bonobo"
+
+#~ msgid "Test service"
+#~ msgstr "Prova servizio"
+
+#~ msgid "Update automatically"
+#~ msgstr "Aggiorna automaticamente"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Inoltra all'Indirizzo"
+
+#~ msgid "VFolder on Subject"
+#~ msgstr "Cartella Virtuale per Oggetto"
+
+#~ msgid "VFolder on Sender"
+#~ msgstr "Cartella Virtuale per Mittente"
+
+#~ msgid "VFolder on Recipients"
+#~ msgstr "Cartella Virtuale per Destinatari"
+
+#~ msgid "Mark as Read"
+#~ msgstr "Segna come Letto"
+
+#~ msgid "Move to Folder..."
+#~ msgstr "Sposta nella Cartella..."
+
+#~ msgid "Copy to Folder..."
+#~ msgstr "Copia nella Cartella..."
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "Cambia il formato della cartella da \"%s\" a \"%s\""
+
+#~ msgid "Closing current folder"
+#~ msgstr "Chiusura cartella corrente"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Rinomina vecchia cartella e apertura in corso"
+
+#~ msgid "Copying messages"
+#~ msgstr "Copia messaggi"
+
+#~ msgid "Do you accept?"
+#~ msgstr "Accetti?"
 
-#: views/tasks/galview.xml.h:2
 #, fuzzy
-msgid "With Category"
-msgstr "Categoria:"
+#~ msgid "Evolution progress"
+#~ msgstr "Evolution progress"
 
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
-msgid "The Personal Addressbook Server"
-msgstr "Server Personale della Rubrica"
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Scarica in corso del messaggio numero %d di %d (uid \"%s\")"
 
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
-msgstr "Server personale del Calendario; fabbrica del calendario"
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Salvare messaggio %d di %d (uid \"%s\")"
 
-#: wombat/wombat.c:173
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): impossibile inizializzare GNOME-VFS"
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "E` stato scritto un messaggio incompleto nella pipe!"
 
-#: wombat/wombat.c:185
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): impossibile inizializzare GNOME"
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (messagio inoltrato)"
 
-#: wombat/wombat.c:198
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): impossibile inizializzare Bonobo"
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Fwd: (nessun oggetto)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Messaggio inoltrato (senza oggetto)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Messagio Inoltrato-----<br><b>Da:</b> %s<br><b>A:</b> \"\n"
+#~ "\"%s<br><b>Oggetto:</b> %s<br>"
+
+#~ msgid "Print the selected message"
+#~ msgstr "Stampa il messaggio selezionato"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "File di Evolution installati con successo."
+
+#~ msgid "Activate"
+#~ msgstr "Attiva"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "Attiva questo collegamento"
+
+#~ msgid "Find a contact"
+#~ msgstr "Trova un contatto"
+
+#~ msgid "View All"
+#~ msgstr "Visualizza Tutto"
+
+#~ msgid "View all contacts"
+#~ msgstr "Visualizza tutti i contatti"
+
+#~ msgid "5 Days"
+#~ msgstr "5 Giorni"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Crea un nuovo calendario"
+
+#~ msgid "Day"
+#~ msgstr "Giorno"
+
+#~ msgid "New _Event"
+#~ msgstr "Nuovo _Evento"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Apri calendario"
+
+#~ msgid "Prev"
+#~ msgstr "Prec"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Salva calendario con altro nome"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Apri calendario"
+
+#~ msgid "About this application"
+#~ msgstr "Informazioni su questa applicazione"
+
+#~ msgid "About..."
+#~ msgstr "Informazioni su..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "Azio_ni"
+
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "FIXME: Address _Book..."
+
+#~ msgid "C_lear"
+#~ msgstr "_Annulla"
+
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "Controlla i Nomi"
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "Cop_ia nella Cartella..."
+
+#~ msgid "Dump XML"
+#~ msgstr "Dump XML"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "Fa un Dump della descrizione UI Xml"
+
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "P_rimo oggetto della cartella"
+
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "Editor dei Contatti"
+
+#~ msgid "Go to the next item"
+#~ msgstr "Vai al successivo"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "Vai al precedente"
+
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "Obiettivo incompleto"
+
+#~ msgid "N_ext"
+#~ msgstr "S_uccessivo"
+
+#~ msgid "Pre_vious"
+#~ msgstr "_Precedente"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "_Impostazioni Stampa..."
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "Pianifica un tipo di riunione"
+
+#~ msgid "Select everything"
+#~ msgstr "Seleziona ogni cosa"
+
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "Richiesta _obiettivo"
+
+#~ msgid "_About..."
+#~ msgstr "_Informazioni su"
+
+#~ msgid "_Item (FIXME)"
+#~ msgstr "_Oggetto"
+
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "_Voce dell'agenda"
+
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "_Ultimo oggetto della Cartella"
+
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "_Invia messaggio"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "_Sposta nella Cartella..."
+
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_Note"
+
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "_Non letto"
+
+#~ msgid "Add Service"
+#~ msgstr "Aggiungi Servizio"
+
+#~ msgid "Add a new service to the Executive Summary"
+#~ msgstr "Aggiungi un servizio al Sommario Esecutivo"
+
+#~ msgid "Create a new email"
+#~ msgstr "Crea una nuova email"
+
+#~ msgid "Executive Summary Settings..."
+#~ msgstr "Impostazioni Sommario Esecutivo..."
+
+#~ msgid "New Mail"
+#~ msgstr "Nuovi Messaggi"
+
+#, fuzzy
+#~ msgid "Configure Folder..."
+#~ msgstr "Sposta nella Cartella..."
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Copia messaggio in una nuova cartella"
+
+#, fuzzy
+#~ msgid "Expunge"
+#~ msgstr "_Elimina per sempre"
+
+#, fuzzy
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "Nascondi i Messaggi _Cancellati"
+
+#, fuzzy
+#~ msgid "Invert Selection"
+#~ msgstr "_Inverti Selezione"
+
+#, fuzzy
+#~ msgid "Mark As Read"
+#~ msgstr "Segna come Letto"
+
+#, fuzzy
+#~ msgid "Mark As U_nread"
+#~ msgstr "Segna come _Non Letto"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Sposta il messaggio in una nuova cartella"
+
+#, fuzzy
+#~ msgid "Print Preview of message..."
+#~ msgstr "Anteprima di stampa"
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Stampa messaggio con la stampante"
+
+#, fuzzy
+#~ msgid "Reply to all"
+#~ msgstr "Rispondi a Tutti"
+
+#, fuzzy
+#~ msgid "Reply to sender"
+#~ msgstr "Rispondi al Mittente"
+
+#~ msgid "S_ource"
+#~ msgstr "S_orgente"
+
+#, fuzzy
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr "Invia la posta in coda e ricevi quella nuova"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "Vedi la sorgente grezza del messaggio"
+
+#~ msgid "_Reply"
+#~ msgstr "_Rispondi"
+
+#, fuzzy
+#~ msgid "_Save Message As..."
+#~ msgstr "Salva Messaggio con nome..."
+
+#~ msgid "_Threaded"
+#~ msgstr "A _Thread"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Salva nella cartella..."
+
+#~ msgid "Send the message now"
+#~ msgstr "Invia il messaggio adesso"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "Inserisci un file di testo..."
+
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "Asseg_na obiettivo"
+
+#~ msgid "Meeting Re_quest (FIXME)"
+#~ msgstr "Richiesta _appuntamento"
+
+#~ msgid "Redo"
+#~ msgstr "Rifai"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Rifai l'azione annullata"
+
+#~ msgid "Replace"
+#~ msgstr "Sostituisci"
+
+#~ msgid "Replace a string"
+#~ msgstr "Sostituisci una stringa"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "Rispondi a _Tutti"
+
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "_Invia un report"
+
+#~ msgid "S_kip Occurrence (FIXME)"
+#~ msgstr "_Salta ricorrenza"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "Cerca ancora la stessa stringa"
+
+#~ msgid "Search for a string"
+#~ msgstr "Cerca una stringa"
+
+#~ msgid "Undo"
+#~ msgstr "Annulla"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Annulla l'ultima azione"
+
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "_Segna come Completato"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "_Rispondi"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "_Barra del Collegamenti di Evolution"
 
+#~ msgid "Advanced ..."
+#~ msgstr "Avanzato ..."
diff --git a/po/ja.po b/po/ja.po
index e4ac4170ea..545858278b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution CVS-20010612\n"
-"POT-Creation-Date: 2001-06-12 17:40+0900\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-06-12 19:52+0900\n"
 "Last-Translator: Akira TAGOH <tagoh@gnome.gr.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -13,11 +13,19 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3324
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr "Evolution ╓ь VCard ╔у╔║╔╓╔К╓Р╔╓╔С╔щ║╪╔х╓╧╓К╔у╔║╔╞╔х╔Й"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr "Evolution ╓ь VCard ╔у╔║╔╓╔К╓Р╔╓╔С╔щ║╪╔х"
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "л╬╩и: "
 
-#: addressbook/backend/ebook/e-card.c:3326
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +33,7 @@ msgstr ""
 "\n"
 "л╬а╟: "
 
-#: addressbook/backend/ebook/e-card.c:3327
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,7 +41,7 @@ msgstr ""
 "\n"
 "  ╥и╬н(а╟╓д╓╠):     "
 
-#: addressbook/backend/ebook/e-card.c:3328
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -41,13 +49,13 @@ msgstr ""
 "\n"
 "  ю╚:      "
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3330
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -55,7 +63,7 @@ msgstr ""
 "\n"
 "  ╔у╔║╔ъ╔Й║╪л╬:     "
 
-#: addressbook/backend/ebook/e-card.c:3331
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -63,7 +71,7 @@ msgstr ""
 "\n"
 "  ╥и╬н(╦Е╓д╓╠):     "
 
-#: addressbook/backend/ebook/e-card.c:3345
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -71,7 +79,7 @@ msgstr ""
 "\n"
 "цбю╦фЭ: "
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -79,7 +87,7 @@ msgstr ""
 "\n"
 "╫╩╫Й:"
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -87,7 +95,7 @@ msgstr ""
 "\n"
 "м╧йьхж╧Ф:  "
 
-#: addressbook/backend/ebook/e-card.c:3359
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -95,25 +103,25 @@ msgstr ""
 "\n"
 "  "
 
-#: addressbook/backend/ebook/e-card.c:3360
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3361
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -121,7 +129,7 @@ msgstr ""
 "\n"
 "  м╧йьхж╧Ф: "
 
-#: addressbook/backend/ebook/e-card.c:3364
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -129,13 +137,13 @@ msgstr ""
 "\n"
 "  ╧Я:       "
 
-#: addressbook/backend/ebook/e-card.c:3377
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3389
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -143,7 +151,7 @@ msgstr ""
 "\n"
 "ееоцхж╧Ф:\n"
 
-#: addressbook/backend/ebook/e-card.c:3392
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -151,7 +159,7 @@ msgstr ""
 "\n"
 "ееоцхж╧Ф:"
 
-#: addressbook/backend/ebook/e-card.c:3416
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -159,7 +167,7 @@ msgstr ""
 "\n"
 "╔А║╪╔К:\n"
 
-#: addressbook/backend/ebook/e-card.c:3419
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -167,7 +175,7 @@ msgstr ""
 "\n"
 "╔А║╪╔К:"
 
-#: addressbook/backend/ebook/e-card.c:3438
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -175,7 +183,7 @@ msgstr ""
 "\n"
 "╔А║╪╔И: "
 
-#: addressbook/backend/ebook/e-card.c:3444
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -183,7 +191,7 @@ msgstr ""
 "\n"
 "╔©╔╓╔Ю╔╬║╪╔С: "
 
-#: addressbook/backend/ebook/e-card.c:3452
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -191,7 +199,7 @@ msgstr ""
 "\n"
 "╥п╟ч: "
 
-#: addressbook/backend/ebook/e-card.c:3456
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -199,7 +207,7 @@ msgstr ""
 "\n"
 "╩е╩Ж╓н©╕лЁ: "
 
-#: addressbook/backend/ebook/e-card.c:3468
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -207,7 +215,7 @@ msgstr ""
 "\n"
 "ах©╔: "
 
-#: addressbook/backend/ebook/e-card.c:3469
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -215,7 +223,7 @@ msgstr ""
 "\n"
 "  ╪рл╬:  "
 
-#: addressbook/backend/ebook/e-card.c:3470
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -223,7 +231,7 @@ msgstr ""
 "\n"
 "  иТ╫П:  "
 
-#: addressbook/backend/ebook/e-card.c:3471
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -231,7 +239,7 @@ msgstr ""
 "\n"
 "  иТ╫П2: "
 
-#: addressbook/backend/ebook/e-card.c:3472
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -239,7 +247,7 @@ msgstr ""
 "\n"
 "  иТ╫П3: "
 
-#: addressbook/backend/ebook/e-card.c:3473
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -247,7 +255,7 @@ msgstr ""
 "\n"
 "  иТ╫П4: "
 
-#: addressbook/backend/ebook/e-card.c:3477
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -255,7 +263,7 @@ msgstr ""
 "\n"
 "╤хлЁй╛лН: "
 
-#: addressbook/backend/ebook/e-card.c:3478
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -273,7 +281,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3491
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -281,7 +289,7 @@ msgstr ""
 "\n"
 "г╓╟у╓нй╦╩ЗнС: "
 
-#: addressbook/backend/ebook/e-card.c:3494
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -289,36 +297,24 @@ msgstr ""
 "\n"
 "╦ЬЁ╚╦╟: "
 
-#: addressbook/backend/ebook/e-card.c:3755
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr "йё©Т╓н VCard"
 
-#: addressbook/backend/ebook/e-card.c:3763
+#: addressbook/backend/ebook/e-card.c:4045
 #, c-format
 msgid "VCard for %s"
 msgstr "%s ╓н VCard"
 
-#: addressbook/backend/ebook/e-destination.c:244
-msgid "???"
-msgstr "???"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "Evolution ╓ь VCard ╔у╔║╔╓╔К╓Р╔╓╔С╔щ║╪╔х╓╧╓К╔у╔║╔╞╔х╔Й"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Evolution ╓ь VCard ╔у╔║╔╓╔К╓Р╔╓╔С╔щ║╪╔х"
-
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo ╓н╫И╢Э╡╫╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
@@ -331,14 +327,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook ╓о╔М║╪╔и╓╣╓Л╓ф╓╓╓ч╓╩╓С\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "wombat ╔╣║╪╔п╓РЁ╚╩о╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "wombat ╓РЁ╚╩о╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
@@ -348,729 +344,812 @@ msgid "Could not read pilot's Address application block"
 msgstr ""
 "╔я╔╓╔М╔ц╔х╓н╔╒╔и╔Л╔╧╔╒╔в╔Й╔╠║╪╔╥╔Г╔С╔ж╔М╔ц╔╞╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr "╔╒╔и╔Л╔╧╓Р╔щ╔ц╔в╔╒╔ц╔в╓╧╓К╓©╓А╓н Bonobo ╔Ё╔С╔х╔М║╪╔К"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "╔╒╔и╔Л╔╧╓Ри╫╪╗╓╧╓К╓©╓А╓н Bonobo ╔Ё╔С╔х╔М║╪╔К"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "╔╒╔и╔Л╔╧д╒╓Ри╫╪╗╓╧╓К Bonobo ╔Ё╔С╔х╔М║╪╔К╓н╔╣╔С╔в╔К╓г╓╧"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Evolution ╔╒╔и╔Л╔╧д╒╔ъ╔к╔╚║╪╔и╓Ри╫╪╗╓╧╓К╔Ё╔С╔х╔М║╪╔К"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Evolution ╔╒╔и╔Л╔╧д╒╔ъ╔к╔╚║╪╔и╔с╔Е║╪╔╒"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "╔Ё╔С╔©╔╞╔х╓Р╟╥╓╕╓©╓А╓н Evolution ╔Ё╔С╔щ║╪╔м╔С╔х"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr "╔╒╔и╔Л╔╧д╒╔ъ╔к╔╚║╪╔и╔Ё╔С╔х╔М║╪╔К╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr "╔╒╔и╔Л╔╧д╒╓н╔╒╔и╔Л╔╧и╫╪╗╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr "╔╒╔и╔Л╔╧д╒╓н╔╒╔и╔Л╔╧╓Р╔щ╔ц╔в╔╒╔ц╔в╓╧╓К╓©╓А╓н╔у╔║╔╞╔х╔Й"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr "Evolution ╔╒╔и╔Л╔╧д╒╔Ё╔С╔щ║╪╔м╔С╔х╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr "╔╣╔С╔в╔К╔╒╔и╔Л╔╧д╒╔Ё╔С╔х╔М║╪╔К╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "LDAP ╔╣║╪╔п"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "╔у╔║╔╓╔К"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "л╓цн╓н╔╒╔и╔Л╔╧д╒╪Ойл"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "╓й╓╥ (ф©л╬╔Б║╪╔и)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "╔я╔╧╔О║╪╔и"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "л╓цн╓нг╖╬з╪Ойл"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "╔ы║╪╔╧╔╗╔С╔х╔Й"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "╔╣╔ж╔╗╔С╔х╔Й"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "╓╧╓ы╓ф╓н╔╗╔С╔х╔Й"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr "л╓цн╓н╔╧╔Ё║╪╔в╪Ойл"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr "╔п╔╓╔С╔иDN:"
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr "FIXME ╔п╔╓╔С╔и DN ╓н╔ь╔К╔в╔ф╔╜╔╧╔х╓г╓╧"
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "╓Ё╓н╔я╔╧╔О║╪╔и╓Р╣╜╡╠"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "╔ш╔╧╔х:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr "FIXME ╔ш╔╧╔х╔ь╔К╔в╔ф╔╜╔╧╔х╓г╓╧"
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "╔К║╪╔х DN:"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr "FIXME ╔К║╪╔х DN ╔ь╔К╔в╔ф╔╜╔╧╔х╓г╓╧"
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "╔щ║╪╔х:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr "FIXME ╔щ║╪╔х╔ь╔К╔в╔ф╔╜╔╧╔х╓г╓╧"
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "╦║╨Вхо╟о:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "г╖╬зйЩ╪╟:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr "╬Е╣И LDAP ╔╙╔в╔╥╔Г╔С"
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "╔я╔╧:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr "FIXME ╔я╔╧╔ь╔К╔в╔ф╔╜╔╧╔х╓г╓╧"
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "б╦╨ъ╓╥╓й╓╓╬Л╧Г╔я╔╧╓Р╨Ню╝╓╧╓К"
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "╔╒╔и╔Л╔╧д╒╓Рйт╫╦"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "╔╒╔и╔Л╔╧д╒╓кди╡ц"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"╓╒╓й╓©╓н╩Щ╓д╔╒╔и╔Л╔╧д╒╓Ра╙бР╓╥, ╓╫╓Л╓к╓д╓╓╓ф╓н╢ьо╒╓╥╓©╬ПйС╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓"
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "л╬а╟:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr "FIXME л╬а╟╔ь╔К╔в╔ф╔╜╔╧╔х╓г╓╧"
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "юБлю:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr "FIXME юБлю╔ь╔К╔в╔ф╔╜╔╧╔х╓г╓╧"
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "ди╡ц"
+msgid "Addressbook Sources"
+msgstr "╔╒╔и╔Л╔╧д╒╓н╔╫║╪╔╧"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "╨О╫Э"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "л╬а╟"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "ди╡ц(_A)"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "йт╫╦(_E)"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "╓╫╓нб╬╓н╔Ё╔С╔©╔╞╔х"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "%s ╓н╔я╔╧╔О║╪╔и╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "╔╒╔и╔Л╔╧д╒╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С"
+
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+"╓Ё╓н╔╒╔и╔Л╔╧д╒╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С. ╓Ё╓Л╓о╦М╓ц╓©URI\n"
+"╓РфЧно╓╥╓©╓╚, ╓╒╓К╓╓╓о LDAP ╔╣║╪╔п╓╛мН╓а╓ф╓╓╓К╓╚╓н╓и╓а╓И╓╚\n"
+"╓Р╟улё╓╥╓ч╓╧"
+
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+"╓Ё╓н Evolution ╓н╔п║╪╔╦╔Г╔С╓о LDAP ╔╣╔щ║╪╔х╓Р╓╩╓╨╓к╔Ё╔С╔я╔╓╔К\n"
+"╓╣╓Л╓ф╓╓╓ч╓╧. Evolution ╓г LDAP ╓Р╩х╓╓╓©╓╓╓й╓И╓п, ╡╪╣╜╔Й╔С╔╞\n"
+"╓╚╓И OpenLDAP ╓Р╪Хфю╓╥╓©╦Е CVS ╔╫║╪╔╧╓╚╓И╔в╔М╔╟╔И╔Ю╓Р\n"
+"╔Ё╔С╔я╔╓╔К╓╥╓й╓╠╓Л╓п╓й╓Й╓ч╓╩╓С\n"
+
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+"╓Ё╓н╔╒╔и╔Л╔╧д╒╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©. ╔я╔╧╓╛б╦╨ъ╓╥, ╔╒╔╞╔╩╔╧╦╒\n"
+"╓Р╩Щ╓ц╓ф╓╓╓К╓╚╓и╓╕╓╚╔а╔╖╔ц╔╞╓╥╓ф╓╞╓ю╓╣╓╓"
+
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
+msgstr "╔у╔ё║╪╔К╔и╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "л╬а╟╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "╔А║╪╔К╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "л╬а╟╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "╔у╔╘╔К╔ю╔ж╔И╔╕╔╤╓╛и╫╪╗╓╧╓К URI"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "╪Гмв╓й╔А║╪╔К"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "╔А║╪╔К2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "╔А║╪╔К3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "╔у╔║╔╓╔К╓Ра╙бР"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "©╥╣╛╔Ё╔С╔©╔╞╔х╓Р╨Ню╝╓╥╓ч╓╧"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "╔╒╔и╔Л╔╧д╒╓Рйт╫╦"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "╔Ё╔С╔©╔╞╔х╬ПйС╓нйт╫╦"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "╔Ё╔С╔©╔╞╔х╓ьди╡ц"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "╔А║╪╔К╔╒╔и╔Л╔╧:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "╔╞╔╗╔Й╓Рл╣╦З"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "╔╞╔╗╔Й╓Рм╜╦З (╢М╦╠╓г╓╧!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Evolution ╓н╔╒╔и╔Л╔╧д╒╓нл╬а╟а╙бР╔╓╔С╔©║╪╔у╔╖║╪╔╧"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr "╔╒╔и╔Л╔╧д╒╓нл╬а╟а╙бР╔╓╔С╔©║╪╔у╔╖║╪╔╧╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "╨О╫Э"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "╓╧╓ы╓ф╨О╫Э"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+msgid "Send HTML Mail?"
+msgstr "HTML ╔А║╪╔К╓РаВ©╝╓╥╓ч╓╧╓╚?"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "йя╧╧╦Е╓н╔Ё╔С╔©╔╞╔х:"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "╔А╔ц╔╩║╪╔╦╓н╪У©╝╪т"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "л╬а╟╓Ра╙бР"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "╪║╓╚╓Ил╬а╟╓Ра╙бР:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "╔╚╔ф╔╢╔Й:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "╦║╨В(_S)"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "╣╜г╟фЭ(_v):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "╩е╩Ж(_u)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "╩е╩Ж╓н FAX(_F)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "╔Ё╔С╔©╔╞╔х(_o)..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 #: calendar/gui/dialogs/event-page.glade.h:2
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "╔╚╔ф╔╢╔Й(_t)..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "╔Ё╔С╔©╔╞╔х╔╗╔г╔ё╔©"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor.c:115
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "╬э╨ы"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "йлл╬:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "╟Лхл"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "©╥╣╛ееоц╪Ойл"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "╔н║╪╔х(_t):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "ах©╔:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "ееоц╪Ойл"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1283
-msgid "Primary Email"
-msgstr "╪Гмв╓й╔А║╪╔К"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "HTML ╔А║╪╔К╓Р╪У©╝╣Ж╡д(_H)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "╔╕╔╖╔ж╔з║╪╔╦╓н URL:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:94
-msgid "_Add"
-msgstr "ди╡ц(_A)"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "╫╩╫Й(_A)..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "╔╒╔╥╔╧╔©╔С╔х╓нл╬а╟(_A):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "цбю╦фЭ(_B):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "╩е╩Ж(_B)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "╡Я╪р(_C):"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "╔Ё╔С╔©╔╞╔х(_C)..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:725 mail/mail-config.glade.h:95
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:108
-#: ui/evolution-task-editor-dialog.xml.h:69 ui/evolution-tasks.xml.h:9
-#: ui/evolution.xml.h:47
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "╨О╫Э(_D)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "ц╢еЖиТ╫П(_D):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "╔у╔К╔м║╪╔Ю(_F)..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "╡х(_H)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "©╕╪О(_J):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "╔ч╔м║╪╔╦╔Ц╓нл╬а╟(_M):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "╔Б╔п╔╓╔К(_M)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "╔к╔ц╔╞╔м║╪╔Ю(_N):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "╩ЖлЁ╫Й(_O):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "юЛлГ©╕(_P):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "гш╤Ж╪т(_S):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "╓Ё╓Л╓ом╧йьй╙╓н╫╩╫Й╓г╓╧"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "╔Ё╔С╔©╔╞╔х╓Р╨О╫Э╓╥╓ч╓╧╓╚?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "╓Ё╓н╔Ё╔С╔©╔╞╔х╓о╓Ё╓Л╓И╓н╔╚╔ф╔╢╔Й╓к╫Йб╟╓╥╓ф╓╓╓ч╓╧:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1241
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "╔╒╔╥╔╧╔©╔С╔х"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/contact-editor/e-contact-editor.c:1309
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "╩е╩Ж"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "╩е╩Ж 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "╩е╩Ж╓н FAX"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "╦ф╓слА╓╥"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "╪ж"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "╡Я╪р"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "╡х"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "╡х 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "╡х╓н FAX"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "╔Б╔п╔╓╔К"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
-#: addressbook/contact-editor/e-contact-editor.c:1311
-#: mail/mail-config.glade.h:55
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "╓╫╓нб╬"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "╓╫╓нб╬╓н FAX"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "╔щ╔╠╔ы╔К"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "╔в╔И╔╓╔ч╔Й"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "╔И╔╦╔╙"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "╔ф╔Л╔ц╔╞╔╧"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:724
-msgid "Email 2"
-msgstr "╔А║╪╔К2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:725
-msgid "Email 3"
-msgstr "╔А║╪╔К3"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "╔Ё╔С╔©╔╞╔х╓Р╨О╫Э╓╥╓ч╓╧╓╚?"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:234
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "╔Ё╔С╔©╔╞╔х╓н╢й╟вди╡ц"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:236
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "╓╧╓ы╓фйт╫╦"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:277
-#: addressbook/gui/widgets/e-addressbook-view.c:699
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "╔у╔К╔м║╪╔Ю"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:283
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "╔А║╪╔К"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "╫╩╫Й 2(_2):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "╔╚╔й╔ю"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "╫╩╫Й╔а╔╖╔ц╔╞"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "╧Я(_y):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "╔у╔ё╔С╔И╔С╔и"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "╔╒╔А╔Й╔╚"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "╫╩╫Й(_A):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "╩т(_C):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "╩Д╫Ях╒(_P):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "м╧йьхж╧Ф(_Z):"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "╔у╔К╔м║╪╔Ю╓н╔а╔╖╔ц╔╞"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Esq."
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "Miss"
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Mr."
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Mrs."
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Ms."
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "л╬(_F):"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "ю╚(_L):"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "╔ъ╔и╔К╔м║╪╔Ю(_M):"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "╥и╬н(╦Е╓д╓╠)(_S):"
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "╥и╬н(а╟╓д╓╠)(_T):"
 
-#: addressbook/gui/component/addressbook.c:341
-#, c-format
-msgid "Enter password for %s"
-msgstr "%s ╓н╔я╔╧╔О║╪╔и╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓"
-
-#: addressbook/gui/component/addressbook.c:369
-msgid "Unable to open addressbook"
-msgstr "╔╒╔и╔Л╔╧д╒╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С"
-
-#: addressbook/gui/component/addressbook.c:376
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or the LDAP server\n"
-"is down"
-msgstr ""
-"╓Ё╓н╔╒╔и╔Л╔╧д╒╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С. ╓Ё╓Л╓о╦М╓ц╓©URI\n"
-"╓РфЧно╓╥╓©╓╚, ╓╒╓К╓╓╓о LDAP ╔╣║╪╔п╓╛мН╓а╓ф╓╓╓К╓╚╓н╓и╓а╓И╓╚\n"
-"╓Р╟улё╓╥╓ч╓╧"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "╔у╔║╔╓╔Кл╬:"
 
-#: addressbook/gui/component/addressbook.c:381
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
-msgstr ""
-"╓Ё╓н Evolution ╓н╔п║╪╔╦╔Г╔С╓о LDAP ╔╣╔щ║╪╔х╓Р╓╩╓╨╓к╔Ё╔С╔я╔╓╔К\n"
-"╓╣╓Л╓ф╓╓╓ч╓╧. Evolution ╓г LDAP ╓Р╩х╓╓╓©╓╓╓й╓И╓п, ╡╪╣╜╔Й╔С╔╞\n"
-"╓╚╓И OpenLDAP ╓Р╪Хфю╓╥╓©╦Е CVS ╔╫║╪╔╧╓╚╓И╔в╔М╔╟╔И╔Ю╓Р\n"
-"╔Ё╔С╔я╔╓╔К╓╥╓й╓╠╓Л╓п╓й╓Й╓ч╓╩╓С\n"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "12 ╥Н"
 
-#: addressbook/gui/component/addressbook.c:389
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
-"╓Ё╓н╔╒╔и╔Л╔╧д╒╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©. ╔я╔╧╓╛б╦╨ъ╓╥, ╔╒╔╞╔╩╔╧╦╒\n"
-"╓Р╩Щ╓ц╓ф╓╓╓К╓╚╓и╓╕╓╚╔а╔╖╔ц╔╞╓╥╓ф╓╞╓ю╓╣╓╓"
-
-#: addressbook/gui/component/addressbook.c:549 calendar/gui/gnome-cal.c:233
-msgid "Any field contains"
-msgstr "╔у╔ё║╪╔К╔и╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
-
-#: addressbook/gui/component/addressbook.c:550
-msgid "Name contains"
-msgstr "л╬а╟╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
-
-#: addressbook/gui/component/addressbook.c:551
-msgid "Email contains"
-msgstr "╔А║╪╔К╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
 
-#: addressbook/gui/component/addressbook.c:697
-msgid "The URI that the Folder Browser will display"
-msgstr "╔у╔╘╔К╔ю╔ж╔И╔╕╔╤╓╛и╫╪╗╓╧╓К URI"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "LDAP ╔╣║╪╔п"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "╔у╔║╔╓╔К"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "л╓цн╓н╔╒╔и╔Л╔╧д╒╪Ойл"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "╓й╓╥ (ф©л╬╔Б║╪╔и)"
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:59
-msgid "Password"
-msgstr "╔я╔╧╔О║╪╔и"
-
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "л╓цн╓нг╖╬з╪Ойл"
-
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "╔ы║╪╔╧╔╗╔С╔х╔Й"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "╔╣╔ж╔╗╔С╔х╔Й"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "╓╧╓ы╓ф╓н╔╗╔С╔х╔Й"
-
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr "л╓цн╓н╔╧╔Ё║╪╔в╪Ойл"
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr "╔п╔╓╔С╔иDN:"
-
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr "FIXME ╔п╔╓╔С╔и DN ╓н╔ь╔К╔в╔ф╔╜╔╧╔х╓г╓╧"
-
-#: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:68
-msgid "Remember this password"
-msgstr "╓Ё╓н╔я╔╧╔О║╪╔и╓Р╣╜╡╠"
-
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:39
-msgid "Host:"
-msgstr "╔ш╔╧╔х:"
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr "FIXME ╔ш╔╧╔х╔ь╔К╔в╔ф╔╜╔╧╔х╓г╓╧"
-
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "╔К║╪╔х DN:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr "FIXME ╔К║╪╔х DN ╔ь╔К╔в╔ф╔╜╔╧╔х╓г╓╧"
-
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "╔щ║╪╔х:"
-
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
-msgstr "FIXME ╔щ║╪╔х╔ь╔К╔в╔ф╔╜╔╧╔х╓г╓╧"
-
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
-msgstr "╦║╨Вхо╟о:"
-
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
-msgstr "г╖╬зйЩ╪╟:"
-
-#: addressbook/gui/component/addressbook-config.c:501
-msgid "Advanced LDAP Options"
-msgstr "╬Е╣И LDAP ╔╙╔в╔╥╔Г╔С"
-
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:60
-msgid "Path:"
-msgstr "╔я╔╧:"
-
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
-msgstr "FIXME ╔я╔╧╔ь╔К╔в╔ф╔╜╔╧╔х╓г╓╧"
-
-#: addressbook/gui/component/addressbook-config.c:528
-msgid "Create path if it doesn't exist."
-msgstr "б╦╨ъ╓╥╓й╓╓╬Л╧Г╔я╔╧╓Р╨Ню╝╓╧╓К"
-
-#: addressbook/gui/component/addressbook-config.c:662
-msgid "Edit Addressbook"
-msgstr "╔╒╔и╔Л╔╧д╒╓Рйт╫╦"
-
-#: addressbook/gui/component/addressbook-config.c:664
-msgid "Add Addressbook"
-msgstr "╔╒╔и╔Л╔╧д╒╓кди╡ц"
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
-"╓╒╓й╓©╓н╩Щ╓д╔╒╔и╔Л╔╧д╒╓Ра╙бР╓╥, ╓╫╓Л╓к╓д╓╓╓ф╓н╢ьо╒╓╥╓©╬ПйС╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓"
-
-#: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:49
-msgid "Name:"
-msgstr "л╬а╟:"
-
-#: addressbook/gui/component/addressbook-config.c:689
-msgid "FIXME Name help text here"
-msgstr "FIXME л╬а╟╔ь╔К╔в╔ф╔╜╔╧╔х╓г╓╧"
-
-#: addressbook/gui/component/addressbook-config.c:691
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "юБлю:"
-
-#: addressbook/gui/component/addressbook-config.c:692
-msgid "FIXME Description help text here"
-msgstr "FIXME юБлю╔ь╔К╔в╔ф╔╜╔╧╔х╓г╓╧"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "╔╒╔и╔Л╔╧д╒╓н╔╫║╪╔╧"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:603
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-#: calendar/gui/e-meeting-dialog.glade.h:8 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:27
-#: mail/message-browser.c:211 ui/evolution-addressbook.xml.h:7
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:22
-#: ui/evolution-task-editor-dialog.xml.h:18 ui/evolution-tasks.xml.h:3
-msgid "Delete"
-msgstr "╨О╫Э"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:33
-msgid "Edit"
-msgstr "йт╫╦"
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "л╬а╟"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
-msgstr "╓╫╓нб╬╓н╔Ё╔С╔©╔╞╔х"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "╔╞╔╗╔Й╓Рл╣╦З"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "╔╞╔╗╔Й╓Рм╜╦З (╢М╦╠╓г╓╧!)"
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:281
-msgid "Edit Contact Info"
-msgstr "╔Ё╔С╔©╔╞╔х╬ПйС╓нйт╫╦"
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:347
-msgid "Add to Contacts"
-msgstr "╔Ё╔С╔©╔╞╔х╓ьди╡ц"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "╔╒╔и╔Л╔╧╓Р╔щ╔ц╔в╔╒╔ц╔в╓╧╓К╓©╓А╓н Bonobo ╔Ё╔С╔х╔М║╪╔К"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "╔╒╔и╔Л╔╧╓Ри╫╪╗╓╧╓К╓©╓А╓н Bonobo ╔Ё╔С╔х╔М║╪╔К"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "╔╒╔и╔Л╔╧д╒╓Ри╫╪╗╓╧╓К Bonobo ╔Ё╔С╔х╔М║╪╔К╓н╔╣╔С╔в╔К╓г╓╧"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Evolution ╔╒╔и╔Л╔╧д╒╔ъ╔к╔╚║╪╔и╓Ри╫╪╗╓╧╓К╔Ё╔С╔х╔М║╪╔К"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution ╔╒╔и╔Л╔╧д╒╔ъ╔к╔╚║╪╔и╔с╔Е║╪╔╒"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "╔Ё╔С╔©╔╞╔х╓Р╟╥╓╕╓©╓А╓н Evolution ╔Ё╔С╔щ║╪╔м╔С╔х"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr "╔╒╔и╔Л╔╧д╒╔ъ╔к╔╚║╪╔и╔Ё╔С╔х╔М║╪╔К╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "╔╒╔и╔Л╔╧д╒╓н╔╒╔и╔Л╔╧и╫╪╗╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
-msgstr "╔╒╔и╔Л╔╧д╒╓н╔╒╔и╔Л╔╧╓Р╔щ╔ц╔в╔╒╔ц╔в╓╧╓К╓©╓А╓н╔у╔║╔╞╔х╔Й"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "Evolution ╔╒╔и╔Л╔╧д╒╔Ё╔С╔щ║╪╔м╔С╔х╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
-msgstr "╔╣╔С╔в╔К╔╒╔и╔Л╔╧д╒╔Ё╔С╔х╔М║╪╔К╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:161
-#: composer/e-msg-composer-attachment-bar.c:473 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
 msgstr "╨О╫Э"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:176
-msgid "Remove All"
-msgstr "╓╧╓ы╓ф╨О╫Э"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:200
-msgid "Send HTML Mail?"
-msgstr "HTML ╔А║╪╔К╓РаВ©╝╓╥╓ч╓╧╓╚?"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Evolution ╓н╔╒╔и╔Л╔╧д╒╓нл╬а╟а╙бР╔╓╔С╔©║╪╔у╔╖║╪╔╧"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "╔╒╔и╔Л╔╧д╒╓нл╬а╟а╙бР╔╓╔С╔©║╪╔у╔╖║╪╔╧╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "╦║╨В..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "╔А╔ц╔╩║╪╔╦╓н╪У©╝╪т"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "л╬а╟╓Ра╙бР"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "╔Ё╔С╔©╔╞╔х╔╗╔г╔ё╔©"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "╪║╓╚╓Ил╬а╟╓Ра╙бР:"
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "╔Ё╔С╔©╔╞╔х╔╗╔г╔ё╔©"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "╓х╓к╓╚╓╞ди╡ц"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Duplicate Contact Detected"
 msgstr "╫ейё╓╥╓©╔Ё╔С╔©╔╞╔х╓Р╦║╫п╓╥╓ч╓╥╓©"
 
@@ -1091,18 +1170,14 @@ msgstr ""
 "╓╧╓г╓кб╦╨ъ╓╥╓ф╓╓╓ч╓╧║╔ди╡ц╓╥╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
-msgid "Change Anyway"
-msgstr "╓х╓к╓╚╓╞йя╧╧"
-
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Changed Contact:"
 msgstr "йя╧╧╦Е╓н╔Ё╔С╔©╔╞╔х:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Conflicting Contact:"
 msgstr "╬вфм╓╥╓ф╓╓╓К╔Ё╔С╔©╔╞╔х:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -1110,8 +1185,13 @@ msgstr ""
 "йя╧╧╓╥╓©╓Ё╓н╔Ё╔С╔©╔╞╔х╓нл╬а╟╓╒╓К╓╓╓о╔А║╪╔К╔╒╔и╔Л╔╧╓о\n"
 "╓Ё╓н╔у╔╘╔К╔ю╓к╓╧╓г╓кб╦╨ъ╓╥╓ф╓╓╓ч╓╧║╔ди╡ц╓╥╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
 
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+#, fuzzy
+msgid "_Change Anyway"
+msgstr "╓х╓к╓╚╓╞йя╧╧"
+
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:242
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "╦║╨В"
 
@@ -1225,165 +1305,241 @@ msgstr "z"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-#: addressbook/gui/widgets/e-addressbook-view.c:538
-#: addressbook/gui/widgets/e-addressbook-view.c:598
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "VCard ╓гйщб╦"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:599
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr "б╬╓ь╔Ё╔С╔©╔╞╔х╓РаВ©╝"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:600
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Send message to contact"
 msgstr "╔Ё╔С╔©╔╞╔хюХ╓ь╔А╔ц╔╩║╪╔╦╓РаВ©╝"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-#: addressbook/gui/widgets/e-addressbook-view.c:601 mail/message-browser.c:208
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:70 ui/evolution-tasks.xml.h:6
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "╟У╨Ч"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:602
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr "и╫╩Ф╓Р╟У╨Ч"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:697
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "╨О╫Э"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+msgid "Error modifying card"
+msgstr "╔╚║╪╔и╓Р╫╓ю╣цФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "╔╫║╪╔╧"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "л╓цн╓н╔╗╔И║╪"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "╔╙╔у╔И╔╓╔С╨Н╤х"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "╣Ж╡д╓╛╓╒╓Й╓ч╓╩╓С"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "╔у╔║╔╓╔К╓╛╦╚╓д╓╚╓Й╓ч╓╩╓С"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "аЮ╨Н╓о╔╣╔щ║╪╔х╓╣╓Л╓ф╓╓╓ч╓╩╓С"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "╔╜╔Ц╔С╔╩╔К╓╥╓ч╓╥╓©"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "I/O ╔╗╔И║╪"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "%s ╓н╔М║╪╔ицФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "╔╚║╪╔и╓Р╫╓ю╣цФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "╔╚║╪╔и╓Р╫╓ю╣цФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "╔╚║╪╔и╓н╨О╫ЭцФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+msgid "Error removing card"
+msgstr "╔╚║╪╔и╓н╨О╫ЭцФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* ╔Ё╔С╔©╔╞╔х╓Рди╡ц╓╧╓К╓©╓А╓к╓Ё╓Ё╓Р╔╞╔Й╔ц╔╞ *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:698
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr "йлл╬"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:700
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "╔А║╪╔К"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "╪Г╓йееоц"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr "йД╫У╓нееоц"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "╩е╩Ж╓нееоц"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr "╦ф╓слА╓╥╓нееоц"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "╡Я╪р╓нееоц"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "╡х╓нееоц"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "ах©╔"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "╩е╩Ж╓н╫╩╫Й"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "╡х╓н╫╩╫Й"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "╥хбсееоц"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "╪ж╨эееоц"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "╩е╩Ж╓нееоц 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "╡х╓нееоц 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "╓╫╓нб╬╓нееоц"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "╓╫╓нб╬╓н╫╩╫Й"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "╔╕╔╖╔ж╔╣╔╓╔х"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "ц╢еЖиТ╫П"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:728
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "╩ЖлЁ╫Й"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:729
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "╥и╬н(а╟╓д╓╠)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "юЛлГ©╕"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "╔ч╔м║╪╔╦╔Ц"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "╔к╔ц╔╞╔м║╪╔Ю"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "гш╤Ж╪т"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "╔н║╪╔х"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 msgid "Done."
 msgstr "╢╟н╩"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
-msgid "Error removing card"
-msgstr "╔╚║╪╔и╓н╨О╫ЭцФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1111
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
 msgid "Removing cards..."
 msgstr "╔╚║╪╔и╓Р╨О╫ЭцФ..."
 
-#: addressbook/gui/widgets/e-minicard.c:436
-msgid "Error modifying card"
-msgstr "╔╚║╪╔и╓Р╫╓ю╣цФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©"
-
 #: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "╔╒╔и╔Л╔╧д╒╓кйщб╦"
@@ -1431,7 +1587,8 @@ msgid "Dimensions:"
 msgstr "юёк║:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "╔у╔╘╔С╔х..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1491,7 +1648,6 @@ msgid "Margins"
 msgstr "╔ч║╪╔╦╔С"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "нС©Т:"
 
@@ -1571,39 +1727,64 @@ msgstr "╪Ойл:"
 msgid "Width:"
 msgstr "иЩ:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "╔у╔╘╔С╔х..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "╔╚╔Л╔С╔ю╔╣║╪╔п╓гдл©╝цФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 "╔я╔╓╔М╔ц╔х╓н╔╚╔Л╔С╔ю╔╒╔в╔Й╔╠║╪╔╥╔Г╔С╔ж╔М╔ц╔╞╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 "╔я╔╓╔М╔ц╔х╓н ToDo ╔╒╔в╔Й╔╠║╪╔╥╔Г╔С╔ж╔М╔ц╔╞╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "лСб╚╓н╨еб╔"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "╔╚╔Л╔С╔ю╓Ри╫╪╗╓╧╓К Bonobo ╔Ё╔С╔х╔М║╪╔К╓н╔╣╔С╔в╔К"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "╔╒╔И║╪╔ЮдД╩ъ"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr "Evolution ╔╚╔Л╔С╔ю╪б╧т╔╣╔ч╔Й╔Ё╔С╔щ║╪╔м╔С╔х"
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Ok"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolution ╔╚╔Л╔С╔ю iTip/iMip ╔с╔Е║╪╔╒"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr "╔╚╔Л╔С╔ю╓Р╟╥╓╕╓©╓А╓н Evolution ╔Ё╔С╔щ║╪╔м╔С╔х"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr "╔╚╔Л╔С╔ю╔╣╔ч╔Й║╪╔Ё╔С╔щ║╪╔м╔С╔х╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr "Evolution ╔╚╔Л╔С╔ю╔Ё╔С╔щ║╪╔м╔С╔х╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr "╔╚╔Л╔С╔ю iTip ╔с╔Е║╪╔Ё╔С╔х╔М║╪╔К╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr "╔╣╔С╔в╔К╔╚╔Л╔С╔ю╔Ё╔С╔х╔М║╪╔К╓н╔у╔║╔╞╔х╔Й"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Evolution ╔╚╔Л╔С╔ю╔Ё╔С╔щ║╪╔м╔С╔х╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1613,141 +1794,255 @@ msgstr "╔╒╔И║╪╔Юдлцн╔╣║╪╔с╔╧"
 msgid "Factory for the alarm notification service"
 msgstr "╔╒╔И║╪╔Юдлцн╔╣║╪╔с╔╧╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
 
-#: calendar/gui/alarm-notify/notify-main.c:56
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "%Y/%b/%d %A %H:%M ╓н╓╒╓й╓©╓нлСб╚╓к╓д╓╓╓фдлцн"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "%Y/%b/%d %A %H:%M ╓н╓╒╓й╓©╓нлСб╚╓к╓д╓╓╓фдлцн"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "%Y/%b/%d %A %H:%M ╓н╓╒╓й╓©╓нлСб╚╓к╓д╓╓╓фдлцн"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "%Y/%b/%d %A %H:%M ╓н╓╒╓й╓©╓нлСб╚╓к╓д╓╓╓фдлцн"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "%Y/%b/%d %A %H:%M ╓н╓╒╓й╓©╓нлСб╚╓к╓д╓╓╓фдлцн"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "%Y/%b/%d %A %H:%M ╓н╓╒╓й╓©╓нлСб╚╓к╓д╓╓╓фдлцн"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "%Y/%b/%d %A %H:%M ╓н╓╒╓й╓©╓нлСб╚╓к╓д╓╓╓фдлцн"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "Evolution ╓к╓д╓╓╓ф╓н╬ПйС╓Ри╫╪╗╓╥╓ч╓╧"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "%Y/%b/%d %A %H:%M ╓к╔╒╔И║╪╔Ю"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "йд╓╦╓К"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "╔╒╔И║╪╔ЮдД╩ъ"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "╔╒╔И║╪╔ЮдД╩ъ╩Ч╢ж (й╛)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "лСб╚╓нйт╫╦"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "мЬмя╓г╓╜╓К╔╣╔ч╔Й║╪╓о╓╒╓Й╓ч╓╩╓С"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "лСб╚╓н╨еб╔"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "╔╒╔И║╪╔ЮдД╩ъ"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
 "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
 "know."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:93 calendar/gui/main.c:52
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
 msgid "Could not initialize GNOME"
 msgstr "GNOME ╓н╫И╢Э╡╫╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: calendar/gui/alarm-notify/notify-main.c:108
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Bonobo ╓н╫И╢Э╡╫╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
 msgid "Could not create the alarm notify service factory"
 msgstr "╔╒╔И║╪╔Юдлцн╔╣║╪╔с╔╧╔у╔║╔╞╔х╔Й╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
-msgstr "╔у╔║╔╓╔К╓╛╦╚╓д╓╚╓Й╓ч╓╩╓С"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%Y/%B/%e %A"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%b/%d (%a)"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%b/%d (%a)"
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
-msgstr "╔╚╔Л╔С╔ю╓РЁ╚╓╞"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
-msgstr "╔╚╔Л╔С╔ю╓Рйщб╦"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%Y %B"
 
-#: calendar/gui/calendar-commands.c:468
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "╔╚╔Л╔С╔ю╔с╔Е║╪╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©. ORBit╓хOAF╓нюъдЙ╓Р╔а╔╖╔ц╔╞╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
-#: calendar/gui/e-calendar-table.c:323
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "╟Лхл"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
-#: calendar/gui/e-calendar-table.c:324
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "╩Де╙"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
-#: calendar/gui/e-calendar-table.c:325
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "╤кхК"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/dialogs/alarm-page.c:320
-#: calendar/gui/dialogs/alarm-page.c:356
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "л╓цн"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "кл"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "фН"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "еЛ"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "ю╬"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
 #: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:345 mail/message-list.c:696
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "╧Б╓╓"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
-#: calendar/gui/calendar-model.c:1574
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:346 mail/message-list.c:695
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "иАдл"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:347 mail/message-list.c:694
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "дЦ╓╓"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
-#: calendar/gui/e-calendar-table.c:399
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "ф╘лю"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "итф╘лю"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
 #: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Ё╚╩о╓╥╓ф╓╓╓й╓╓"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
 #: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "╫ХмЩцФ"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "╢╟н╩╓╥╓ч╓╥╓©"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
 #: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:422 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "╔╜╔Ц╔С╔╩╔К╓╥╓ч╓╥╓©"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
-#: calendar/gui/calendar-model.c:802
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1758,24 +2053,28 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:882
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 "й╛нЮ╓Р '╟Лхл', '╩Де╙', '╤кхК' ╓╒╓К╓╓╓о '╓й╓╥' ╓Ра╙бР╓╥╓й╓╠╓Л╓п╓й╓Й╓ч╓╩╓С"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
-#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:322
-#: calendar/gui/e-calendar-table.c:397 mail/mail-account-gui.c:997
-#: mail/mail-accounts.c:123 mail/mail-accounts.c:174
-#: mail/mail-config.glade.h:52 shell/e-shell-view.c:1394
-#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
-#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "╔н║╪╔х"
 
-#: calendar/gui/calendar-model.c:970
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1785,227 +2084,257 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1010
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "╔я║╪╔╩╔С╔хцм╓о 0 ╓х 100 ╓н╢ж╓г╢ч╓С╓г╓╓╓й╓╠╓Л╓п╓й╓Й╓ч╓╩╓С"
 
-#: calendar/gui/calendar-model.c:1051
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "м╔юХеы╓Р '╧Б╓╓', 'иАдл', 'дЦ╓╓' ╓╒╓К╓╓╓о 'л╓дЙ╣а' ╓Ра╙бР╓╥╓й╓╠╓Л╓п╓й╓Й╓ч╓╩╓С"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1064
+#: calendar/gui/calendar-model.c:1181
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:348
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "л╓дЙ╣а"
 
-#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "ф╘люеы╓о 'ф╘лю', 'итф╘лю', ╓╒╓К╓╓╓о '╓й╓╥' ╓г╓й╓╠╓Л╓п╓й╓Й╓ч╓╩╓С"
 
-#: calendar/gui/calendar-model.c:1576
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "╨фх╞"
 
-#: calendar/gui/calendar-model.c:1578
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "ЁДеЖ╓ф╨я╓ъ"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "╓о╓╓"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "╓╓╓╓╓╗"
 
-#: calendar/gui/calendar-summary.c:198
-msgid "%A, %e %B %Y"
-msgstr "%Y/%B/%e %A"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "л╬╩ии╫╪╗"
 
-#: calendar/gui/calendar-summary.c:207
-msgid "Appointments"
-msgstr "лСб╚"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "╫╣╢жо╚ф╞╩Ч╢ж(_o)"
 
-#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
-msgid "%I:%M%p"
-msgstr "%p %I:%M"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "и╫╪╗╓РдЙ╣а"
 
-#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:1844
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "╔©╔╧╔╞"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "╥Н"
 
-#: calendar/gui/calendar-summary.c:443
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>╔╚╔Л╔С╔ю╓Р╔М║╪╔ицФ╓к╔╗╔И║╪</b>"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "╔╚╔Л╔С╔ю╓╛и╫╪╗╓╧╓К URI"
 
-#: calendar/gui/calendar-summary.c:455
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>╔╚╔Л╔С╔ю╓Р╔М║╪╔ицФ╓к╔╗╔И║╪:<br>╔А╔╫╔ц╔и╓о╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "╔╙║╪╔г╔ё╔╙╔╒╔И║╪╔Ю"
 
-#: calendar/gui/calendar-summary.c:622 mail/mail-config.glade.h:29
-msgid "Display"
-msgstr "и╫╪╗"
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "╔А╔ц╔╩║╪╔╦╓н╪У©╝╪т"
 
-#: calendar/gui/calendar-summary.c:627
-msgid "Show appointments"
-msgstr "лСб╚╓ни╫╪╗"
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "и╫╪╗╔╙╔в╔╥╔Г╔С"
 
-#: calendar/gui/calendar-summary.c:635
-msgid "Show tasks"
-msgstr "╔©╔╧╔╞╓ни╫╪╗"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:690
-msgid "Things to do"
-msgstr "TODO╓н╬У╤╥"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "╔╚╔Л╔С╔ю╓Р╔М║╪╔ицФ"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "╔╚╔Л╔С╔ю╓╛и╫╪╗╓╧╓К URI"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "%Y/%b/%d %A %H:%M ╓к╔╒╔И║╪╔Ю"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "╔А╔ц╔╩║╪╔╦и╫╪╗(_M)"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "%Y/%b/%d %A %H:%M ╓н╓╒╓й╓©╓нлСб╚╓к╓д╓╓╓фдлцн"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "╪║╓н╩Ч╓к╡╩Ёз╓Р╨фю╦╓╧╓К:"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
-msgstr "мЬмя╓г╓╜╓К╔╣╔ч╔Й║╪╓о╓╒╓Й╓ч╓╩╓С"
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:5
-msgid "Close"
-msgstr "йд╓╦╓К"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "╪║╓н╩Ч╓к╔в╔М╔╟╔И╔Ю╓Р╪б╧т╓╧╓К:"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "лСб╚╓нйт╫╦"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "╔╒╔И║╪╔ЮдД╩ъ╩Ч╢ж (й╛)"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "фЭ"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "╓╧╓ы╓ф╧╧©╥ "
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "╩Ч"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "й╛"
 
-#: calendar/gui/dialogs/alarm-page.c:255
+#: calendar/gui/dialogs/alarm-page.c:284
 #, c-format
 msgid "%d days"
 msgstr "%d фЭ"
 
-#: calendar/gui/dialogs/alarm-page.c:257
+#: calendar/gui/dialogs/alarm-page.c:286
 msgid "1 day"
 msgstr "1 фЭ"
 
-#: calendar/gui/dialogs/alarm-page.c:260
+#: calendar/gui/dialogs/alarm-page.c:289
 #, c-format
 msgid "%d weeks"
 msgstr "%d ╫╣╢ж"
 
-#: calendar/gui/dialogs/alarm-page.c:262
+#: calendar/gui/dialogs/alarm-page.c:291
 msgid "1 week"
 msgstr "1 ╫╣╢ж"
 
-#: calendar/gui/dialogs/alarm-page.c:265
+#: calendar/gui/dialogs/alarm-page.c:294
 #, c-format
 msgid "%d hours"
 msgstr "%d ╩Ч╢ж"
 
-#: calendar/gui/dialogs/alarm-page.c:267
+#: calendar/gui/dialogs/alarm-page.c:296
 msgid "1 hour"
 msgstr "1 ╩Ч╢ж"
 
-#: calendar/gui/dialogs/alarm-page.c:270
+#: calendar/gui/dialogs/alarm-page.c:299
 #, c-format
 msgid "%d minutes"
 msgstr "%d й╛"
 
-#: calendar/gui/dialogs/alarm-page.c:272
+#: calendar/gui/dialogs/alarm-page.c:301
 msgid "1 minute"
 msgstr "1 й╛"
 
-#: calendar/gui/dialogs/alarm-page.c:275
+#: calendar/gui/dialogs/alarm-page.c:304
 #, c-format
 msgid "%d seconds"
 msgstr "%d иц"
 
-#: calendar/gui/dialogs/alarm-page.c:277
+#: calendar/gui/dialogs/alarm-page.c:306
 msgid "1 second"
 msgstr "1 иц"
 
-#: calendar/gui/dialogs/alarm-page.c:302
-#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "╪║╓н╩Ч╓к╡╩Ёз╓Р╨фю╦╓╧╓К:"
 
-#: calendar/gui/dialogs/alarm-page.c:306
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "Show a dialog"
-msgstr "╪║╓н╩Ч╓к╔ю╔╓╔╒╔М╔╟╓Ри╫╪╗╓╧╓К:"
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "╪║╓н╔А╔ц╔╩║╪╔╦╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: calendar/gui/dialogs/alarm-page.c:310
-#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
 msgstr "╪║╓н╩Ч╓к╔А║╪╔К╓РаВ©╝╓╧╓К:"
 
-#: calendar/gui/dialogs/alarm-page.c:314
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "╪║╓н╩Ч╓к╔в╔М╔╟╔И╔Ю╓Р╪б╧т╓╧╓К:"
 
-#: calendar/gui/dialogs/alarm-page.c:332
-msgid " before start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
 msgstr "╨г╫И╓нлСб╚╓на╟"
 
-#: calendar/gui/dialogs/alarm-page.c:335
-msgid " after start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
 msgstr "╨г╫И╓нлСб╚╓н╦Е"
 
-#: calendar/gui/dialogs/alarm-page.c:345
-msgid " before end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
 msgstr "╨г╦Е╓нлСб╚╓на╟"
 
-#: calendar/gui/dialogs/alarm-page.c:348
-msgid " after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
 msgstr "╨г╦Е╓нлСб╚╓н╦Е"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #: calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "Basics"
 msgstr "╢Пкэ"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 #: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
 msgid "Date/Time:"
 msgstr "фЭиу/╩Ч╢ж:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Reminders"
 msgstr "╨еб╔╬У"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "юъдЙ..."
-
-#: calendar/gui/dialogs/alarm-page.glade.h:11
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "╔╣╔ч╔Й:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "╔╙╔в╔╥╔Г╔С(_O)"
+
 #. Automatically generated. Do not edit.
 #: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
 msgid "after"
@@ -2028,7 +2357,7 @@ msgstr "лСб╚╓н╨г╦Е╓╛╥п╡А"
 msgid "hour(s)"
 msgstr "╩Ч"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:97
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
 msgid "minute(s)"
 msgstr "й╛"
 
@@ -2065,36 +2394,38 @@ msgid "60 minutes"
 msgstr "60 й╛"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "╩ьдЙ╩Ч╢ж╦Е╓к╔╒╔И║╪╔Ю╓╛╔©╔╓╔Ю╔╒╔╕╔х"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "╔╙║╪╔г╔ё╔╙╔╒╔И║╪╔Ю"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "╔╒╔И║╪╔Ю╔╕╔ё╔С╔и╔╕╓╛╦╫╓Л╓©╩Ч BEEP ╡╩╓Рлд╓И╓╧"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "╔╚╔Л╔С╔ю"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "╔╚╔Л╔С╔ю╓нюъдЙ"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "╔╚╔И║╪"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+#, fuzzy
+msgid "Compress weekends in month view"
 msgstr "╫╣кЖ╓Ри╫╪╗╓╥╓й╓╓"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+#, fuzzy
+msgid "Date Navigator"
 msgstr "фЭиуаЮ╨Н╔╙╔в╔╥╔Г╔С"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -2102,179 +2433,284 @@ msgid "Defaults"
 msgstr "╔г╔у╔╘╔К╔х"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "и╫╪╗╔╙╔в╔╥╔Г╔С"
+#: mail/mail-config.glade.h:30
+msgid "Display"
+msgstr "и╫╪╗"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:155
-msgid "Due Date"
-msgstr "╢ЭфЭ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "╔╒╔И║╪╔ЮдД╩ъ╓Рм╜╦З"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "╟ЛфЭ╓н╫╙╓О╓Й:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "╫╣╓н╩о╓А:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "╤Б"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:918
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "╤БмкфЭ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "╤╞д╢"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "╨ёфЭ╓╛╢Э╦б╓н╔╒╔╓╔ф╔Ю"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "╨ёфЭ╓╛╢Э╦б╓н╔╒╔╓╔ф╔Ю:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "╓ч╓ю╢Э╦б╓г╓о╓й╓╓╔╒╔╓╔ф╔Ю"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "╓ч╓ю╢Э╦б╓г╓о╓й╓╓╔╒╔╓╔ф╔Ю:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "╥Н"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:914
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "╥НмкфЭ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "╢Э╦б╓Р╡А╓╝╓©╔╒╔╓╔ф╔Ю"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "╢Э╦б╓Р╡А╓╝╓©╔╒╔╓╔ф╔Ю:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:61
-msgid "Pick a color"
-msgstr "╔╚╔И║╪╓Ра╙бР"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:158
-msgid "Priority"
-msgstr "м╔юХеы"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#, fuzzy
+msgid "Overdue tasks"
+msgstr "╢Э╦б╓Р╡А╓╝╓©╔╒╔╓╔ф╔Ю"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "╓╧╓ы╓ф╓нлСб╚╓Р╨еб╔╓╧╓К"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "ез"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/dialogs/recurrence-page.c:919
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "езмкфЭ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "и╫╪╗"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "лСб╚╓н╫╙н╩╩Ч╢ж╓Ри╫╪╗"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "╫╣хж╧Ф╓Ри╫╪╗"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "╟ЛфЭ╓н╩о╓ч╓Й:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "фЭ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/dialogs/recurrence-page.c:920
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "фЭмкфЭ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "╔©╔╧╔╞╔я╔ц╔и"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "╔©╔╧╔╞"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "╨ёфЭ╓╛╢Э╦б╓н╔╒╔╓╔ф╔Ю"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "лз"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:917
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "лзмкфЭ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "╢Э╦б╓ч╓г╓н╩Ч╢ж"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Time"
+msgstr "╥и╬н(а╟╓д╓╠)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "╩Чй╛ЁД:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "╩Ч╢ж╓н╫Я╪╟:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"╔©╔╓╔Ю╔╬║╪╔С: "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "╡п"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/dialogs/recurrence-page.c:915
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "╡пмкфЭ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "╩КЁп╔╒╔И║╪╔Ю"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "©Е"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/dialogs/recurrence-page.c:916
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "©ЕмкфЭ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "╫╣╢жо╚ф╞╩Ч╢ж"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
+msgstr "╫╣╢жо╚ф╞╩Ч╢ж(_o)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "й╛а╟"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:99
-msgid "seconds."
-msgstr " иц"
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "кэеЖ╓к╓Ё╓н╔╒╔╚╔╕╔С╔х╓Р╨О╫Э╓╥╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "кэеЖ╓к %d ╦д╓н╔©╔╧╔╞╓Р╨О╫Э╓╥╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "кэеЖ╓к╩елУ╣╜фЧ `%s' ╓Р╨О╫Э╓╥╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "╢╟н╩╓╥╓ч╓╥╓©"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "╢╟н╩╓╥╓ч╓╥╓©"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#, fuzzy
+msgid "Due "
+msgstr "╢ЭфЭ"
+
+#: calendar/gui/dialogs/comp-editor.c:449
+#, fuzzy
+msgid "Edit Appointment"
+msgstr "лСб╚╓нйт╫╦"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, fuzzy, c-format
+msgid "Appointment - %s"
+msgstr "лСб╚"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, fuzzy, c-format
+msgid "Task - %s"
+msgstr "╔©╔╧╔╞"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, fuzzy, c-format
+msgid "Journal entry - %s"
+msgstr "╩елУ╣╜фЧ(_J) (FIXME)"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+#, fuzzy
+msgid "No summary"
+msgstr "╔╣╔ч╔Й║╪"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "╔у╔║╔╓╔К╓Р╬Е╫Я╓╜╓╥╓ч╓╧╓╚?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"╓╫╓нл╬а╟╓н╔у╔║╔╓╔К╓о╓╧╓г╓кб╦╨ъ╓╥╓ч╓╧\n"
+"╬Е╫Я╓╜╓╥╓ч╓╧╓╚?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "йлл╬╓гйщб╦..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
 
 #: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
@@ -2318,25 +2754,55 @@ msgstr "кэеЖ╓к %d ╦д╓н╔©╔╧╔╞╓Р╨О╫Э╓╥╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "кэеЖ╓к %d ╦д╓н╩елУ╣╜фЧ╓Р╨О╫Э╓╥╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
 
-#: calendar/gui/dialogs/event-editor.c:112
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "╔у╔║╔╓╔К╓Ра╙бР"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "╔╩╔╞╔╥╔Г╔С:"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"╔©╔╓╔Ю╔╬║╪╔С: "
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:154
 msgid "Appointment"
 msgstr "лСб╚"
 
-#: calendar/gui/dialogs/event-editor.c:117
+#: calendar/gui/dialogs/event-editor.c:159
 msgid "Reminder"
 msgstr "╨еб╔╬У"
 
-#: calendar/gui/dialogs/event-editor.c:122
+#: calendar/gui/dialogs/event-editor.c:164
 msgid "Recurrence"
 msgstr "╨фх╞"
 
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "бг╧Г╓╩╓Р╔╜╔Ц╔С╔╩╔К"
+
 #: calendar/gui/dialogs/event-page.glade.h:1
 msgid "A_ll day event"
 msgstr "кХфЭ╓н╔╓╔ы╔С╔х(_l)"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:151
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "й╛нЮ"
 
@@ -2365,11 +2831,6 @@ msgstr "╔╣╔ч╔Й║╪(_m):"
 msgid "_Confidential"
 msgstr "╣║л╘(_C)"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:20
-msgid "_Contacts..."
-msgstr "╔Ё╔С╔©╔╞╔х(_C)..."
-
 #: calendar/gui/dialogs/event-page.glade.h:10
 msgid "_End time:"
 msgstr "╫╙н╩╩Ч╢ж(_E):"
@@ -2378,38 +2839,271 @@ msgstr "╫╙н╩╩Ч╢ж(_E):"
 msgid "_Start time:"
 msgstr "Ё╚╩о╩Ч╢ж(_S):"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "╔╟╔К║╪╔вл╬:"
+
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "╨фх╞"
+
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr "╣дд╧"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr "╩╡╡ц╪т╓╛и╛мв"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr "г╓╟у╩╡╡ц╪т"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr "ит╩╡╡ц╪т"
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "ф╟╨Н╓Рди╡ц"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr " ╪УбЗ "
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr " ╪╜бЮ "
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "╩цдЙ"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "╨О╫Э"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "╫ХмЩцФ"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "╪ж╨эееоц"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "╩╡╡ц╪т╓╛и╛мв"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "г╓╟у╩╡╡ц╪т"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "ит╩╡╡ц╪т"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "аВ©╝╨я"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "╨О╫Э..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
+msgstr "╫пюй╪т"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
+msgstr "╢╟н╩фЭ"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "╨О╫Э"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "╨О╫Э"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "╔ч╔м║╪╔╦╔Ц"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "12 ╥Н"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr "лРЁД"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "╔╧╔ф║╪╔©╔╧"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "╪Ойл"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "╪Г╨е╪т:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "╪Г╨е╪т:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "б╬╓н╬╥бт(_I)..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "╪Г╨е╪т:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%Y/%b/%d (%a)"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "╓Ё╓нлСб╚╓о Evolution ╓╛йт╫╦╫пмХ╓й╓╓╨фх╞╓Р╢ч╓С╓г╓╓╓ч╓╧"
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "фЭ"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr "╫пмХ╩Ж"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Custom recurrence"
 msgstr "╨фх╞╓н╔╚╔╧╔©╔ч╔╓╔╨"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Exceptions"
 msgstr "нЦЁ╟"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "Modify"
-msgstr "╫╓ю╣"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "No recurrence"
 msgstr "╨фх╞╓й╓╥"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Preview"
 msgstr "╔в╔Л╔с╔Е║╪"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "Recurrence Rule"
 msgstr "╨фх╞╔К║╪╔К"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "Simple recurrence"
 msgstr "╔╥╔С╔в╔К╓й╨фх╞"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "╫╓ю╣"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr ""
@@ -2438,48 +3132,47 @@ msgstr "╫╣"
 msgid "year(s)"
 msgstr "г╞"
 
-#: calendar/gui/dialogs/recurrence-page.c:398 calendar/gui/print.c:1975
-#: calendar/gui/print.c:1977 calendar/gui/print.c:1978
-msgid "%a %b %d %Y"
-msgstr "%Y/%b/%d (%a)"
-
-#: calendar/gui/dialogs/recurrence-page.c:544
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "╓Ё╓нлСб╚╓о Evolution ╓╛йт╫╦╫пмХ╓й╓╓╨фх╞╓Р╢ч╓С╓г╓╓╓ч╓╧"
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr "йя╧╧╓Рйщб╦╓╥╓©╓╓╓г╓╧╓╚?"
 
-#: calendar/gui/dialogs/recurrence-page.c:887
-msgid "on"
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:913 filter/filter-datespec.c:81
-msgid "day"
-msgstr "фЭ"
-
-#: calendar/gui/dialogs/recurrence-page.c:1043
-msgid "on the"
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1051
-msgid "th"
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1215
-msgid "occurrences"
-msgstr "╫пмХ╩Ж"
-
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "йя╧╧╓Рйщб╦╓╥╓©╓╓╓г╓╧╓╚?"
-
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "Date Completed:"
 msgstr "╢╟н╩фЭ:"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "╨О╫Э"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "╨О╫Э"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "╔н║╪╔х"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:110
+#: calendar/gui/dialogs/task-editor.c:130
 msgid "Task"
 msgstr "╔©╔╧╔╞"
 
@@ -2508,273 +3201,323 @@ msgstr "м╔юХеы(_P):"
 msgid "_Status:"
 msgstr "╔╧╔ф║╪╔©╔╧(_S):"
 
-#: calendar/gui/e-calendar-table.c:150
-msgid "Categories"
-msgstr "╔╚╔ф╔╢╔Й"
-
-#: calendar/gui/e-calendar-table.c:152
-msgid "Completion Date"
-msgstr "╢╟н╩фЭ"
-
-#: calendar/gui/e-calendar-table.c:153
-msgid "End Date"
-msgstr "╫╙н╩фЭ"
-
-#: calendar/gui/e-calendar-table.c:154
-msgid "Start Date"
-msgstr "Ё╚╩офЭ"
-
-#: calendar/gui/e-calendar-table.c:156
-msgid "Geographical Position"
-msgstr "╟чеы╥пеы"
-
-#: calendar/gui/e-calendar-table.c:157
-msgid "Percent complete"
-msgstr "╔я║╪╔╩╔С╔х╢╟н╩"
-
-#: calendar/gui/e-calendar-table.c:159
-msgid "Summary"
-msgstr "╔╣╔ч╔Й║╪"
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Transparency"
-msgstr "ф╘люеы"
-
-#: calendar/gui/e-calendar-table.c:161
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:162
-msgid "Alarms"
-msgstr "╔╒╔И║╪╔Ю"
-
-#: calendar/gui/e-calendar-table.c:163
-msgid "Click here to add a task"
-msgstr "╔©╔╧╔╞╓Рди╡ц╓╧╓К╓©╓А╓к╓Ё╓Ё╓Р╔╞╔Й╔ц╔╞"
-
-#: calendar/gui/e-calendar-table.c:367
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:368
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:370
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:371
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:372
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:373
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:737
-msgid "Edit this task"
-msgstr "╓Ё╓н╔©╔╧╔╞╓Рйт╫╦╓╥╓ч╓╧"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "Ё╚╓╞(_O)"
 
-#: calendar/gui/e-calendar-table.c:739
-msgid "Mark as complete"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "юз╓Й╪Х╓Й(_u)"
+
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "╔Ё╔т║╪(_C)"
+
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "е╫╓Йиу╓╠(_P)"
+
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
 msgstr "╢╟н╩╓Р╔ч║╪╔╞╓╥╓ч╓╧"
 
-#: calendar/gui/e-calendar-table.c:740
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "╓Ё╓н╔©╔╧╔╞╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: calendar/gui/e-calendar-table.c:745
-msgid "Mark tasks as complete"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
 msgstr "╢╟н╩╓╥╓©╔©╔╧╔╞╓Р╔ч║╪╔╞╓╥╓ч╓╧"
 
-#: calendar/gui/e-calendar-table.c:746 ui/evolution-tasks.xml.h:4
-msgid "Delete selected tasks"
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "а╙бР╓╥╓©╔©╔╧╔╞╓Р╨О╫Э╓╥╓ч╓╧"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:284
-#: calendar/gui/print.c:782
-msgid "am"
-msgstr "╦Аа╟"
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "╔©╔╧╔╞╓Рди╡ц╓╧╓К╓©╓А╓к╓Ё╓Ё╓Р╔╞╔Й╔ц╔╞"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:784
-msgid "pm"
-msgstr "╦А╦Е"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% ╢╟н╩(_l):"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "╔╒╔И║╪╔Ю"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "╔╚╔ф╔╢╔Й"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "╢╟н╩╓╥╓ч╓╥╓©"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "╢╟н╩фЭ"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "╢ЭфЭ"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "╫╙н╩фЭ"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "╟чеы╥пеы"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "м╔юХеы"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Ё╚╩офЭ"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "╔╣╔ч╔Й║╪"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "╔©╔╧╔╞"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "ф╘люеы"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i й╛й╛ЁД"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1275
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1599
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%B %d %A"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1289
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr "%b/%d (%a)"
-
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1302
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%b/%d"
 
-#: calendar/gui/e-day-view.c:3129 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "╦Аа╟"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "╦А╦Е"
+
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "©╥╣╛лСб╚"
 
-#: calendar/gui/e-day-view.c:3131 calendar/gui/e-week-view.c:2968
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "©╥╣╛кХфЭ╓н╔╓╔ы╔С╔х"
 
-#: calendar/gui/e-day-view.c:3136 calendar/gui/e-week-view.c:2973
-msgid "Go to Today"
-msgstr "╨ёфЭ╓ь╟эф╟"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "╨ёфЭ╓ь╟эф╟(_T)"
 
-#: calendar/gui/e-day-view.c:3138 calendar/gui/e-week-view.c:2975
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "╩ьдЙфЭ╓ь╟эф╟..."
 
-#: calendar/gui/e-day-view.c:3145 calendar/gui/e-week-view.c:2981
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:12
-msgid "Open"
-msgstr "Ё╚╓╞"
-
-#: calendar/gui/e-day-view.c:3147 calendar/gui/e-week-view.c:2983
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "╓Ё╓нлСб╚╓Р╨О╫Э"
 
-#: calendar/gui/e-day-view.c:3149 calendar/gui/e-week-view.c:2985
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "бг╧Г╓╩╓н╔╧╔╠╔╦╔Е║╪╔К"
-
-#: calendar/gui/e-day-view.c:3158 calendar/gui/e-week-view.c:2998
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "╓Ё╓н╫пмХ╩Ж╓Р╡дф╟╓к╓╧╓К"
 
-#: calendar/gui/e-day-view.c:3160 calendar/gui/e-week-view.c:3000
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "╓Ё╓н╫пмХ╩Ж╓Р╨О╫Э"
 
-#: calendar/gui/e-day-view.c:3162
-msgid "Delete all Occurrences"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "╓╧╓ы╓ф╓н╫пмХ╩Ж╓Р╨О╫Э"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i й╛й╛ЁД"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:163
-msgid "I couldn't update your calendar file!\n"
-msgstr "╔╚╔Л╔С╔ю╔у╔║╔╓╔К╓Р╧╧©╥╫пмХ╓ч╓╩╓С╓г╓╥╓©!\n"
+#: calendar/gui/e-itip-control.c:697
+#, fuzzy
+msgid "This is a meeting request."
+msgstr "╓Ё╓Л╓ом╧йьй╙╓н╫╩╫Й╓г╓╧"
 
-#: calendar/gui/e-itip-control.c:169 calendar/gui/e-itip-control.c:512
-msgid "Component successfully updated."
-msgstr "╔Ё╔С╔щ║╪╔м╔С╔х╓ою╣╓╥╓╞╧╧©╥╓╣╓Л╓ч╓╥╓©"
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:175
-msgid "There was an error loading the calendar file."
-msgstr "╔╚╔Л╔С╔ю╔у╔║╔╓╔К╓Рфи╓ъ╧Ч╓ъцФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©"
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:199
-msgid "I couldn't open your calendar file!\n"
-msgstr "╔╚╔Л╔С╔ю╔у╔║╔╓╔К╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©!\n"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+#, fuzzy
+msgid "The message is not understandable."
+msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓о╦╫╨ъмЬмя╫пмХ╓ч╓╩╓С"
 
-#: calendar/gui/e-itip-control.c:460 calendar/gui/e-itip-control.c:531
-msgid "I couldn't load your calendar file!\n"
-msgstr "╔╚╔Л╔С╔ю╔у╔║╔╓╔К╓Р╔М║╪╔и╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©!\n"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:472
-msgid "I couldn't read your calendar file!\n"
-msgstr "╔╚╔Л╔С╔ю╔у╔║╔╓╔К╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©!\n"
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:485
-msgid "This is a reply from someone who was uninvited!"
-msgstr "╓Ё╓Л╓о╬╥╓╚╓╤╓Кц╞╓╚╓╚╓И╓нйж╩Ж╓г╓╧!"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:501
-msgid "I couldn't update your calendar store."
-msgstr "йщб╦╓╥╓©╔╚╔Л╔С╔ю╓Р╧╧©╥╫пмХ╓ч╓╩╓С╓г╓╥╓©"
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:542
-msgid "I couldn't delete the calendar component!\n"
-msgstr "╔╚╔Л╔С╔ю╔Ё╔С╔щ║╪╔м╔С╔х╓Р╨О╫Э╫пмХ╓ч╓╩╓С╓г╓╥╓©!\n"
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:552
-msgid "Component successfully deleted."
-msgstr "╔Ё╔С╔щ║╪╔м╔С╔х╓ою╣╓╥╓╞╨О╫Э╓╣╓Л╓ч╓╥╓©"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:696
-msgid "I don't recognize this type of calendar component."
-msgstr "╓Ё╓н╔╚╔Л╔С╔ю╔Ё╔С╔щ║╪╔м╔С╔х╓н╪Ойл╓ог╖╪╠╓╥╓ч╓╩╓С"
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:782
-msgid "Add to Calendar"
-msgstr "╔╚╔Л╔С╔ю╓нди╡ц"
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Accept "
-msgstr " ╪УбЗ "
+#: calendar/gui/e-itip-control.c:834
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "╔у╔╘╔К╔ю╓г╡СиЭитг╫╓й╔╗╔И║╪╓╛х╞ю╦╓╥╓©╓Х╓╕╓г╓╧"
 
-#: calendar/gui/e-itip-control.c:817
-msgid " Decline "
-msgstr " ╪╜бЮ "
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:818
-msgid " Tentative "
-msgstr " ╩цдЙ "
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:862
-msgid "Update Calendar"
-msgstr "╔╚╔Л╔С╔ю╓Р╧╧©╥"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr "╔╚╔Л╔С╔ю╔у╔║╔╓╔К╓Р╧╧©╥╫пмХ╓ч╓╩╓С╓г╓╥╓©!\n"
 
-#: calendar/gui/e-itip-control.c:885
-msgid "Cancel Meeting"
-msgstr "бг╧Г╓╩╓Р╔╜╔Ц╔С╔╩╔К"
+#: calendar/gui/e-itip-control.c:1015
+#, fuzzy
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "╔╚╔Л╔С╔ю╔у╔║╔╓╔К╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -2793,14 +3536,14 @@ msgstr "╔╚╔Л╔С╔ю╔А╔ц╔╩║╪╔╦"
 msgid "Date:"
 msgstr "фЭиу:"
 
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "╔╚╔Л╔С╔ю╓Р╔М║╪╔ицФ"
+
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "╔╚╔Л╔С╔ю╓Р╔М║╪╔ицФ..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "╪Г╨е╪т:"
-
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "╔╣║╪╔п╔А╔ц╔╩║╪╔╦:"
@@ -2813,178 +3556,48 @@ msgstr "╫╙н╩фЭ"
 msgid "date-start"
 msgstr "Ё╚╩офЭ"
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "╫пюй╪т"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "╫пюй╪т╓н╫╩╫Й"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "╫пюй╪т: "
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"╔╜╔Ц╔С╔╩╔К\n"
-"бг╧Г╓╩"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr "╣дд╧"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "бг╧Г╓╩╓н╟ффБ"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "ит╩╡╡ц╪т"
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "г╓╟у╩╡╡ц╪т"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "╪Г╨е╪т:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:14
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"х╞и╫\n"
-"╔╓╔ы╔С╔х"
-
-#: calendar/gui/e-meeting-dialog.glade.h:16
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"мв╣А\n"
-"бг╧Г╓╩"
-
-#: calendar/gui/e-meeting-dialog.glade.h:19
-msgid "Required Participant"
-msgstr "╩╡╡ц╪т╓╛и╛мв"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Role"
-msgstr "лРЁД"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"╔╧╔╠╔╦╔Е║╪╔К\n"
-"╩Ч╢ж"
-
-#: calendar/gui/e-meeting-dialog.glade.h:23 filter/libfilter-i18n.h:49
-msgid "Status"
-msgstr "╔╧╔ф║╪╔©╔╧"
-
-#: calendar/gui/e-tasks.c:181 calendar/gui/e-tasks.c:525
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "╓╧╓ы╓ф"
 
-#: calendar/gui/e-tasks.c:187
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "╔╚╔ф╔╢╔Й:"
 
-#: calendar/gui/e-tasks.c:333
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "'%s' ╓н╔©╔╧╔╞╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: calendar/gui/e-tasks.c:345
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "'%s' ╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓Рмв╣А╓╣╓Л╓К╔А╔╫╔ц╔и╓о╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С"
 
-#: calendar/gui/e-week-view.c:2966 calendar/gui/e-week-view.c:2989
-msgid "New Appointment..."
-msgstr "©╥╣╛лСб╚..."
-
-#: calendar/gui/e-week-view.c:3002
-msgid "Delete All Occurrences"
-msgstr "╓╧╓ы╓ф╓н╫пмХ╩Ж╓Р╨О╫Э"
-
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1583
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%B %d"
 
-#: calendar/gui/gnome-cal.c:234
-msgid "Summary contains"
-msgstr "╔╣╔ч╔Й╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
-
-#: calendar/gui/gnome-cal.c:235
-msgid "Description contains"
-msgstr "юБлю╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
-
-#: calendar/gui/gnome-cal.c:236
-msgid "Comment contains"
-msgstr "╔Ё╔А╔С╔х╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
-
-#: calendar/gui/gnome-cal.c:237
-msgid "Has category"
-msgstr "╪║╓н╔╚╔ф╔╢╔Й╓Р╩Щ╓д"
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "©╥╣╛лСб╚..."
 
-#: calendar/gui/gnome-cal.c:840
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s' ╓н╔у╔╘╔К╔ю╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: calendar/gui/gnome-cal.c:851
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "'%s' ╓РЁ╚╓╞╓Ё╓х╓Рмв╣А╓╣╓Л╓К╔А╔╫╔ц╔и╓о╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "╔╚╔Л╔С╔ю╓Ри╫╪╗╓╧╓К Bonobo ╔Ё╔С╔х╔М║╪╔К╓н╔╣╔С╔в╔К"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution ╔╚╔Л╔С╔ю╪б╧т╔╣╔ч╔Й╔Ё╔С╔щ║╪╔м╔С╔х"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution ╔╚╔Л╔С╔ю iTip/iMip ╔с╔Е║╪╔╒"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "╔╚╔Л╔С╔ю╓Р╟╥╓╕╓©╓А╓н Evolution ╔Ё╔С╔щ║╪╔м╔С╔х"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr "╔╚╔Л╔С╔ю╔╣╔ч╔Й║╪╔Ё╔С╔щ║╪╔м╔С╔х╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "Evolution ╔╚╔Л╔С╔ю╔Ё╔С╔щ║╪╔м╔С╔х╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr "╔╚╔Л╔С╔ю iTip ╔с╔Е║╪╔Ё╔С╔х╔М║╪╔К╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr "╔╣╔С╔в╔К╔╚╔Л╔С╔ю╔Ё╔С╔х╔М║╪╔К╓н╔у╔║╔╞╔х╔Й"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "4 ╥Н"
@@ -3006,231 +3619,256 @@ msgid "Go To Date"
 msgstr "фЭ╓к╓а╓к╟эф╟"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "╨ёфЭ╓ь╟эф╟"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "1 ╥Н"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "7 ╥Н"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "6 ╥Н"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "3 ╥Н"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "5 ╥Н"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "11 ╥Н"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "10 ╥Н"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "9 ╥Н"
 
-#: calendar/gui/print.c:448
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "╨ёфЭ╓ь╟эф╟"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1 фЭ"
 
-#: calendar/gui/print.c:448
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2 фЭ"
 
-#: calendar/gui/print.c:448
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3 фЭ"
 
-#: calendar/gui/print.c:448
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4 фЭ"
 
-#: calendar/gui/print.c:448
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5 фЭ"
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6 фЭ"
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7 фЭ"
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8 фЭ"
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9 фЭ"
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10 фЭ"
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11 фЭ"
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12 фЭ"
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13 фЭ"
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14 фЭ"
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15 фЭ"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16 фЭ"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17 фЭ"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18 фЭ"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19 фЭ"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20 фЭ"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21 фЭ"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22 фЭ"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23 фЭ"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24 фЭ"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25 фЭ"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26 фЭ"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27 фЭ"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28 фЭ"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29 фЭ"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30 фЭ"
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31 фЭ"
 
-#: calendar/gui/print.c:513
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "фЭ"
 
-#: calendar/gui/print.c:513
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "╥Н"
 
-#: calendar/gui/print.c:513
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "╡п"
 
-#: calendar/gui/print.c:513
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "©Е"
 
-#: calendar/gui/print.c:514
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "лз"
 
-#: calendar/gui/print.c:514
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "╤Б"
 
-#: calendar/gui/print.c:514
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "ез"
 
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "╔©╔╧╔╞"
+
 #. Day
-#: calendar/gui/print.c:1951
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "╨ёфЭ╓нфЭиу [%Y/%b/%d (%a)]"
 
-#: calendar/gui/print.c:1970 calendar/gui/print.c:1974
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%b/%d (%a)"
 
-#: calendar/gui/print.c:1971
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%Y/%d (%a)"
 
-#: calendar/gui/print.c:1982
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "╨ё╫╣ (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1990
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "╨ё╥Н (%Y/%b)"
 
 #. Year
-#: calendar/gui/print.c:1997
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "╨ёг╞ (%Y)"
 
-#: calendar/gui/print.c:2212
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "╔╚╔Л╔С╔ю╓н╟У╨Ч"
 
-#: calendar/gui/print.c:2299 mail/mail-callbacks.c:1487
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:24
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "╟У╨Ч╔в╔Л╔с╔Е║╪"
 
-#: calendar/gui/tasks-control.c:112
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "╓Ё╓н╔╒╔╓╔ф╔Ю╓Р╟У╨Ч"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "╔в╔Й╔С╔©╓нюъдЙ"
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "╔©╔╧╔╞╔у╔╘╔К╔ю╓╛и╫╪╗╓╧╓К URI"
 
@@ -3239,8 +3877,8 @@ msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
-"Evolution ╓о╔╚╔Л╔С╔ю╔у╔╘╔К╔ю╓н╔©╔╧╔╞╓Р╪Хфю╓╥, ╪╚ф╟е╙╓к©╥╓╥╓╓╔©╔╧╔╞╔у╔╘╔К╔ю╓ь"
-"╟эф╟╓╥╓ч╓╧"
+"Evolution ╓о╔╚╔Л╔С╔ю╔у╔╘╔К╔ю╓н╔©╔╧╔╞╓Р╪Хфю╓╥, "
+"╪╚ф╟е╙╓к©╥╓╥╓╓╔©╔╧╔╞╔у╔╘╔К╔ю╓ь╟эф╟╓╥╓ч╓╧"
 
 #: calendar/gui/tasks-migrate.c:109
 msgid ""
@@ -3249,10 +3887,10 @@ msgid ""
 "Some of the tasks could not be migrated, so this process may be attempted "
 "again in the future."
 msgstr ""
-"Evolution ╓о╔╚╔Л╔С╔ю╔у╔╘╔К╔ю╓н╔©╔╧╔╞╓Р╪Хфю╓╥, ©╥╓╥╓╓╔©╔╧╔╞╔у╔╘╔К╔ю╓ь╟эф╟╓╥╓Х"
-"╓╕╓х╓╥╓ч╓╥╓©\n"
-"╓╥╓╚╓╥, ╓╓╓╞╓д╓╚╓н╔©╔╧╔╞╓о╟эф╟╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©, ╓г╓╧╓н╓г╓Ё╓н╔в╔М╔╩"
-"╔╧╓о╓Ё╓н╦Е╨ф╓с╩Н╓╣╓Л╓К╓г╓╥╓Г╓╕"
+"Evolution ╓о╔╚╔Л╔С╔ю╔у╔╘╔К╔ю╓н╔©╔╧╔╞╓Р╪Хфю╓╥, "
+"©╥╓╥╓╓╔©╔╧╔╞╔у╔╘╔К╔ю╓ь╟эф╟╓╥╓Х╓╕╓х╓╥╓ч╓╥╓©\n"
+"╓╥╓╚╓╥, ╓╓╓╞╓д╓╚╓н╔©╔╧╔╞╓о╟эф╟╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©, "
+"╓г╓╧╓н╓г╓Ё╓н╔в╔М╔╩╔╧╓о╓Ё╓н╦Е╨ф╓с╩Н╓╣╓Л╓К╓г╓╥╓Г╓╕"
 
 #: calendar/gui/tasks-migrate.c:121
 #, c-format
@@ -3260,8 +3898,8 @@ msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
-"`%s' ╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©; ╔╚╔Л╔С╔ю╔у╔╘╔К╔ю╓╚╓И╔©╔╧╔╞╔у╔╘╔К╔ю╓ь╟эф╟╓╧"
-"╓К╔╒╔╓╔ф╔Ю╓╛╓╒╓Й╓ч╓╩╓С"
+"`%s' ╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©; "
+"╔╚╔Л╔С╔ю╔у╔╘╔К╔ю╓╚╓И╔©╔╧╔╞╔у╔╘╔К╔ю╓ь╟эф╟╓╧╓К╔╒╔╓╔ф╔Ю╓╛╓╒╓Й╓ч╓╩╓С"
 
 #: calendar/gui/tasks-migrate.c:134
 #, c-format
@@ -3269,103 +3907,13 @@ msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
 msgstr ""
-"`%s' ╓Рфи╓ъ╧Ч╓Юмв╣А╓Р╬Е╓╡╓©╔А╔╫╔ц╔и╓о╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С; ╔╚╔Л╔С╔ю╔у╔╘╔К╔ю╓╚"
-"╓И╔©╔╧╔╞╔у╔╘╔К╔ю╓ь╟эф╟╓╧╓К╔╒╔╓╔ф╔Ю╓╛╓╒╓Й╓ч╓╩╓С"
+"`%s' ╓Рфи╓ъ╧Ч╓Юмв╣А╓Р╬Е╓╡╓©╔А╔╫╔ц╔и╓о╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С; "
+"╔╚╔Л╔С╔ю╔у╔╘╔К╔ю╓╚╓И╔©╔╧╔╞╔у╔╘╔К╔ю╓ь╟эф╟╓╧╓К╔╒╔╓╔ф╔Ю╓╛╓╒╓Й╓ч╓╩╓С"
 
 #: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
 msgid "SMTWTFS"
 msgstr "SMTWTFS"
 
-#: calendar/pcs/query.c:218
-msgid "time-now expects 0 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:242
-msgid "make-time expects 1 argument"
-msgstr ""
-
-#: calendar/pcs/query.c:247
-msgid "make-time expects argument 1 to be a string"
-msgstr ""
-
-#: calendar/pcs/query.c:255
-msgid "make-time argument 1 must be an ISO 8601 date/time string"
-msgstr ""
-
-#: calendar/pcs/query.c:281
-msgid "time-add-day expects 2 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:286
-msgid "time-add-day expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:293
-msgid "time-add-day expects argument 2 to be an integer"
-msgstr ""
-
-#: calendar/pcs/query.c:318
-msgid "time-day-begin expects 1 argument"
-msgstr ""
-
-#: calendar/pcs/query.c:323
-msgid "time-day-begin expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:348
-msgid "time-day-end expects 1 argument"
-msgstr ""
-
-#: calendar/pcs/query.c:353
-msgid "time-day-end expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:389
-msgid "get-vtype expects 0 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:472
-msgid "occur-in-time-range? expects 2 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:477
-msgid "occur-in-time-range? expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:484
-msgid "occur-in-time-range? expects argument 2 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:611
-msgid "contains? expects 2 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:616
-msgid "contains? expects argument 1 to be a string"
-msgstr ""
-
-#: calendar/pcs/query.c:623
-msgid "contains? expects argument 2 to be a string"
-msgstr ""
-
-#: calendar/pcs/query.c:640
-msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
-"\""
-msgstr ""
-
-#: calendar/pcs/query.c:678
-msgid "has-categories? expects at least 1 argument"
-msgstr ""
-
-#: calendar/pcs/query.c:684
-msgid "has-categories? expects all arguments to be strings"
-msgstr ""
-
-#: calendar/pcs/query.c:932
-msgid "Evaluation of the search expression did not yield a boolean value"
-msgstr ""
-
 #: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "╔╣╔╓╔С╓о╓Ё╓н╟е╧Ф╓Р╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С"
@@ -3386,65 +3934,80 @@ msgstr "иД╧Ф╡╫╓о╓Ё╓н╟е╧Ф╓Р╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С"
 msgid "Decryption is not supported by this cipher"
 msgstr "иЭ╧Ф╡╫╓о╓Ё╓н╟е╧Ф╓Р╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С"
 
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
 #: camel/camel-disco-store.c:305
 msgid "You must be working online to complete this operation"
 msgstr "╓Ё╓нф╟╨Н╓Р╢╟н╩╓╧╓К╓©╓А╓к╔╙╔С╔И╔╓╔С╓г╨Н╤х╓╥╓й╓╠╓Л╓п╓й╓Й╓ч╓╩╓С"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "╔у╔╘╔К╔ю╓Рф╠╢ЭцФ"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr "╔╧╔в║╪╔К╔у╔╘╔К╔ю╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr "╔╧╔в║╪╔К╔у╔╘╔К╔ю╓Р╫ХмЩ╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С"
 
-#: camel/camel-filter-driver.c:666
-#, c-format
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "╔А╔ц╔╩║╪╔╦ %d ╓Р╪ХфюцФ (%d%%)"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:680
-#, c-format
-msgid "Failed message %d"
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, fuzzy, c-format
+msgid "Failed on message %d"
 msgstr "╔А╔ц╔╩║╪╔╦ %d ╓о╪╨гт╓╥╓ч╓╥╓©"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "╔А╔ц╔╩║╪╔╦╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С"
 
-#: camel/camel-filter-driver.c:691 camel/camel-filter-driver.c:801
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "╔у╔╘╔К╔ю╓Рф╠╢ЭцФ"
 
-#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:806
-msgid "Complete"
-msgstr "╢╟н╩╓╥╓ч╓╥╓©"
-
-#: camel/camel-filter-driver.c:761
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "╔А╔ц╔╩║╪╔╦ %d / %d ╓Р╪ХфюцФ"
 
-#: camel/camel-filter-driver.c:766 camel/camel-filter-driver.c:784
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "╔А╔ц╔╩║╪╔╦ %d / %d ╓о╪╨гт╓╥╓ч╓╥╓©"
 
-#: camel/camel-filter-driver.c:883
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "╔у╔ё╔К╔©╓н╧╫й╦╡РюоцФ╓к╔╗╔И║╪: %s: %s"
 
-#: camel/camel-filter-driver.c:888
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "╔у╔ё╔К╔©╪б╧тцФ╓к╔╗╔И║╪: %s: %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "╔у╔ё╔К╔©╦║╨В╪б╧тцФ╓к╔╗╔И║╪: %s: %s"
@@ -3480,14 +4043,33 @@ msgstr "л╓цн╓н╔ь╔ц╔ю╓г╔╞╔╗╔Й╓Р╪б╧т╓╥╓ф╓╓╓ч╓╧: %s"
 msgid "Invalid type in body-contains, expecting string"
 msgstr "л╣╦З╓й╪Ойл╓╛кэй╦╓к╢ч╓ч╓Л╓ф╓╓╓ч╓╧, й╦╩З╓Р╢Эбт╓╥╓ф╓╓╓ч╓╧"
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "╔я╔╓╔в╓╛╨Ню╝╓г╓╜╓ч╓╩╓С╓г╓╥╓©: %s"
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "%s ╓н╔у╔╘╔К╔ю╔М╔ц╔╞╓Р╨Ню╝╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "fork ╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "%s ╓н╔М╔ц╔╞╔у╔║╔╓╔К╓Р╨Ню╝╓г╓╜╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3503,113 +4085,108 @@ msgstr "fcntl(2)╓Р╩х╓ц╓©╔М╔ц╔╞╓к╪╨гт╓╥╓ч╓╥╓©: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2)╓Р╩х╓ц╓©╔М╔ц╔╞╓к╪╨гт╓╥╓ч╓╥╓©: %s"
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "╔А║╪╔К╔у╔║╔╓╔К %s ╓Р╔а╔╖╔ц╔╞╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "╔А║╪╔К╔у╔║╔╓╔К %s ╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "╔А║╪╔К╔у╔║╔╓╔К %s ╓н╔ф╔С╔щ╔И╔Й╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/camel-movemail.c:199
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "%s ╓н╔М╔ц╔╞╔у╔║╔╓╔К╓Р╔ф╔╧╔х╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
-
-#: camel/camel-movemail.c:245
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "╔А║╪╔К╔у╔║╔╓╔К╓нфи╓ъ╧Ч╓ъцФ╓к╔╗╔И║╪: %s"
-
-#: camel/camel-movemail.c:256
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "╔А║╪╔К╨Н╤х╔у╔║╔╓╔К╓н╫Я╓╜╧Ч╓ъцФ╓к╔╗╔И║╪: %s"
-
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "╨Н╤х╔у╔║╔╓╔К %s ╓ь╔А║╪╔К╓нйщб╦╓к╪╨гт╓╥╓ч╓╥╓©: %s"
 
-#: camel/camel-movemail.c:306
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "╔я╔╓╔в╓╛╨Ню╝╓г╓╜╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "fork ╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail ╔в╔М╔╟╔И╔Ю╓о╪╨гт╓╥╓ч╓╥╓©: %s"
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(л╓цн╓н╔╗╔И║╪)"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "╔А║╪╔К╔у╔║╔╓╔К╓нфи╓ъ╧Ч╓ъцФ╓к╔╗╔И║╪: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "╔А║╪╔К╨Н╤х╔у╔║╔╓╔К╓н╫Я╓╜╧Ч╓ъцФ╓к╔╗╔И║╪: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "╔А║╪╔К╨Н╤х╔у╔║╔╓╔К╓н╔Ё╔т║╪цФ╓к╔╗╔И║╪: %s"
 
-#: camel/camel-pgp-context.c:190
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "╓╒╓й╓©╓н %s ╔я╔╧╔у╔Л║╪╔╨ ( %s мя) ╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "╓╒╓й╓©╓н %s ╔я╔╧╔у╔Л║╪╔╨╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: camel/camel-pgp-context.c:511
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr "╔╣╔╓╔С╓╧╓К╓©╓А╓н╔в╔Л╔╓╔С╔ф╔╜╔╧╔х╓╛╓╒╓Й╓ч╓╩╓С"
 
-#: camel/camel-pgp-context.c:518 camel/camel-pgp-context.c:690
-#: camel/camel-pgp-context.c:1057 camel/camel-pgp-context.c:1269
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "дС╤║╓╣╓Л╓©╔я╔╧╔О║╪╔и╓о╓╒╓Й╓ч╓╩╓С"
 
-#: camel/camel-pgp-context.c:524 camel/camel-pgp-context.c:696
-#: camel/camel-pgp-context.c:879 camel/camel-pgp-context.c:1064
-#: camel/camel-pgp-context.c:1276
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "GPG/PGP ╓ь╓н╔я╔╓╔в╓╛╨Ню╝╓г╓╜╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/camel-pgp-context.c:683
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr "╔╞╔Й╔╒╔╣╔╓╔С╓╧╓К╓©╓А╓н╔в╔Л╔╓╔С╔ф╔╜╔╧╔х╓╛╓╒╓Й╓ч╓╩╓С"
 
-#: camel/camel-pgp-context.c:873
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr "╔ы╔Й╔у╔║╔╓╓╧╓К╓©╓А╓н╔в╔Л╔╓╔С╔ф╔╜╔╧╔х╓╛╓╒╓Й╓ч╓╩╓С"
 
-#: camel/camel-pgp-context.c:890
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "╨Н╤х╔у╔║╔╓╔К╓Р╨Ню╝╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/camel-pgp-context.c:1047
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr "иД╧Ф╡╫╓╧╓К╓©╓А╓н╔в╔Л╔╓╔С╔ф╔╜╔╧╔х╓╛╓╒╓Й╓ч╓╩╓С"
 
-#: camel/camel-pgp-context.c:1073
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "╪У©╝╪т╓╛╩ьдЙ╓╣╓Л╓ф╓╓╓ч╓╩╓С"
 
-#: camel/camel-pgp-context.c:1261
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr "иЭ╧Ф╡╫╓╧╓К╓©╓А╓н╟е╧Ф╔ф╔╜╔╧╔х╓╛╓╒╓Й╓ч╓╩╓С"
 
@@ -3617,8 +4194,8 @@ msgstr "иЭ╧Ф╡╫╓╧╓К╓©╓А╓н╟е╧Ф╔ф╔╜╔╧╔х╓╛╓╒╓Й╓ч╓╩╓С"
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
-"%s ╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: ╓Ё╓н╔╥╔╧╔ф╔Ю╓г╓о╔Б╔╦╔Е║╪╔К╓нфи╓ъ╧Ч╓ъ╓Р╔╣"
-"╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С"
+"%s ╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: "
+"╓Ё╓н╔╥╔╧╔ф╔Ю╓г╓о╔Б╔╦╔Е║╪╔К╓нфи╓ъ╧Ч╓ъ╓Р╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С"
 
 #: camel/camel-provider.c:140
 #, c-format
@@ -3645,7 +4222,7 @@ msgid "Connection cancelled"
 msgstr "юэбЁ╓о╔╜╔Ц╔С╔╩╔К╓╥╓ч╓╥╓©"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s (╔щ║╪╔х %d) ╓ьюэбЁ╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
@@ -3654,13 +4231,13 @@ msgstr "%s (╔щ║╪╔х %d) ╓ьюэбЁ╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 msgid "(unknown host)"
 msgstr "(л╓цн╓н╔ш╔╧╔х)"
 
-#: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
-#: camel/camel-remote-store.c:470
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "аЮ╨Н╓о╔╜╔Ц╔С╔╩╔К╓╥╓ч╓╥╓©"
 
-#: camel/camel-remote-store.c:476
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "╔╣║╪╔п╓офмаЁюзцг╓╥╓ч╓╥╓©"
 
@@ -3712,8 +4289,8 @@ msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"╓Б╓╥╔╣║╪╔п╓╛╔╣╔щ║╪╔х╓╥╓ф╓╓╓К╓й╓И, ╓Ё╓н╔╙╔в╔╥╔Г╔С╓о╔╩╔╜╔Е╔╒╓й CRAM-MD5 г╖╬з╓Р"
-"╩х╓ц╓ф╔╣║╪╔п╓ьюэбЁ╓╥╓ч╓╧"
+"╓Б╓╥╔╣║╪╔п╓╛╔╣╔щ║╪╔х╓╥╓ф╓╓╓К╓й╓И, ╓Ё╓н╔╙╔в╔╥╔Г╔С╓о╔╩╔╜╔Е╔╒╓й CRAM-MD5 "
+"г╖╬з╓Р╩х╓ц╓ф╔╣║╪╔п╓ьюэбЁ╓╥╓ч╓╧"
 
 #: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
@@ -3724,8 +4301,8 @@ msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
-"╓Б╓╥╔╣║╪╔п╓╛╔╣╔щ║╪╔х╓╥╓ф╓╓╓К╓й╓И, ╓Ё╓н╔╙╔в╔╥╔Г╔С╓о╔╩╔╜╔Е╔╒╓й DIGEST-MD5 ╓Р"
-"╩х╓ц╓ф╔╣║╪╔п╓кюэбЁ╓╥╓ч╓╧"
+"╓Б╓╥╔╣║╪╔п╓╛╔╣╔щ║╪╔х╓╥╓ф╓╓╓К╓й╓И, ╓Ё╓н╔╙╔в╔╥╔Г╔С╓о╔╩╔╜╔Е╔╒╓й DIGEST-MD5 "
+"╓Р╩х╓ц╓ф╔╣║╪╔п╓кюэбЁ╓╥╓ч╓╧"
 
 #: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
@@ -3770,7 +4347,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:442
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "╔╣║╪╔п╓╚╓И╢ж╟Ц╓ц╓©г╖╬з╠ЧеЗ╓╛╓╒╓Й╓ч╓╥╓©"
 
@@ -3839,7 +4416,7 @@ msgstr ""
 msgid "No provider available for protocol `%s'"
 msgstr "╔в╔М╔х╔Ё╔К `%s' ╓РмЬмя╓г╓╜╓К╔в╔М╔п╔╓╔ю╓о╓╒╓Й╓ч╓╩╓С"
 
-#: camel/camel-session.c:479
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3885,33 +4462,17 @@ msgstr "╔А╔ц╔╩║╪╔╦╓н╔г╔Ё║╪╔и╓к╪╨гт╓╥╓ч╓╥╓©"
 msgid "Failed to verify certificates."
 msgstr "г╖╬з╓н╬злю╓к╪╨гт╓╥╓ч╓╥╓©"
 
-#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:1017 mail/mail-ops.c:1024
-#: mail/mail-ops.c:1042 mail/mail-ops.c:1043
-msgid "Trash"
-msgstr "╓╢╓ъх╒"
-
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
-"╔А║╪╔К: %s\n"
-"╤╕длл╬: %s\n"
-"ах©╔╔Ф╔к╔ц╔х: %s\n"
-"ах©╔: %s\n"
-"╬Л╫Й: %s\n"
-"╫ё: %s\n"
-"╧Я: %s"
+"х╞╧т: %s\n"
+"бп╬щ: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:428 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3926,26 +4487,36 @@ msgstr ""
 "\n"
 "╬╣бЗ╓Рк╬╓ъ╓ч╓╧╓╚?"
 
-#: camel/camel-tcp-stream-openssl.c:423
+#: camel/camel-tcp-stream-ssl.c:348
 #, c-format
 msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
 msgstr ""
-"х╞╧т: %s\n"
-"бп╬щ: %s"
+"╔А║╪╔К: %s\n"
+"╤╕длл╬: %s\n"
+"ах©╔╔Ф╔к╔ц╔х: %s\n"
+"ах©╔: %s\n"
+"╬Л╫Й: %s\n"
+"╫ё: %s\n"
+"╧Я: %s"
 
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL `%s' ╓Р╡Рюо╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s ╓к %s ╓н╓Х╓╕╓й╔А╔ц╔╩║╪╔╦╓о╓╒╓Й╓ч╓╩╓С"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "╓╫╓н╓Х╓╕╓й╔А╔ц╔╩║╪╔╦╓о╓╒╓Й╓ч╓╩╓С: %s"
@@ -3954,68 +4525,75 @@ msgstr "╓╫╓н╓Х╓╕╓й╔А╔ц╔╩║╪╔╦╓о╓╒╓Й╓ч╓╩╓С: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "╓Ё╓н╔╢╔ъх╒╔у╔╘╔К╔ю╓╚╓И╔А╔ц╔╩║╪╔╦╓Р╔Ё╔т║╪╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С"
 
-#: camel/providers/imap/camel-imap-message-cache.c:150
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "╔╜╔Ц╔ц╔╥╔Е╔г╔ё╔Л╔╞╔х╔Й╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
-
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP ╔╣║╪╔п╓╚╓Им╫╢Э╓╥╓й╓╓╠ЧеЗ╓╛╓╒╓Й╓ч╓╥╓©: %s"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ╔Ё╔ч╔С╔и╓о╪╨гт╓╥╓ч╓╥╓©: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "л╓цн╓н╔╗╔И║╪"
-
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "╔╣║╪╔п╔Л╔╧╔щ╔С╔╧╓о╓╒╓ц╓╠╓й╓╞╫╙╓О╓Й╓ч╓╥╓©"
 
-#: camel/providers/imap/camel-imap-command.c:489
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ╔╣║╪╔п╓н╠ЧеЗ╓о %s ╬ПйС╓Р╢ч╓С╓г╓╓╓ч╓╩╓С"
 
-#: camel/providers/imap/camel-imap-command.c:526
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP ╔╣║╪╔п╓╚╓Им╫╢Э╓╥╓й╓╓ OK ╠ЧеЗ╓╛╓╒╓Й╓ч╓╥╓©: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:188
+#: camel/providers/imap/camel-imap-folder.c:192
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "╔г╔ё╔Л╔╞╔х╔Й %s ╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:207
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s ╓н╔╣╔ч╔Й║╪╓Р╔М║╪╔и╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/imap/camel-imap-folder.c:267
+#: camel/providers/imap/camel-imap-folder.c:275
 msgid "Folder was destroyed and recreated on server."
 msgstr "╔у╔╘╔К╔ю╓огк╡У╓╣╓Л╨ф╨Ню╝╓╣╓Л╓ч╓╥╓©"
 
-#: camel/providers/imap/camel-imap-folder.c:415
-msgid "Scanning IMAP folder"
-msgstr "IMAP ╔у╔╘╔К╔ю╓РаЖ╨╨цФ"
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "╔А╔ц╔╩║╪╔╦╓Рйщб╦цФ"
 
-#: camel/providers/imap/camel-imap-folder.c:1437
-#: camel/providers/imap/camel-imap-folder.c:1673
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓о╦╫╨ъмЬмя╫пмХ╓ч╓╩╓С"
 
-#: camel/providers/imap/camel-imap-folder.c:1465
-#: camel/providers/imap/camel-imap-folder.c:1706
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "╔А╔ц╔╩║╪╔╦╓Рйщб╦цФ"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH ╠ЧеЗ╓к╔А╔ц╔╩║╪╔╦кэбн╓Р╦╚иу╓╠╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:16
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "╔╜╔Ц╔ц╔╥╔Е╔г╔ё╔Л╔╞╔х╔Й╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "©╥цЕ╔А║╪╔К╓н╔а╔╖╔ц╔╞"
 
@@ -4023,7 +4601,7 @@ msgstr "©╥цЕ╔А║╪╔К╓н╔а╔╖╔ц╔╞"
 msgid "Check for new messages in all folders"
 msgstr "╓╧╓ы╓ф╓н╔у╔╘╔К╔ю╓н©╥цЕ╔А║╪╔К╓Р╔а╔╖╔ц╔╞╓╥╓ч╓╧"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:599
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "╔у╔╘╔К╔ю"
 
@@ -4056,28 +4634,28 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "╓Ё╓н╔╙╔в╔╥╔Г╔С╓о╔в╔Л╔╓╔С╔ф╔╜╔╧╔х╔я╔╧╔О║╪╔и╓Р╩х╓ц╓ф IMAP ╔╣║╪╔п╓кюэбЁ╓╥╓ч╓╧"
 
-#: camel/providers/imap/camel-imap-store.c:465
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ╔╣║╪╔п %s ╓омв╣А╓╥╓©г╖╬з╔©╔╓╔в %s ╓Р╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С"
 
-#: camel/providers/imap/camel-imap-store.c:475
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "г╖╬з╔©╔╓╔в %s ╓Р╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С"
 
-#: camel/providers/imap/camel-imap-store.c:499
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s %s@%s ╓н IMAP ╔я╔╧╔О║╪╔и╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: camel/providers/imap/camel-imap-store.c:514
-#: camel/providers/smtp/camel-smtp-transport.c:410
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "╔я╔╧╔О║╪╔и╓РфЧно╓╥╓ф╓╓╓ч╓╩╓С"
 
-#: camel/providers/imap/camel-imap-store.c:540
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4088,36 +4666,51 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:829 mail/mail-local.c:333
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
 msgid "No such folder %s"
 msgstr "╓╫╓н╓Х╓╕╓й╔у╔╘╔К╔ю %s ╓о╓╒╓Й╓ч╓╩╓С"
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "MH ╥а╪╟╓н╔А║╪╔К╔г╔ё╔Л╔╞╔х╔Й"
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr "MH╔И╔╓╔╞╓й╔А║╪╔К╔г╔ё╔Л╔╞╔х╔Й╓к╔М║╪╔╚╔К╔А║╪╔К╓Рйщб╦╓╥╓ч╓╧"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr "и╦╫Юе╙╓й UNIX ╓н mailbox ╔у╔║╔╓╔К"
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr "и╦╫Ю mbox ╥©╪╟╓г╔М║╪╔╚╔К╔А║╪╔К╓Рйщб╦╓╥╓ч╓╧"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr "Qmail maildir╥©╪╟╓н╔А║╪╔К╔у╔║╔╓╔К"
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr "qmail maildir╔г╔ё╔Л╔╞╔х╔Й╓к╔М║╪╔╚╔К╔А║╪╔К╓Рйщб╦╓╥╓ч╓╧"
 
+#: camel/providers/local/camel-local-provider.c:70
+#, fuzzy
+msgid "Unix mbox spool-format mail files"
+msgstr "Qmail maildir╥©╪╟╓н╔А║╪╔К╔у╔║╔╓╔К"
+
+#: camel/providers/local/camel-local-provider.c:71
+#, fuzzy
+msgid "For storing local mail in standard Unix spool directories"
+msgstr "qmail maildir╔г╔ё╔Л╔╞╔х╔Й╓к╔М║╪╔╚╔К╔А║╪╔К╓Рйщб╦╓╥╓ч╓╧"
+
 #: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "йщб╦╓╣╓Л╓©╔К║╪╔х %s ╓оюДбп╔я╔╧╓г╓о╓╒╓Й╓ч╓╩╓С"
@@ -4158,7 +4751,8 @@ msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 "╔у╔╘╔К╔ю╓╚╓И╔╓╔С╔г╔ц╔╞╔╧╔у╔║╔╓╔К `%s' ╓Р╨О╫Э╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr "╔╣╔ч╔Й╓ь╔А╔ц╔╩║╪╔╦╓Рди╡ц╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С: л╓цн╓нмЩмЁ╓г╓╧"
 
@@ -4174,6 +4768,7 @@ msgstr "maildir ╥а╪╟╓н╔у╔╘╔К╔ю╓ь╔А╔ц╔╩║╪╔╦╓Рди╡ц╫пмХ╓ч╓╩╓С: %s: %s"
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4185,6 +4780,7 @@ msgstr ""
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-mbox-folder.c:322
 #: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "╓╫╓н╓Х╓╕╓й╔А╔ц╔╩║╪╔╦╓о╓╒╓Й╓ч╓╩╓С"
 
@@ -4193,7 +4789,7 @@ msgstr "╓╫╓н╓Х╓╕╓й╔А╔ц╔╩║╪╔╦╓о╓╒╓Й╓ч╓╩╓С"
 msgid "Invalid message contents"
 msgstr "╔А╔ц╔╩║╪╔╦╓нфБмф╓ол╣╦З╓г╓╧"
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4203,14 +4799,14 @@ msgstr ""
 "╔у╔╘╔К╔ю `%s' ╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "╔у╔╘╔К╔ю `%s' ╓об╦╨ъ╓╥╓ч╓╩╓С"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4220,22 +4816,29 @@ msgstr ""
 "╔у╔╘╔К╔ю `%s' ╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' ╓о maildir ╥а╪╟╓н╔г╔ё╔Л╔╞╔х╔Й╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "╔у╔╘╔К╔ю `%s' ╓Р╨О╫Э╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "maildir ╥а╪╟╓н╔г╔ё╔Л╔╞╔х╔Й╓г╓о╓╒╓Й╓ч╓╩╓С"
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"╔у╔╘╔К╔ю `%s' ╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©:\n"
+"%s"
+
 #: camel/providers/local/camel-maildir-summary.c:405
 #: camel/providers/local/camel-maildir-summary.c:526
 #, c-format
@@ -4243,11 +4846,13 @@ msgid "Cannot open maildir directory path: %s: %s"
 msgstr "maildir ╔г╔ё╔Л╔╞╔х╔Й╔я╔╧╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s ╓н╔у╔╘╔К╔ю╔М╔ц╔╞╓Р╨Ню╝╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "mailbox╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С: %s: %s\n"
@@ -4260,6 +4865,9 @@ msgstr "mbox ╔у╔║╔╓╔К╓к╔А╔ц╔╩║╪╔╦╓Рди╡ц╫пмХ╓ч╓╩╓С: %s: %s"
 #: camel/providers/local/camel-mbox-folder.c:338
 #: camel/providers/local/camel-mbox-folder.c:370
 #: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4269,10 +4877,12 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "╔у╔╘╔К╔ю╓г╡СиЭитг╫╓й╔╗╔И║╪╓╛х╞ю╦╓╥╓©╓Х╓╕╓г╓╧"
 
 #: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "╔А╔ц╔╩║╪╔╦╓н╡Р╪А╓к╪╨гт╓╥╓ч╓╥╓©: ╢ж╟Ц╓ц╓©╔А║╪╔К╔э╔ц╔╞╔╧╓г╓╧╓╚?"
 
@@ -4318,36 +4928,45 @@ msgstr "╔у╔╘╔К╔ю `%s' ╓о╤У╓г╓о╓╒╓Й╓ч╓╩╓С. ╨О╫Э╓╥╓ч╓╩╓С"
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
 #: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "╔у╔╘╔К╔ю╓Р╔╣╔ч╔И╔╓╔╨цФ"
 
 #: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "╔у╔╘╔К╔ю╓РЁ╚╓╠╓ч╓╩╓С╓г╓╥╓©: %s: ╔щ╔╦╔╥╔Г╔С %ld ╓╚╓И╔╣╔ч╔И╔╓╔╨цФ: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "╔щ╔╦╔╥╔Г╔С %ld иу╤А ╔у╔╘╔К╔ю %s ╓гцвл©е╙╓й╔А║╪╔К╧╫й╦╡Рюо╔╗╔И║╪╓г╓╧"
 
 #: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "╔у╔╘╔К╔ю╓Р╔╣╔ч╔И╔╓╔╨╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1598
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "╔у╔╘╔К╔ю╓Рф╠╢ЭцФ"
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "╔у╔╘╔К╔ю╓Р╔╣╔ч╔И╔╓╔╨╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "╔ф╔С╔щ╔И╔Й mailbox ╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С: %s"
@@ -4356,21 +4975,28 @@ msgstr "╔ф╔С╔щ╔И╔Й mailbox ╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С: %s"
 #: camel/providers/local/camel-mbox-summary.c:557
 #: camel/providers/local/camel-mbox-summary.c:746
 #: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "ф╠╢Э╓╥╓ч╓╥╓©╓╛, ╔╣╔ч╔Й║╪╓х╔у╔╘╔К╔ю╓╛ит╟Лцв╓г╓╧"
 
 #: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "╨Н╤х mailbox ╓ь╫Я╓╜╫п╓╥цФ╓к╔╗╔И║╪: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "╨Н╤х mailbox ╓ь╫Я╓╜╫п╓╥цФ╓к╔╗╔И║╪: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:635
 #: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "╦╣╓н╔у╔╘╔К╔ю %s ╓Рйд╓╦╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
@@ -4385,7 +5011,9 @@ msgstr "╨Н╤х╔у╔╘╔К╔ю╓Рйд╓╦╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 msgid "Could not rename folder: %s"
 msgstr "╔у╔╘╔К╔ю╓Р╔Й╔м║╪╔Ю╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "л╓цн╓н╔╗╔И║╪: %s"
@@ -4405,39 +5033,93 @@ msgstr "`%s' ╓о╔г╔ё╔Л╔╞╔х╔Й╓г╓о╓╒╓Й╓ч╓╩╓С"
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH ╔г╔ё╔Л╔╞╔х╔Й╔я╔╧╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С: %s: %s"
 
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "mbox ╔у╔║╔╓╔К╓к╔А╔ц╔╩║╪╔╦╓Рди╡ц╫пмХ╓ч╓╩╓С: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "`%s' ╓одл╬О╓н╔у╔║╔╓╔К╓г╓о╓╒╓Й╓ч╓╩╓С"
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "╔у╔╘╔К╔ю `%s' ╓об╦╨ъ╓╥╓ч╓╩╓С"
+
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy
+msgid "Spool stores do not have an inbox"
+msgstr "╔М║╪╔╚╔К╓ь╓нйщб╦╓о inbox ╓Р╩Щ╓ф╓ч╓╩╓С"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "╔М║╪╔╚╔К╔А║╪╔К╔у╔║╔╓╔К %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "╔А║╪╔К╔у╔║╔╓╔К %s ╓н╔ф╔С╔щ╔И╔Й╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "╦╣╓н╔у╔╘╔К╔ю %s ╓Рйд╓╦╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "%s@%s ╓н NNTP ╔я╔╧╔О║╪╔и╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "╔╣║╪╔п╓о╔Ф║╪╔╤л╬╓Р╣Яхщ╓╥╓ч╓╥╓©"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "╔╣║╪╔п╓ь╔Ф║╪╔╤л╬╓наВ©╝╓к╪╨гт╓╥╓ч╓╥╓©"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "╔╣║╪╔п╓о╔Ф║╪╔╤л╬/╔я╔╧╔О║╪╔и╓Р╣Яхщ╓╥╓ч╓╥╓©"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "╔А╔ц╔╩║╪╔╦ %s ╓о╦╚иу╓╚╓Й╓ч╓╩╓С"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "╔╣║╪╔п╓╚╓И╔╟╔К║╪╔в╔Й╔╧╔х╓Р╪Хфю╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "%s ╓н╔╟╔К║╪╔в╔Й╔╧╔х╔у╔║╔╓╔К╓Р╔М║╪╔и╫пмХ╓ч╓╩╓С: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "%s ╓н╔╟╔К║╪╔в╔Й╔╧╔х╔у╔║╔╓╔К╓Рйщб╦╫пмХ╓ч╓╩╓С: %s"
@@ -4450,25 +5132,25 @@ msgstr "USENET news"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "╓Ё╓Л╓о USENET ╓н╔к╔Е║╪╔╧╔╟╔К║╪╔в╓ьаВ╪У©╝╓╧╓К╓©╓А╓н╔в╔М╔п╔╓╔ю╓г╓╧"
 
-#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "╔к╔Е║╪╔╧╔╣║╪╔п╓н╔г╔ё╔Л╔╞╔х╔Й╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s ╥пмЁ╓н USENET News"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 "╓Ё╓н╔╙╔в╔╥╔Г╔С╓о╔в╔Л╔╓╔С╔ф╔╜╔╧╔х╔я╔╧╔О║╪╔и╓Р╩х╓ц╓ф NNTP ╔╣║╪╔п╓гг╖╬з╓╥╓ч╓╧"
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "%s ╓н .newsrc ╔у╔║╔╓╔К╓Р╨Ню╝╓ч╓©╓оЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С: %s"
@@ -4519,7 +5201,7 @@ msgstr "╔╣║╪╔п╓к╔А╔ц╔╩║╪╔╦╓Р╩д╓╧"
 msgid "Delete after %s day(s)"
 msgstr "%s фЭ╦Е╓к╨О╫Э╓╧╓К"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:58
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4528,8 +5210,9 @@ msgid ""
 "For connecting to POP servers. The POP protocol can also be used to retrieve "
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
-"POP ╔╣║╪╔п╓ьюэбЁ╓╧╓К╓©╓А╓к, POP ╔в╔М╔х╔Ё╔К╓офцдЙ╓н web ╔А║╪╔К╔в╔М╔п╔╓╔ю╓Дфх╪╚"
-"╓н╔А║╪╔К╔╥╔╧╔ф╔Ю╓╚╓И E ╔А║╪╔К╓Р╪У©╝╓╧╓К╓©╓А╓к╩х╓╕╓Ё╓х╓╛╫пмХ╓ч╓╧"
+"POP ╔╣║╪╔п╓ьюэбЁ╓╧╓К╓©╓А╓к, POP ╔в╔М╔х╔Ё╔К╓офцдЙ╓н web "
+"╔А║╪╔К╔в╔М╔п╔╓╔ю╓Дфх╪╚╓н╔А║╪╔К╔╥╔╧╔ф╔Ю╓╚╓И E "
+"╔А║╪╔К╓Р╪У©╝╓╧╓К╓©╓А╓к╩х╓╕╓Ё╓х╓╛╫пмХ╓ч╓╧"
 
 #: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
@@ -4545,9 +5228,9 @@ msgid ""
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
-"╓Ё╓н╔╙╔в╔╥╔Г╔С╓о APOP ╔в╔М╔х╔Ё╔К╥пмЁ╓г╟е╧Ф╡╫╓╣╓Л╓©╔я╔╧╔О║╪╔и╓Р╩х╓ц╓ф POP ╔╣║╪"
-"╔п╓ьюэбЁ╓╥╓ч╓╧. ╓Ё╓Л╓о╦Ьй©╓й╔╣╔щ║╪╔х╓Рмв╣А╓╧╓К╔╣║╪╔п╓г, ╓╧╓ы╓ф╓н╔Ф║╪╔╤╓╛ю╣╬О"
-"╓кф╟╨Н╓╧╓К╓О╓╠╓г╓о╓╒╓Й╓ч╓╩╓С."
+"╓Ё╓н╔╙╔в╔╥╔Г╔С╓о APOP ╔в╔М╔х╔Ё╔К╥пмЁ╓г╟е╧Ф╡╫╓╣╓Л╓©╔я╔╧╔О║╪╔и╓Р╩х╓ц╓ф POP "
+"╔╣║╪╔п╓ьюэбЁ╓╥╓ч╓╧. ╓Ё╓Л╓о╦Ьй©╓й╔╣╔щ║╪╔х╓Рмв╣А╓╧╓К╔╣║╪╔п╓г, "
+"╓╧╓ы╓ф╓н╔Ф║╪╔╤╓╛ю╣╬О╓кф╟╨Н╓╧╓К╓О╓╠╓г╓о╓╒╓Й╓ч╓╩╓С."
 
 #: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
@@ -4611,7 +5294,7 @@ msgid "No such folder `%s'."
 msgstr "╓╫╓н╓Х╓╕╓й╔у╔╘╔К╔ю `%s' ╓о╓╒╓Й╓ч╓╩╓С"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4625,8 +5308,7 @@ msgstr ""
 #: camel/providers/sendmail/camel-sendmail-transport.c:107
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr ""
-"sendmail ╓ь╔я╔╓╔в╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
+msgstr "sendmail ╓ь╔я╔╓╔в╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:124
 #, c-format
@@ -4665,7 +5347,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmail ╥пмЁ╓г╔А║╪╔К╓Ргш©╝"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:70
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4673,122 +5355,122 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "SMTP╓Р╩х╓ц╓ф╔Й╔Б║╪╔х╔А║╪╔К╔о╔ж╓кюэбЁ╓╧╓К╓Ё╓х╓г╔А║╪╔К╓Ргш©╝╓╥╓ч╓╧\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:168
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "╧╫й╦╡Рюо╔╗╔И║╪, ╔Ё╔ч╔С╔и╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "╔я╔И╔А║╪╔©╓╒╓К╓╓╓о╟З©Т╓к╧╫й╦╡Рюо╔╗╔И║╪"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "╔Ё╔ч╔С╔и╓о╪баУ╓╣╓Л╓ф╓╓╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "╔Ё╔ч╔С╔и╔я╔И╔А║╪╔©╓о╪баУ╓╣╓Л╓ф╓╓╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr "╔╥╔╧╔ф╔Ю╔╧╔ф║╪╔©╔╧╓╒╓К╓╓╓о╔╥╔╧╔ф╔Ю╔ь╔К╔в╠ЧеЗ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "╔ь╔К╔в╔А╔ц╔╩║╪╔╦"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "╔╣║╪╔с╔╧╓омЬмя╓г╓╜╓ч╓╧"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr "╔╣║╪╔с╔╧╓оаВ©╝╔а╔Ц╔С╔м╔К╓Рйд╓╦╓ф╓╓╓ч╓╧"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr "╔╣║╪╔с╔╧╓омЬмя╓г╓╜╓ч╓╩╓С, аВ©╝╔а╔Ц╔С╔м╔К╓Рйд╓╦╓ф╓╓╓ч╓╧"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr "мв╣А╓╣╓Л╓©╔А║╪╔К╓нф╟╨Н╓оOK, ╢╟н╩╓╥╓ч╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr "╔Ф║╪╔╤╓о╔М║╪╔╚╔К╓г╓о╓╒╓Й╓ч╓╩╓С; <forward-path> ╓ье╬аВ╓╥╓ч╓╧"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "мв╣А╓╣╓Л╓©╔А║╪╔К╓нф╟╨Н╓о╢╟н╩╓╥╓ч╓╩╓С: ╔А║╪╔К╔э╔ц╔╞╔╧╓омЬмя╓г╓╜╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "мв╣А╓╣╓Л╓©ф╟╨Н╓о╢╟н╩╓╥╓ч╓╩╓С: ╔А║╪╔К╔э╔ц╔╞╔╧╓омЬмя╓г╓╜╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr "мв╣А╓╣╓Л╓©ф╟╨Н╓РцФцг╓╥╓ч╓╥╓©: ╫ХмЩцФ╓к╔╗╔И║╪"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr "╔Ф║╪╔╤╓о╔М║╪╔╚╔К╓г╓о╓╒╓Й╓ч╓╩╓С; <forward-path> ╓Р╩Н╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr "мв╣А╓╣╓Л╓©ф╟╨Н╓о╢╟н╩╓╥╓ч╓╩╓С: ╔╥╔╧╔ф╔Ю╓нйщб╦нн╟Х╓╛б╜╓Й╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "мв╣А╓╣╓Л╓©╔А║╪╔К╓нф╟╨Н╓РцФцг╓╥╓ч╓╥╓©: нн╟ХЁД╓ЙеЖ╓ф╓Р╠ш╓╗╓ч╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "мв╣А╓╣╓Л╓©ф╟╨Н╓о╢╟н╩╓╥╓ч╓╩╓С: ╔А║╪╔К╔э╔ц╔╞╔╧л╬╓ог╖╓А╓И╓Л╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "╔А║╪╔К╓нфЧно╓РЁ╚╩о╓╥╓ч╓╧; <CRLF>.<CRLF> ╓г╫╙н╩╓╥╓ч╓╧"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "╫ХмЩ╓о╪╨гт╓╥╓ч╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr "╔я╔╧╔О║╪╔и╓нйя╧╧╓╛и╛мв╓г╓╧"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "г╖╬з╔А╔╚╔к╔╨╔Ю╓оит╫╫й╛╡А╓╝╓ч╓╧"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr "мв╣А╓╥╓©г╖╬з╔А╔╚╔к╔╨╔Ю╓н╓©╓А╓к╟е╧Ф╡╫╓╛и╛мв╓г╓╧"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "╟Л╩Че╙╓йг╖╬з╓к╪╨гт╓╥╓ч╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "г╖╬з╓Ри╛мв╓х╓╥╓ф╓╓╓ч╓╧"
 
-#: camel/providers/smtp/camel-smtp-transport.c:313
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "╫И╢Э╠ЧеЗ╔╗╔И║╪: %s: ╓©╓ж╓Сцвл©е╙╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:356
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "SMTP ╔╣║╪╔п %s ╓омв╣А╓╥╓©г╖╬з╔©╔╓╔в %s ╓Р╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:395
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s %s@%s ╓н SMTP ╔я╔╧╔О║╪╔и╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: camel/providers/smtp/camel-smtp-transport.c:418
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4799,115 +5481,127 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:534
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ╔╣║╪╔п %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s ╥пмЁ╓г SMTP ╔А║╪╔К╓Ргш©╝╓╥╓ч╓╧"
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr "╔А╔ц╔╩║╪╔╦╓РаВ©╝╫пмХ╓ч╓╩╓С: аВ©╝╪т╓н╔╒╔и╔Л╔╧╓╛дЙ╣а╓╣╓Л╓ф╓╓╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr "╔А╔ц╔╩║╪╔╦╓РаВ©╝╫пмХ╓ч╓╩╓С: аВ©╝╪т╓н╔╒╔и╔Л╔╧╓╛ю╣╓╥╓╞╓╒╓Й╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "╔А╔ц╔╩║╪╔╦╓РаВ©╝цФ"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "╔А╔ц╔╩║╪╔╦╓РаВ©╝╫пмХ╓ч╓╩╓С: ╪У©╝╪т╓╛дЙ╣а╓╣╓Л╓ф╓╓╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:676
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO мв╣А╓н╔©╔╓╔Ю╔╒╔╕╔х: %s: цвл©е╙╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:695
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO ╔Л╔╧╔щ╔С╔╧╔╗╔И║╪: %s: цвл©е╙╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr "SASL г╖╬з╔╙╔ж╔╦╔╖╔╞╔х╓ню╦ю╝цФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#: camel/providers/smtp/camel-smtp-transport.c:755
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "г╖╬з"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH мв╣А╓н╔©╔╓╔Ю╔╒╔╕╔х: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:782
 msgid "AUTH request failed."
 msgstr "AUTH мв╣А╓к╪╨гт╓╥╓ч╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:809
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr "╔╣║╪╔п╓╚╓И╢ж╟Ц╓ц╓©г╖╬з╠ЧеЗ╓╛╓╒╓Й╓ч╓╥╓©\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:835
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM мв╣А╓н╔©╔╓╔Ю╔╒╔╕╔х: %s: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:854
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "MAIL FROM ╔Л╔╧╔щ╔С╔╧╔╗╔И║╪: %s: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO мв╣А╓н╔©╔╓╔Ю╔╒╔╕╔х: %s: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:898
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "RCPT TO ╔Л╔╧╔щ╔С╔╧╔╗╔И║╪: %s: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:929
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA мв╣А╓н╔©╔╓╔Ю╔╒╔╕╔х: %s: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:948
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA ╔Л╔╧╔щ╔С╔╧╔╗╔И║╪: %s: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA аВ©╝╓н╔©╔╓╔Ю╔╒╔╕╔х: ╔А╔ц╔╩║╪╔╦╓н╫╙н╩: %s: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
-msgstr ""
-"DATA ╔Л╔╧╔щ╔С╔╧╔╗╔И║╪: ╔А╔ц╔╩║╪╔╦╓н╫╙н╩: %s: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
+msgstr "DATA ╔Л╔╧╔щ╔С╔╧╔╗╔И║╪: ╔А╔ц╔╩║╪╔╦╓н╫╙н╩: %s: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET мв╣А╓н╔©╔╓╔Ю╔╒╔╕╔х: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1043
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET ╔Л╔╧╔щ╔С╔╧╔╗╔И║╪: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT мв╣А╓н╔©╔╓╔Ю╔╒╔╕╔х: %s: цвл©е╙╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT ╔Л╔╧╔щ╔С╔╧╔╗╔И║╪: %s: цвл©е╙╓г╓о╓╒╓Й╓ч╓╩╓С"
@@ -4937,75 +5631,137 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:336 mail/mail-display.c:123
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "е╨иу"
 
-#: composer/e-msg-composer-attachment-bar.c:426
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "╔у╔║╔╓╔К╓Ре╨иу╓╥╓ч╓╧"
-
-#: composer/e-msg-composer-attachment-bar.c:474
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "е╨иуй╙╔Й╔╧╔х╓╚╓Иа╙бР╓╥╓©╔╒╔╓╔ф╔Ю╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: composer/e-msg-composer-attachment-bar.c:505
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "е╨иу╓нди╡ц..."
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "╔А╔ц╔╩║╪╔╦╓ь╔у╔║╔╓╔К╓Ре╨иу╓╥╓ч╓╧"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:11
-msgid "Attachment"
-msgstr "е╨иу"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "е╨иу╓н╔в╔М╔я╔ф╔ё"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "╔у╔║╔╓╔Кл╬:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "╔╓╔С╔И╔╓╔С╓ге╨иу"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "MIME ╔©╔╓╔в:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "аВ©╝юХ:"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
+msgstr ""
 
-#: composer/e-msg-composer.c:621
-#, c-format
+#: composer/e-msg-composer-hdrs.c:328
+msgid "Click here for the address book"
+msgstr "╔╒╔и╔Л╔╧д╒╓н╓©╓А╓к╓Ё╓Ё╓г╔╞╔Й╔ц╔╞"
+
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:359
+msgid "From:"
+msgstr "╨╧╫п©м:"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:365
+msgid "Reply-To:"
+msgstr "йж©╝юХ:"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:376
+msgid "Subject:"
+msgstr "╥Ол╬:"
+
+#: composer/e-msg-composer-hdrs.c:390
+msgid "To:"
+msgstr "╟╦юХ:"
+
+#: composer/e-msg-composer-hdrs.c:391
+msgid "Enter the recipients of the message"
+msgstr "╔А╔ц╔╩║╪╔╦╓н╪У©╝╪т╓РфЧно╓╥╓ч╓╧"
+
+#: composer/e-msg-composer-hdrs.c:394
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:395
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "╔А╔ц╔╩║╪╔╦╓н╔╚║╪╔э╔С╔Ё╔т║╪╓Р╪У©╝╓╧╓К╔╒╔и╔Л╔╧╓РфЧно╓╥╓ч╓╧"
+
+#: composer/e-msg-composer-hdrs.c:398
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: composer/e-msg-composer-hdrs.c:399
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"╔А╔ц╔╩║╪╔╦╓н╪У©╝╪т╔Й╔╧╔х╓нцФ╓к╦╫╓Л╓й╓╓╓г, "
+"╔А╔ц╔╩║╪╔╦╓н╔╚║╪╔э╔С╔Ё╔т║╪╓Р╪У©╝╓╧╓К╔╒╔и╔Л╔╧╓РфЧно╓╥╓ч╓╧"
+
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "╔у╔║╔╓╔К╓Ре╨иу╓╥╓ч╓╧"
+
+#: composer/e-msg-composer.c:670
+#, fuzzy, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
 "%s"
 msgstr ""
-"╫Пл╬╔у╔║╔╓╔К %s ╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©:\n"
+"╔у╔║╔╓╔К `%s' ╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©:\n"
 "%s"
 
-#: composer/e-msg-composer.c:794
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr "╔у╔║╔╓╔К╓н╔М║╪╔ицФ╓к╔╗╔И║╪: %s"
+
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "йлл╬╓гйщб╦..."
 
-#: composer/e-msg-composer.c:805
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "╥ы╧П"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "╔у╔║╔╓╔К╓нйщб╦цФ╓к╔╗╔И║╪: %s"
 
-#: composer/e-msg-composer.c:825
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "╔у╔║╔╓╔К╓н╔М║╪╔ицФ╓к╔╗╔И║╪: %s"
 
-#: composer/e-msg-composer.c:897
+#: composer/e-msg-composer.c:997
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5013,12 +5769,53 @@ msgstr ""
 "╓Ё╓н╔╒╔╚╔╕╔С╔х╓наП╟ф╔у╔╘╔К╔ю╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С\n"
 "╔г╔у╔╘╔К╔х╓наП╟ф╔у╔╘╔К╔ю╓Р╩х╓ц╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
 
-#: composer/e-msg-composer.c:959 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:228
-msgid "Evolution"
-msgstr "Evolution"
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "╔у╔║╔╓╔К╓нйщб╦цФ╓к╔╗╔И║╪: %s"
 
-#: composer/e-msg-composer.c:965
+#: composer/e-msg-composer.c:1055
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "POP ╔╣║╪╔п %s ╓╚╓И╔А╔ц╔╩║╪╔╦╓Р╪Хфю╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
+
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"╫пно╔у╔║╔╓╔К╓Р╨Ню╝╫пмХ╓ч╓╩╓С: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"╫пно╔у╔║╔╓╔К╓Р╨Ню╝╫пмХ╓ч╓╩╓С: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"╔у╔║╔╓╔К╓нйщб╦цФ╓к╔╗╔И║╪: %s:\n"
+" %s"
+
+#: composer/e-msg-composer.c:1173
+#, fuzzy
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+"Evolution ╓о Pine ╔А║╪╔К╔у╔║╔╓╔К╓Рх╞╦╚╓╥╓ч╓╥╓©\n"
+"Evolution ╓ь╔╓╔С╔щ║╪╔х╓╥╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
+
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5028,100 +5825,29 @@ msgstr ""
 "\n"
 "йя╧╧╓Рйщб╦╓╥╓ч╓╧╓╚?"
 
-#: composer/e-msg-composer.c:990
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "╔у╔║╔╓╔К╓РЁ╚╓╞"
 
-#: composer/e-msg-composer.c:1146
-msgid "That file does not exist."
-msgstr "╓╫╓н╔у╔║╔╓╔К╓об╦╨ъ╓╥╓ч╓╩╓С"
-
-#: composer/e-msg-composer.c:1156
-msgid "That is not a regular file."
-msgstr "╓╫╓Л╓одл╬О╓н╔у╔║╔╓╔К╓г╓о╓╒╓Й╓ч╓╩╓С"
-
-#: composer/e-msg-composer.c:1166
-msgid "That file exists but is not readable."
-msgstr "╓╫╓н╔у╔║╔╓╔К╓об╦╨ъ╓╥╓ч╓╧╓╛║╓фи╓ъ╪Х╓Й╡дг╫╓г╓о╓╒╓Й╓ч╓╩╓С"
-
-#: composer/e-msg-composer.c:1176
-msgid "That file appeared accesible but open(2) failed."
-msgstr "╓╫╓н╔у╔║╔╓╔К╓о╔╒╔╞╔╩╔╧╡дг╫╓н╓Х╓╕╓к╦╚╓╗╓ч╓╧╓╛║╓open(2) ╓о╪╨гт╓╥╓ч╓╥╓©"
-
-#: composer/e-msg-composer.c:1198
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"╔у╔║╔╓╔К╓о╓х╓ф╓БбГ╓╜╓╓ (100K ╟й╬Е) ╓г╓╧\n"
-"кэеЖ╓к╓╫╓Л╓РачфЧ╓╧╓К╓Ё╓х╓Рк╬╓ъ╓ч╓╧╓╚?"
-
-#: composer/e-msg-composer.c:1219
-msgid "An error occurred while reading the file."
-msgstr "╔у╔║╔╓╔Кфи╧ЧцФ╓н╢ж╓к╔╗╔И║╪╓ох╞ю╦╓╥╓ч╓╥╓©"
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "╔ф╔╜╔╧╔х╔у╔║╔╓╔К╓начфЧ..."
 
-#: composer/e-msg-composer.c:1582 composer/e-msg-composer.c:1927
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: composer/e-msg-composer.c:2021
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "╔А║╪╔К╨Ню╝╔╕╔ё╔С╔и╔╕╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: composer/e-msg-composer-hdrs.c:324
-msgid "Click here for the address book"
-msgstr "╔╒╔и╔Л╔╧д╒╓н╓©╓А╓к╓Ё╓Ё╓г╔╞╔Й╔ц╔╞"
-
-#.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:355
-msgid "From:"
-msgstr "╨╧╫п©м:"
-
-#.
-#. * Reply-To:
-#.
-#: composer/e-msg-composer-hdrs.c:361
-msgid "Reply-To:"
-msgstr "йж©╝юХ:"
-
-#.
-#. * Subject:
-#.
-#: composer/e-msg-composer-hdrs.c:372
-msgid "Subject:"
-msgstr "╥Ол╬:"
-
-#: composer/e-msg-composer-hdrs.c:386
-msgid "To:"
-msgstr "╟╦юХ:"
-
-#: composer/e-msg-composer-hdrs.c:387
-msgid "Enter the recipients of the message"
-msgstr "╔А╔ц╔╩║╪╔╦╓н╪У©╝╪т╓РфЧно╓╥╓ч╓╧"
-
-#: composer/e-msg-composer-hdrs.c:390
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:391
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "╔А╔ц╔╩║╪╔╦╓н╔╚║╪╔э╔С╔Ё╔т║╪╓Р╪У©╝╓╧╓К╔╒╔и╔Л╔╧╓РфЧно╓╥╓ч╓╧"
-
-#: composer/e-msg-composer-hdrs.c:394
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:395
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"╔А╔ц╔╩║╪╔╦╓н╪У©╝╪т╔Й╔╧╔х╓нцФ╓к╦╫╓Л╓й╓╓╓г, ╔А╔ц╔╩║╪╔╦╓н╔╚║╪╔э╔С╔Ё╔т║╪╓Р╪У©╝╓╧"
-"╓К╔╒╔и╔Л╔╧╓РфЧно╓╥╓ч╓╧"
-
-#: composer/evolution-composer.c:355
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -5129,7 +5855,7 @@ msgstr ""
 "╔А║╪╔К╔Ё╔С╔щ║╪╔м╔С╔х╓к╓ч╓ю╧╫ю╝╓╣╓Л╓ф╓╓╓й╓╓╓©╓А\n"
 "╔А╔ц╔╩║╪╔╦╨Ню╝╔╕╔ё╔С╔и╔╕╓Р╨Ню╝╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: composer/evolution-composer.c:370
+#: composer/evolution-composer.c:374
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolution ╔А║╪╔К╨Ню╝╓н╫И╢Э╡╫╓╛╫пмХ╓ч╓╩╓С"
 
@@ -5146,42 +5872,56 @@ msgid "calendar information"
 msgstr "╔╚╔Л╔С╔ю╬ПйС"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-#: e-util/e-time-utils.c:323
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
-#: e-util/e-time-utils.c:315
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
 msgid "%H:%M"
 msgstr "%H:%M"
 
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%Y/%m/%d"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%Y/%m/%d (%a)"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
+
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -5189,249 +5929,65 @@ msgstr "%Y/%m/%d (%a)"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%Y/%m/%d (%a) %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M"
 
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Evolution ╪б╧т╔╣╔ч╔Й║╪╔Ё╔С╔щ║╪╔м╔С╔х╓н╫И╢Э╡╫╓╛╫пмХ╓ч╓╩╓С"
-
-#: executive-summary/component/e-summary.c:926
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"HTML ╔у╔║╔╓╔К╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:940
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"╔г║╪╔©╠с╓ъ╧Ч╓ъцФ╓к╔╗╔И║╪:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:958
-msgid "File does not have a place for the services.\n"
-msgstr "╔у╔║╔╓╔К╓о╔╣║╪╔с╔╧╓н╬Л╫Й╓Р╩Щ╓ц╓ф╓╓╓ч╓╩╓С\n"
-
-#: executive-summary/component/e-summary-callbacks.c:126
-msgid "Select a service"
-msgstr "╔╣║╪╔с╔╧╓Ра╙бР"
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"╪б╧т╔╣╔ч╔Й║╪╓нгь╥йкХ╓кйл║╧╓нHTML╔з║╪╔╦╓Ра╙бР╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╧\n"
-"\n"
-"╔г╔у╔╘╔К╔х╓о╤УгР╓г╓╧"
-
-#: executive-summary/component/e-summary-url.c:70
-#: executive-summary/component/e-summary-url.c:75
-#: executive-summary/component/e-summary-url.c:82
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "╔г╔у╔╘╔К╔х╓нGNOME╔╒╔в╔Й╔╠║╪╔╥╔Г╔С╓г %s ╓РЁ╚╓╞"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "╔г╔у╔╘╔К╔х╓нGNOME╔╕╔╖╔ж╔ж╔И╔╕╔╤╓г %s ╓РЁ╚╓╞"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Send an email to %s"
-msgstr "%s ╓╚╓И╔А║╪╔К╓РаВ©╝"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Change the view to %s"
-msgstr "%s ╓ь╔с╔Е║╪╓Рйя╧╧"
-
-#: executive-summary/component/e-summary-url.c:74
-#, c-format
-msgid "Run %s"
-msgstr "%s ╓Р╪б╧т"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Close %s"
-msgstr "%s ╓Рйд╓╦╓К"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the left"
-msgstr "╨╦╓ь %s ╓Р╟эф╟"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s to the right"
-msgstr "╠╕╓ь %s ╓Р╟эф╟"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "а╟╓ннС╓нцФ╓ь %s ╓Р╟эф╟"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Move %s into the next row"
-msgstr "╪║╓ннС╓нцФ╓ь %s ╓Р╟эф╟"
-
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Configure %s"
-msgstr "%s ╓нюъдЙ"
-
-#: executive-summary/component/e-summary-url.c:554
-msgid "page"
-msgstr "╔з║╪╔╦"
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "Ё╟╢я"
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "гь╥й:"
-
-#: executive-summary/component/main.c:62
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"╪б╧т╔╣╔ч╔Й║╪╔Ё╔С╔щ║╪╔м╔С╔х╓о Bonobo ╓Р╫И╢Э╡╫╫пмХ╓ч╓╩╓С╓г╓╥╓©\n"
-"╓Б╓╥ RootPOA ╓к╓д╓╓╓ф╓н╥ы╧П╔А╔ц╔╩║╪╔╦╓╛╓╒╓К╓й╓И║╓╓©╓ж╓С OAF ╓нбЕ╓О╓Й╓к\n"
-"GOAD ╓Р╩х╓ц╓ф╔Ё╔С╔я╔╓╔К╓╥╓©╓Ё╓х╓Р╟улё╓╥╓ч╓╧"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "╪б╧т╔╣╔ч╔Й╓н╓©╓А╓н Evolution ╔Ё╔С╔щ║╪╔м╔С╔х"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Evolution ╪б╧т╔╣╔ч╔Й╔Ё╔С╔щ║╪╔м╔С╔х╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "RDF ╔╣╔ч╔Й╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "RDF ╔╣╔ч╔Й"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "╔ф╔╧╔х Bonobo ╔Ё╔С╔щ║╪╔м╔С╔х╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "╔ф╔╧╔х╔Ё╔С╔щ║╪╔м╔С╔х╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "╔ф╔╧╔х Bonobo ╔╣║╪╔с╔╧"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "╔ф╔╧╔х╔╣║╪╔с╔╧"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "╔╗╔И║╪"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr "╪╚ф╟е╙╓к╧╧©╥"
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update now"
-msgstr "╨ё╓╧╓╟╧╧©╥"
-
-#: executive-summary/test-service/rdf-summary.c:795
-msgid "Update every "
-msgstr "╓╧╓ы╓ф╧╧©╥ "
-
-#: executive-summary/test-service/rdf-summary.c:806
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "й╛"
-
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "г╞"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "г╞"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "╥Н"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "╥Н"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "╫╣"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "╫╣"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "фЭ"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "╩Ч"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "╩Ч"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "й╛"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr " иц"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr " иц"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "фЭиу╓на╙бР╓Рк╨╓Л╓ф╓╓╓ч╓╧"
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "л╣╦З╓йфЭиу╓Ра╙бР╓╥╓ф╓╓╓ч╓╧"
 
-#: filter/filter-datespec.c:276
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -5441,7 +5997,7 @@ msgstr ""
 "Ё╚╓╚╓Л╓К╩Ч║╓╔А╔ц╔╩║╪╔╦╓нфЭиу╓о╓и╓С╓й╩Ч╢ж╓к\n"
 "бп╓╥╓ф╓г╓БхФЁс╓╣╓Л╓К╓г╓╥╓Г╓╕"
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5449,7 +6005,7 @@ msgstr ""
 "╔А╔ц╔╩║╪╔╦╓нфЭиу╓о╓Ё╓Ё╓г╩ьдЙ╓╧╓К╩Ч╢ж╓кбп╓╥╓ф\n"
 "хФЁс╓╣╓Л╓К╓г╓╥╓Г╓╕"
 
-#: filter/filter-datespec.c:339
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5460,28 +6016,36 @@ msgstr ""
 "нЦ╓╗╓п║╓\"╟Л╫╣╢жа╟\""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "╦╫╨ъ╩Ч╧О"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "╩ьдЙ╓╧╓К╩Ч╢ж"
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "╦╫╨ъ╩Ч╧О╓ь╓наЙбп╩Ч╢ж"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "╣ухФЁс"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "╨ё"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<фЭиу╓Ра╙бР╓╧╓К╓©╓А╓к╓Ё╓Ё╓Р╔╞╔Й╔ц╔╞╓╥╓ф╓╞╓ю╓╣╓╓>"
 
@@ -5506,8 +6070,8 @@ msgstr ""
 "╔у╔╘╔К╔ю╓на╙бР╓Рк╨╓Л╓ф╓╓╓ч╓╧\n"
 "лА╓ц╓ф╔А║╪╔К╓РгшаВ╓╧╓Км╜╦З╓й╔у╔╘╔К╔ю╓Р╩ьдЙ╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:687
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "╔у╔╘╔К╔ю╓Ра╙бР"
 
@@ -5519,46 +6083,6 @@ msgstr "╔у╔╘╔К╔ю URI ╓нфЧно"
 msgid "<click here to select a folder>"
 msgstr "<╔у╔╘╔К╔ю╓Ра╙бР╓╧╓К╓©╓А╓к╓Ё╓Ё╓Р╔╞╔Й╔ц╔╞╓╥╓ф╓╞╓ю╓╣╓╓>"
 
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "╔у╔ё╔К╔©╓Рйт╫╦"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "╡╬аш╔у╔╘╔К╔ю╓нйт╫╦"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "фЧно"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "╫пно"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr "╡╬аш╔у╔╘╔К╔ю"
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr "╩ьдЙ╔у╔╘╔К╔ю╓ю╓╠"
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr "╡╬аш╔у╔╘╔К╔ю╓н╔╫║╪╔╧"
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr "╓╧╓ы╓ф╓нм╜╦З╓й╔Й╔Б║╪╔х╔у╔╘╔К╔ю"
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr "╓╧╓ы╓ф╓н╔М║╪╔╚╔К╓хм╜╦З╓й╔Й╔Б║╪╔х╔у╔╘╔К╔ю"
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr "╓╧╓ы╓ф╓н╔М║╪╔╚╔К╔у╔╘╔К╔ю"
-
 #: filter/filter-input.c:193
 #, c-format
 msgid ""
@@ -5580,37 +6104,89 @@ msgstr "╔К║╪╔Кл╬: "
 msgid "Untitled"
 msgstr "╔©╔╓╔х╔К╓й╓╥"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "╓Б╓╥"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "╪║╓н╬Р╥О╓гф╟╨Н╓Р╪б╧т:"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "╓╧╓ы╓ф╓н╢П╫Ю╓╛╧Г╓ц╓©╩Ч"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "╓╓╓╞╓д╓╚╓н╢П╫Ю╓╛╧Г╓ц╓©╩Ч"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "╢П╫Ю╓Рди╡ц"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "фЧно"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "╫пно"
 
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "ди╡ц"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "йт╫╦"
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "╔у╔ё╔К╔©╓Рйт╫╦"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "╡╬аш╔у╔╘╔К╔ю╓нйт╫╦"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "фЧно"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "╫пно"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr "╡╬аш╔у╔╘╔К╔ю"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr "╩ьдЙ╔у╔╘╔К╔ю╓ю╓╠"
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "╡╬аш╔у╔╘╔К╔ю╓н╔╫║╪╔╧"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "╓╧╓ы╓ф╓нм╜╦З╓й╔Й╔Б║╪╔х╔у╔╘╔К╔ю"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "╓╧╓ы╓ф╓н╔М║╪╔╚╔К╓хм╜╦З╓й╔Й╔Б║╪╔х╔у╔╘╔К╔ю"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "╓╧╓ы╓ф╓н╔М║╪╔╚╔К╔у╔╘╔К╔ю"
+
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
-msgstr ""
+#, fuzzy
+msgid "Assign Color"
+msgstr "ЁДеЖ╓ф╨я╓ъ"
 
 #: filter/libfilter-i18n.h:4
 msgid "Assign Score"
@@ -5685,89 +6261,90 @@ msgid "Expression"
 msgstr "и╫╦╫"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "╔╒╔и╔Л╔╧╓ье╬аВ"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "╫емв"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "╓╛╪║╓н╓Б╓н╓х╟Лцв╓╧╓К"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "╓╛╪║╓н╓Б╓н╓Х╓ЙбГ╓╜╓╓"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "╓╛╪║╓н╓Б╓н╓Х╓Й╬╝╓╣╓╓"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "╓╛╪║╓н╓Б╓н╓г╓о╓й╓╓"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "╔А║╪╔Й╔С╔╟╔Й╔╧╔х"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "╔А╔ц╔╩║╪╔╦кэбн"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "╔А╔ц╔╩║╪╔╦╔ь╔ц╔ю"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "╪У©╝╓╥╓©╔А╔ц╔╩║╪╔╦"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "аВ©╝╓╥╓©╔А╔ц╔╩║╪╔╦"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "╔у╔╘╔К╔ю╓ь╟эф╟"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "╢Шфи"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "╪У©╝╪т"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "ю╣╣╛и╫╦╫╓х╟Лцв"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "йж©╝юХ"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "╣╜о©"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "аВ©╝╪т"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "╔╧╔ф║╪╔©╔╧юъдЙ"
 
+#: filter/libfilter-i18n.h:44
+msgid "Size (kB)"
+msgstr ""
+
 #: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "╓╛╪║╓н╓Б╓н╓н╓Х╓╕╓к╦╚╓╗╓К"
@@ -5788,7 +6365,8 @@ msgstr "╓╛╪║╓н╓Б╓н╓гЁ╚╩о╓╧╓К"
 msgid "Stop Processing"
 msgstr "╫ХмЩдД╩ъ"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:774
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "╥Ол╬"
 
@@ -5816,29 +6394,23 @@ msgstr "╔К║╪╔К╓Рйт╫╦"
 msgid "Score Rules"
 msgstr "╔╧╔Ё╔╒╔К║╪╔К"
 
-#: importers/elm-importer.c:512 importers/evolution-gnomecard-importer.c:238
-#: importers/netscape-importer.c:780 importers/pine-importer.c:646
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
 #: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
-#: shell/importer/intelligent.c:190
+#: shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "╔╓╔С╔щ║╪╔х"
 
-#: importers/elm-importer.c:517 importers/netscape-importer.c:785
-#: importers/pine-importer.c:651
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
 msgid "Mail"
 msgstr "╔А║╪╔К"
 
-#: importers/elm-importer.c:521
-msgid "Elm Aliases"
-msgstr "Elm ╔╗╔╓╔Й╔╒╔╧"
-
-#: importers/elm-importer.c:528 importers/evolution-gnomecard-importer.c:250
-#: importers/netscape-importer.c:807 importers/pine-importer.c:668
-#: shell/importer/intelligent.c:195
-msgid "Don't ask me again"
-msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓РфСеы╓хи╫╪╗╓╥╓й╓╓"
-
-#: importers/elm-importer.c:561
+#: importers/elm-importer.c:498
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -5846,15 +6418,15 @@ msgstr ""
 "Evolution ╓о Elm ╔А║╪╔К╔у╔║╔╓╔К╓Рх╞╦╚╓╥╓ч╓╥╓©\n"
 "Evolution ╓ь╔╓╔С╔щ║╪╔х╓╥╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
 
-#: importers/elm-importer.c:579
+#: importers/elm-importer.c:527
 msgid "Elm mail"
 msgstr "Elm ╔А║╪╔К"
 
-#: importers/evolution-gnomecard-importer.c:243 importers/pine-importer.c:661
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
 msgid "Addressbook"
 msgstr "╔╒╔и╔Л╔╧д╒"
 
-#: importers/evolution-gnomecard-importer.c:275
+#: importers/evolution-gnomecard-importer.c:253
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5862,19 +6434,11 @@ msgstr ""
 "Evolution ╓о GnomeCard ╔у╔║╔╓╔К╓Рх╞╦╚╓╥╓ч╓╥╓©\n"
 "Evolution ╓ь╔╓╔С╔щ║╪╔х╓╥╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
 
-#: importers/netscape-importer.c:790 importers/pine-importer.c:656
+#: importers/netscape-importer.c:824
 msgid "Settings"
 msgstr "юъдЙ"
 
-#: importers/netscape-importer.c:795 mail/mail-callbacks.c:1399
-msgid "Filters"
-msgstr "╔у╔ё╔К╔©"
-
-#: importers/netscape-importer.c:800
-msgid "Addressbooks"
-msgstr "╔╒╔и╔Л╔╧д╒"
-
-#: importers/netscape-importer.c:847
+#: importers/netscape-importer.c:849
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5882,7 +6446,7 @@ msgstr ""
 "Evolution ╓о Netscape ╔А║╪╔К╔у╔║╔╓╔К╓Рх╞╦╚╓╥╓ч╓╥╓©\n"
 "Evolution ╓ь╔╓╔С╔щ║╪╔х╓╥╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
 
-#: importers/pine-importer.c:705
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -5890,180 +6454,209 @@ msgstr ""
 "Evolution ╓о Pine ╔А║╪╔К╔у╔║╔╓╔К╓Рх╞╦╚╓╥╓ч╓╥╓©\n"
 "Evolution ╓ь╔╓╔С╔щ║╪╔х╓╥╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 msgid "Pine mail"
 msgstr "Pine ╔А║╪╔К"
 
-#: mail/component-factory.c:401
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "╔А║╪╔К╓Р╟╥╓╕╓©╓А╓н Evolution ╔Ё╔С╔щ║╪╔м╔С╔х"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr "Evolution ╔А║╪╔К╔Ё╔С╔щ║╪╔╤"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr "Evolution ╔А║╪╔К╪б╧т╔╣╔ч╔Й╔Ё╔С╔щ║╪╔м╔С╔х"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr "Evolution ╔А║╪╔К╔у╔╘╔К╔ю╔г╔ё╔╧╔в╔Л╔╓╔Ё╔С╔щ║╪╔м╔С╔х"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr "Evolutgion ╔А║╪╔К╔у╔╘╔К╔ю╔у╔║╔╞╔х╔Й╔Ё╔С╔щ║╪╔м╔С╔х"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr "Evolution ╔Ё╔С╔щ║╪╔╤╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr "Evolution ╔А║╪╔К╔Ё╔С╔щ║╪╔м╔С╔х╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr "╔А║╪╔К╔╣╔ч╔Й╔Ё╔С╔щ║╪╔м╔С╔х╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+msgid "Mail configuration interface"
+msgstr "╔А║╪╔КюъдЙ╓н╔╓╔С╔©║╪╔у╔╖║╪╔╧"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "╔в╔М╔я╔ф╔ё(_P)..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "╔у╔║╔╓╔К╓н╔в╔М╔я╔ф╔ё╓Р╫╓ю╣╓╥╓ч╓╧"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution ╔А║╪╔К╔Ё╔С╔щ║╪╔м╔С╔х╓н╫И╢Э╡╫╓╛╫пмХ╓ч╓╩╓С"
 
-#: mail/component-factory.c:527
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr "╔╥╔╖╔К╓г╔╧╔х╔Л║╪╔╦╓Репо©╫пмХ╓ч╓╩╓С"
 
-#: mail/folder-browser.c:339
+#: mail/folder-browser-ui.c:254
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "\"%s\" ╓н╔в╔М╔я╔ф╔ё"
+
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr "╔в╔М╔я╔ф╔ё"
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "╨Н╤х╔г╔ё╔Л╔╞╔х╔Й╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr ""
 
-#: mail/folder-browser.c:663
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr "╥Ол╬╓н╡╬аш╔у╔╘╔К╔ю(_S)"
 
-#: mail/folder-browser.c:666
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "аВ©╝╪т╓н╡╬аш╔у╔╘╔К╔ю(_n)"
 
-#: mail/folder-browser.c:669
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "╪У©╝╪т╓н╡╬аш╔у╔╘╔К╔ю(_R)"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr "╔А║╪╔Й╔С╔╟╔Й╔╧╔х╓н╡╬аш╔у╔╘╔К╔ю(_L)"
 
-#: mail/folder-browser.c:678
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "╥Ол╬╓н╔у╔ё╔К╔©(_j)"
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "аВ©╝╪т╓н╔у╔ё╔К╔©(_d)"
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "╪У©╝╪т╓н╔у╔ё╔К╔©(_c)"
 
-#: mail/folder-browser.c:687
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "╔А║╪╔Й╔С╔╟╔Й╔╧╔х╓н╔у╔ё╔К╔©(_M)"
 
-#: mail/folder-browser.c:696
-msgid "_Open"
-msgstr "Ё╚╓╞(_O)"
-
-#: mail/folder-browser.c:698
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "╨фаВ©╝"
 
-#: mail/folder-browser.c:700 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:123 ui/evolution-tasks.xml.h:11
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "йлл╬╓гйщб╦(_S)..."
 
-#: mail/folder-browser.c:702 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:10
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "╟У╨Ч(_P)"
 
-#: mail/folder-browser.c:707 ui/evolution-mail.xml.h:122
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "аВ©╝╪т╓ьйж©╝(_R)"
 
-#: mail/folder-browser.c:709 ui/evolution-mail.xml.h:77
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "а╢╟В╓ьйж©╝(_A)"
+
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "а╢╟В╓ьйж©╝(_A)"
 
-#: mail/folder-browser.c:711
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "е╬аВ(_F)"
 
-#: mail/folder-browser.c:714
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "╢Шфи╓х╓╥╓ф╔ч║╪╔╞(_k)"
 
-#: mail/folder-browser.c:716
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "л╓фи╓х╓╥╓ф╔ч║╪╔╞(_n)"
 
-#: mail/folder-browser.c:721
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "╫емв"
+
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "л╓фи╓х╓╥╓ф╔ч║╪╔╞(_n)"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "╔у╔╘╔К╔ю╓ь╟эф╟(_M)..."
 
-#: mail/folder-browser.c:723
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "╔у╔╘╔К╔ю╓ь╔Ё╔т║╪(_C)..."
 
-#: mail/folder-browser.c:727 ui/evolution-mail.xml.h:126
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "╨О╫Э╪Х╬ц(_U)"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:737
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "╔╒╔и╔Л╔╧д╒╓кди╡ц"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "╔у╔ё╔К╔©е╛мя"
 
-#: mail/folder-browser.c:741
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "╔А╔ц╔╩║╪╔╦╓╚╓И╔К║╪╔К╓Р╨Ню╝(_l)"
 
-#: mail/folder-browser.c:880
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "╔А║╪╔Й╔С╔╟╔Й╔╧╔х╓н╔у╔ё╔К╔©"
 
-#: mail/folder-browser.c:881
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "╔А║╪╔Й╔С╔╟╔Й╔╧╔х╓н╡╬аш╔у╔╘╔К╔ю"
 
-#: mail/folder-browser.c:883
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "╔А║╪╔Й╔С╔╟╔Й╔╧╔х╓н╔у╔ё╔К╔© (%s)"
 
-#: mail/folder-browser.c:884
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "╔А║╪╔Й╔С╔╟╔Й╔╧╔х╓н╡╬аш╔у╔╘╔К╔ю (%s)"
 
-#: mail/folder-browser-factory.c:210
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "\"%s\" ╓н╔в╔М╔я╔ф╔ё"
-
-#: mail/folder-browser-factory.c:212 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "╔в╔М╔я╔ф╔ё"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "╔А║╪╔К╓Р╟╥╓╕╓©╓А╓н Evolution ╔Ё╔С╔щ║╪╔м╔С╔х"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Evolution ╔А║╪╔К╔Ё╔С╔щ║╪╔╤"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Evolution ╔А║╪╔К╪б╧т╔╣╔ч╔Й╔Ё╔С╔щ║╪╔м╔С╔х"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Evolution ╔А║╪╔К╔у╔╘╔К╔ю╔г╔ё╔╧╔в╔Л╔╓╔Ё╔С╔щ║╪╔м╔С╔х"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Evolutgion ╔А║╪╔К╔у╔╘╔К╔ю╔у╔║╔╞╔х╔Й╔Ё╔С╔щ║╪╔м╔С╔х"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Evolution ╔Ё╔С╔щ║╪╔╤╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Evolution ╔А║╪╔К╔Ё╔С╔щ║╪╔м╔С╔х╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "╔А║╪╔К╔╣╔ч╔Й╔Ё╔С╔щ║╪╔м╔С╔х╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Mail configuration interface"
-msgstr "╔А║╪╔КюъдЙ╓н╔╓╔С╔©║╪╔у╔╖║╪╔╧"
-
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr "Evolution ╓ь mbox ╓Р╔╓╔С╔щ║╪╔х╓╧╓К╔у╔║╔╞╔х╔Й"
@@ -6114,37 +6707,69 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
 msgid "You have not filled in all of the required information."
 msgstr "и╛мв╓й╬ПйС╓н╓╧╓ы╓ф╓РкД╓А╓ф╓╓╓ч╓╩╓С"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:154
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Evolution ╔╒╔╚╔╕╔С╔х╔╗╔г╔ё╔©"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Evolution ╔╒╔╚╔╕╔С╔х╔╗╔г╔ё╔©"
 
-#: mail/mail-accounts.c:124 mail/mail-accounts.c:175
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "╫Пл╬╔у╔║╔╓╔К:"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"╓Ё╓н╔А╔ц╔╩║╪╔╦╓оаВ©╝╓╥╓ф╓╓╓ч╓╩╓С\n"
+"\n"
+"йя╧╧╓Рйщб╦╓╥╓ч╓╧╓╚?"
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr " (╔г╔у╔╘╔К╔х)"
 
-#: mail/mail-accounts.c:207
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "л╣╦З"
 
-#: mail/mail-accounts.c:209 mail/mail-config.glade.h:35
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "м╜╦З"
 
-#: mail/mail-accounts.c:297 mail/mail-accounts.c:301
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "кэеЖ╓к╓Ё╓н╔╒╔╚╔╕╔С╔х╓Р╨О╫Э╓╥╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
 
-#: mail/mail-accounts.c:435 mail/mail-accounts.c:439
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "╨О╫Э"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "╔г╔у╔╘╔К╔х╔╒╔╚╔╕╔С╔х╓Р╨Н╓К"
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr "кэеЖ╓к news ╔╒╔╚╔╕╔С╔х╓Р╨О╫Э╓╥╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:597
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Evolution ╔╒╔╚╔╕╔С╔х╔ч╔м║╪╔╦╔Ц"
 
@@ -6172,7 +6797,7 @@ msgstr "%s ╔А║╪╔Й╔С╔╟╔Й╔╧╔х"
 msgid "Add Filter Rule"
 msgstr "╔у╔ё╔К╔©╔К║╪╔К╓Рди╡ц"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -6184,7 +6809,7 @@ msgstr ""
 "и╛мв╓╛╓╒╓Й╓ч╓╧\n"
 "╨ёюъдЙ╓╥╓ч╓╧╓╚?"
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -6192,7 +6817,7 @@ msgstr ""
 "╓╒╓й╓©╓о╔А║╪╔К╓Р╨Ню╝╓╧╓Ка╟╓к©х╦╣╓н\n"
 "юъдЙ╓Р╓╧╓Ки╛мв╓╛╓╒╓Й╓ч╓╧"
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -6200,11 +6825,11 @@ msgstr ""
 "╓╒╓й╓©╓о╔А║╪╔К╓Р╨Ню╝╓╧╓Ка╟╓к╔А║╪╔К\n"
 "гшаВ╓нюъдЙ╓Р╓╧╓Ки╛мв╓╛╓╒╓Й╓ч╓╧"
 
-#: mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr "╔А║╪╔Ке╬аВ╔А╔╫╔ц╔и╓нюъдЙ╓╛╓╒╓Й╓ч╓╩╓С"
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6212,37 +6837,45 @@ msgstr ""
 "╓Ё╓н╔А╔ц╔╩║╪╔╦╓о╥Ол╬╓╛╓╒╓Й╓ч╓╩╓С\n"
 "кэеЖ╓каВ©╝╓╥╓ч╓╧╓╚?"
 
-#: mail/mail-callbacks.c:308
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓РаВ©╝╓╧╓Ке╛юз╓й╪У©╝╪т╓Р╩ьдЙ╓╥╓й╓╠╓Л╓п╓й╓Й╓ч╓╩╓С"
 
-#: mail/mail-callbacks.c:351
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr "╓Ё╓н╔А║╪╔К╓РаВ©╝╓╧╓Ка╟╓к╔╒╔╚╔╕╔С╔х╓РюъдЙ╓╥╓й╓╠╓Л╓п╓й╓Й╓ч╓╩╓С"
 
-#: mail/mail-callbacks.c:603
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "On %s, %s wrote:"
 
-#: mail/mail-callbacks.c:769
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "╔А╔ц╔╩║╪╔╦╓Ре╬аВ:\n"
 
-#: mail/mail-callbacks.c:863
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╟эф╟╓╥╓ч╓╧: "
 
-#: mail/mail-callbacks.c:865
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╔Ё╔т║╪╓╥╓ч╓╧: "
 
-#: mail/mail-callbacks.c:1031
+#: mail/mail-callbacks.c:1374
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "кэеЖ╓к %d ╔А╔ц╔╩║╪╔╦╓Рйт╫╦╓╥╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
 
-#: mail/mail-callbacks.c:1053
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6250,7 +6883,7 @@ msgstr ""
 "╔и╔И╔у╔х╔у╔╘╔К╔юфБ╓кйщб╦╓╣╓Л╓©\n"
 "╔А╔ц╔╩║╪╔╦╓ю╓╠╓Рйт╫╦╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╧"
 
-#: mail/mail-callbacks.c:1087
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6258,36 +6891,24 @@ msgstr ""
 "аВ©╝╔у╔╘╔К╔ю╓н╔А╔ц╔╩║╪╔╦╓ю╓╠\n"
 "╨фаВ©╝╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╧"
 
-#: mail/mail-callbacks.c:1099
+#: mail/mail-callbacks.c:1442
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "кэеЖ╓к %d ╔А╔ц╔╩║╪╔╦╓Р╨фаВ╓╥╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
 
-#: mail/mail-callbacks.c:1120
+#: mail/mail-callbacks.c:1463
 msgid "No Message Selected"
 msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓о╓╒╓Й╓ч╓╩╓С"
 
-#: mail/mail-callbacks.c:1154 mail/mail-display.c:93
-msgid "Overwrite file?"
-msgstr "╔у╔║╔╓╔К╓Р╬Е╫Я╓╜╓╥╓ч╓╧╓╚?"
-
-#: mail/mail-callbacks.c:1158 mail/mail-display.c:97
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"╓╫╓нл╬а╟╓н╔у╔║╔╓╔К╓о╓╧╓г╓кб╦╨ъ╓╥╓ч╓╧\n"
-"╬Е╫Я╓╜╓╥╓ч╓╧╓╚?"
-
-#: mail/mail-callbacks.c:1202
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "╔А╔ц╔╩║╪╔╦╓Рйлл╬╓гйщб╦..."
 
-#: mail/mail-callbacks.c:1204
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "╔А╔ц╔╩║╪╔╦╓Рйлл╬╓гйщб╦..."
 
-#: mail/mail-callbacks.c:1389
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6296,23 +6917,23 @@ msgstr ""
 "╔у╔ё╔К╔©╬ПйС╓н╔М║╪╔ицФ╓к╔╗╔И║╪:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1447
+#: mail/mail-callbacks.c:1776
+msgid "Filters"
+msgstr "╔у╔ё╔К╔©"
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╟У╨Ч"
 
-#: mail/mail-callbacks.c:1494
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "╔А╔ц╔╩║╪╔╦╓н╟У╨Ч╓к╪╨гт╓╥╓ч╓╥╓©"
 
-#: mail/mail-callbacks.c:1589
+#: mail/mail-callbacks.c:1966
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "кэеЖ╓к %d ╔А╔ц╔╩║╪╔╦╓Рйл╔╕╔ё╔С╔и╔╕╓гЁ╚╓╓╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
 
-#: mail/mail-config.c:1321 mail/mail-config.c:1324
-msgid "Connecting to server..."
-msgstr "╔╣║╪╔п╓ьюэбЁцФ..."
-
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -6351,19 +6972,23 @@ msgid ""
 "name for this account in the space below. This name will be used for display "
 "purposes only."
 msgstr ""
-"╔А║╪╔КюъдЙ╓н╫ХмЩ╓о╓ю╓╓╓©╓╓╢╟н╩╓╥╓ч╓╥╓©║╔╓╒╓й╓©╓╛дС╤║╓╥╓©©х╦╣║╓╔А║╪╔К╔╣║╪╔п"
-"╓Д\n"
-"аВ©╝╔в╔М╔х╔Ё╔К╓о Evolution ╔А║╪╔К╔╒╔╚╔╕╔С╔х╓Р╨Н╓К╓©╓А╓к╟Ле╩╓А╓к╓╣╓Л╓К╓г╓╥╓Г"
-"╓╕\n"
-"╟й╡╪╓к╓Ё╓н╔╒╔╚╔╕╔С╔х╓н╤У╢ж╓нл╬а╟╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓║╔╓Ё╓нл╬а╟╓ои╫╪╗лэе╙╓ю╓╠"
-"╓к\n"
+"╔А║╪╔КюъдЙ╓н╫ХмЩ╓о╓ю╓╓╓©╓╓╢╟н╩╓╥╓ч╓╥╓©║╔╓╒╓й╓©╓╛дС╤║╓╥╓©©х╦╣║╓╔А║╪╔К╔╣║╪╔п╓Д"
+"\n"
+"аВ©╝╔в╔М╔х╔Ё╔К╓о Evolution "
+"╔А║╪╔К╔╒╔╚╔╕╔С╔х╓Р╨Н╓К╓©╓А╓к╟Ле╩╓А╓к╓╣╓Л╓К╓г╓╥╓Г╓╕\n"
+"╟й╡╪╓к╓Ё╓н╔╒╔╚╔╕╔С╔х╓н╤У╢ж╓нл╬а╟╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓║╔╓Ё╓нл╬а╟╓ои╫╪╗лэе╙╓ю╓╠╓к"
+"\n"
 "╩хмя╓╣╓Л╓ч╓╧║╔"
 
 #. set window title
-#: mail/mail-config-druid.c:445
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr "Evolution ╔╒╔╚╔╕╔С╔х╔╕╔ё╔╤║╪╔и"
 
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
+msgstr "╔╣║╪╔п╓ьюэбЁцФ..."
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr "╔╣╔щ║╪╔х╓╣╓Л╓©╪Ойл╓Р╔а╔╖╔ц╔╞"
@@ -6373,54 +6998,63 @@ msgid " color"
 msgstr " ╔╚╔И║╪"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "╔╣╔╓╔С╓о╓Ё╓н╟е╧Ф╓Р╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "╔╒╔╚╔╕╔С╔х"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "╔╒╔╚╔╕╔С╔х╬ПйС"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "╔╒╔╚╔╕╔С╔х╢имЩ"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "╔╒╔╚╔╕╔С╔х"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr "╟е╧Ф╡╫╓╥╓©╔А║╪╔К╓РаВ©╝╓╧╓К╩Ч╓к╬О╓к╪╚й╛╪╚©х╓к╟е╧Ф╡╫╓╥╓ч╓╧"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr "╟е╧Ф╡╫╓╥╓©╔А║╪╔К╓РаВ©╝╓╧╓К╩Ч╓к╬О╓к╪╚й╛╪╚©х╓к╟е╧Ф╡╫╓╥╓ч╓╧"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:11
 msgid "Always load images off the net"
 msgstr "╬О╓к╡ХаЭ╓Рфи╓ъ╧Ч╓ч╓й╓╓"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "е╨иу"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "г╖╬з"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "г╖╬з╪Ойл: "
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "©╥цЕ╔А║╪╔К╓Р╪╚ф╟е╙╓к╔а╔╖╔ц╔╞╓╧╓К"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid "Certificate ID:"
 msgstr "г╖╬з ID"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:18
 msgid "Composer"
 msgstr "╔А║╪╔К╨Ню╝"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6436,215 +7070,277 @@ msgstr ""
 "\n"
 "\"╢╟н╩\" ╓Р╔╞╔Й╔ц╔╞╓╥╓фюъдЙ╓Рйщб╦╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "╔г╔у╔╘╔К╔х(_f)"
 
-#: mail/mail-config.glade.h:25
-msgid "Default \"Forward\" style is: "
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Default Forward style is: "
 msgstr "╔г╔у╔╘╔К╔х╓н \"е╬аВ\" йЩк║: "
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:27
 msgid "Default character set: "
 msgstr "╔г╔у╔╘╔К╔х╓н╔╜╔Ц╔И╔╞╔©╔╩╔ц╔х: "
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr "╔г╔╦╔©╔К ID..."
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "╢╟н╩"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "аП╟ф"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "аП╟ф╔у╔╘╔К╔ю:"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "йт╫╦..."
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "╔А║╪╔К╔╒╔и╔Л╔╧:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "м╜╦З"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "╔у╔К╔м║╪╔Ю:"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:41
 msgid "Get Digital ID..."
 msgstr "╔г╔╦╔©╔КID ╓Р╪Хфю..."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "╫Пл╬╔у╔║╔╓╔К:"
+
+#: mail/mail-config.glade.h:43
 msgid "Highlight citations with"
 msgstr "╟Змя╓Р╤╞д╢╓╧╓К"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "©х╦╣"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:47
 msgid "In HTML mail"
 msgstr "HTML ╔А║╪╔К"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:48
 msgid "Inline"
 msgstr "╔╓╔С╔И╔╓╔С"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:50
 msgid "Load images if sender is in addressbook"
 msgstr "аВ©╝╪т╓╛╔╒╔и╔Л╔╧д╒╓к╓╓╓Л╓К╬Л╧Г╡ХаЭ╓Рфи╓ъ╧Ч╓Ю"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "╔А║╪╔К╓нюъдЙ"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "╔А║╪╔К╔э╔ц╔╞╔╧╓н╥а╪╟"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "╔г╔у╔╘╔К╔х╔╒╔╚╔╕╔С╔х╓Р╨Н╓К"
 
-#: mail/mail-config.glade.h:48
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "╩ьдЙ╩Ч╢ж╦Е╓к╔А╔ц╔╩║╪╔╦╓Р \"╢Шфи\" ╓х╓╥╓ф╔ч║╪╔╞:"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "LDAP ╔╣║╪╔п"
+
+#: mail/mail-config.glade.h:59
 msgid "Never load images off the net"
 msgstr "фСеы╓х╡ХаЭ╓Рфи╓ъ╧Ч╓ч╓й╓╓"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "╔к╔Е║╪╔╧"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "иу╡ц╬ПйС"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "ах©╔:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:65
 msgid "PGP Key ID:"
 msgstr "PGP╔╜║╪ ID:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "PGP ╔в╔М╔╟╔И╔Ю╓н╔я╔╧:"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "╔╚╔И║╪╓Ра╙бР"
+
+#: mail/mail-config.glade.h:71
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Prompt when sending messages with an empty subject"
+msgstr "╓Ё╓н╥Ол╬╓н╔А╔ц╔╩║╪╔╦╓Р╔у╔ё╔К╔©╓╧╓К╔К║╪╔К╓Р╨Ню╝╓╥╓ч╓╧"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "╔А╔ц╔╩║╪╔╦╓РаВ©╝╫пмХ╓ч╓╩╓С: ╪У©╝╪т╓╛дЙ╣а╓╣╓Л╓ф╓╓╓ч╓╩╓С"
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:75
 msgid "Quoted"
 msgstr "╟Змя"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "╔А║╪╔К╓н╪У©╝цФ"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "╔А║╪╔К╓н╪У©╝"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "╪У©╝╔╙╔в╔╥╔Г╔С"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "и╛©э╬ПйС"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:83
 msgid "Secure MIME"
 msgstr "╔╩╔╜╔Е╔╒ MIME"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:84
 msgid "Security"
 msgstr "╔╩╔╜╔Е╔Й╔ф╔ё"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "PGP ╔в╔М╔╟╔И╔Ю╓Ра╙бР"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "╔г╔у╔╘╔К╔х╓г HTML ╥а╪╟╓н╔А║╪╔К╓РаВ©╝╓╧╓К"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "╔А║╪╔К╓РаВ©╝цФ"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "╔А║╪╔К╓наВ©╝"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "аВ©╝╨я"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr "аВ©╝╨я╓хаП╟ф╔А╔ц╔╩║╪╔╦"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "аВ©╝╨я╔А╔ц╔╩║╪╔╦╔у╔╘╔К╔ю:"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "╔╣║╪╔п╓нюъдЙ"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "╔╣║╪╔п╪Ойл:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "╔╣║╪╔п╓ог╖╬з╓╛и╛мв"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "╫Пл╬╔у╔║╔╓╔К:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "╔╫║╪╔╧"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "╬ПйС╓й╓╥"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "╔╫║╪╔╧"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "фцйл╓й╔у╔╘╔К╔ю"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr "и╦╫Юе╙╓й UNIX ╓н mbox ╔у╔║╔╓╔К"
 
-#: mail/mail-config.glade.h:88
-msgid "Type"
-msgstr "╪Ойл"
-
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "╔╩╔╜╔Е╔╒юэбЁ (SSL) ╓Р╩х╓╕"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "╔Ф║╪╔╤л╬:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6654,217 +7350,230 @@ msgstr ""
 "\n"
 "\"╪║\" ╓Р╔╞╔Й╔ц╔╞╓╥╓ф╩о╓А╓ф╓╞╓ю╓╣╓╓"
 
-#: mail/mail-config.glade.h:96 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:47 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:48
-msgid "_Edit"
-msgstr "йт╫╦(_E)"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
+msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:113
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-crypto.c:59
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr " иц"
+
+#: mail/mail-crypto.c:60
 msgid "Could not create a PGP signature context."
 msgstr "PGP ╫Пл╬╔Ё╔С╔ф╔╜╔╧╔х╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: mail/mail-crypto.c:84
+#: mail/mail-crypto.c:86
 msgid "Could not create a PGP verification context."
 msgstr "PGP ╦║╬з╔Ё╔С╔ф╔╜╔╧╔х╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: mail/mail-crypto.c:113
+#: mail/mail-crypto.c:116
 msgid "Could not create a PGP encryption context."
 msgstr "PGP ╟е╧Ф╔Ё╔С╔ф╔╜╔╧╔х╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: mail/mail-crypto.c:138
+#: mail/mail-crypto.c:142
 msgid "Could not create a PGP decryption context."
 msgstr "PGP иЭ╧Ф╔Ё╔С╔ф╔╜╔╧╔х╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: mail/mail-crypto.c:173
+#: mail/mail-crypto.c:177
 msgid "Could not create a S/MIME signature context."
 msgstr "S/MIME ╫Пл╬╔Ё╔С╔ф╔╜╔╧╔х╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:209
 msgid "Could not create a S/MIME certsonly context."
 msgstr "S/MIME ╔Ё╔С╔ф╔╜╔╧╔х╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:240
 msgid "Could not create a S/MIME encryption context."
 msgstr "S/MIME ╟е╧Ф╔Ё╔С╔ф╔╜╔╧╔х╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:271
 msgid "Could not create a S/MIME envelope context."
 msgstr "S/MIME ╔╗╔С╔ы╔М║╪╔в╔Ё╔С╔ф╔╜╔╧╔х╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:301
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME ╔г╔Ё║╪╔и╔Ё╔С╔ф╔╜╔╧╔х╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: mail/mail-display.c:197
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "е╨иу╓нйщб╦"
 
-#: mail/mail-display.c:237
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "╨Н╤х╔г╔ё╔Л╔╞╔х╔Й╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
-
-#: mail/mail-display.c:298
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "╔г╔ё╔╧╔╞╓ьйщб╦..."
 
-#: mail/mail-display.c:300
-#, c-format
-msgid "Open in %s..."
-msgstr "%s ╓кЁ╚╓╞..."
-
-#: mail/mail-display.c:302
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "╔╓╔С╔И╔╓╔Си╫╪╗"
 
-#: mail/mail-display.c:337
-msgid "External Viewer"
-msgstr "Ё╟иТ╔с╔Е║╪╔╒"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "%s ╓кЁ╚╓╞..."
 
-#: mail/mail-display.c:360
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "╔╓╔С╔И╔╓╔Си╫╪╗ (%s╥пмЁ)"
 
-#: mail/mail-display.c:364
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "╠ё╓╧"
 
-#: mail/mail-display.c:989
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "Ё╟иТ╔с╔Е║╪╔╒"
+
+#: mail/mail-display.c:1048
 msgid "Loading message content"
 msgstr "╔А╔ц╔╩║╪╔╦╓нфБмф╓Рфи╓ъ╧Ч╓ъцФ"
 
-#: mail/mail-display.c:1283
-msgid "Open link in browser"
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
 msgstr "╔ж╔И╔╕╔╤╓г╔Й╔С╔╞╓РЁ╚╓╞"
 
-#: mail/mail-display.c:1285
-msgid "Save as (FIXME)"
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "╬Л╫Й╓Р╔Ё╔т║╪ (FIXME)"
+
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
 msgstr "йлл╬╓гйщб╦ (FIXME)"
 
-#: mail/mail-display.c:1287
-msgid "Copy location (FIXME)"
-msgstr "╬Л╫Й╓Р╔Ё╔т║╪ (FIXME)"
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "йлл╬╓гйщб╦..."
 
-#: mail/mail-format.c:532
+#: mail/mail-folder-cache.c:170
+#, fuzzy, c-format
+msgid "%d new"
+msgstr "%d й╛"
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr "%d иц"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s ╓Ре╨иу"
 
-#: mail/mail-format.c:580
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME ╔А╔ц╔╩║╪╔╦╓Р╡Рюо╫пмХ╓ч╓╩╓С╓г╓╥╓©, ╔╫║╪╔╧╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:746
 msgid "Date"
 msgstr "фЭиу"
 
-#: mail/mail-format.c:763
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "╔А║╪╔К╔╒╔и╔Л╔╧:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "╨╧╫п©м"
 
-#: mail/mail-format.c:766
+#: mail/mail-format.c:867
 msgid "Reply-To"
 msgstr "йж©╝юХ"
 
-#: mail/mail-format.c:769
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "╟╦юХ"
 
-#: mail/mail-format.c:772
+#: mail/mail-format.c:873
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1094
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "GPG/PGP ╔в╔М╔╟╔И╔Ю╓нюъдЙ╓╛╓╒╓Й╓ч╓╩╓С"
 
-#: mail/mail-format.c:1109
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "╟е╧Ф╡╫╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓ои╫╪╗╓╥╓ч╓╩╓С"
 
-#: mail/mail-format.c:1115
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "╟е╧Ф╡╫╓╣╓Л╓©╔А╔ц╔╩║╪╔╦"
 
-#: mail/mail-format.c:1116
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "╔╒╔╓╔Ё╔С╓Р╔╞╔Й╔ц╔╞╓╥╓фиЭ╧Ф╡╫╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: mail/mail-format.c:1172
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓о╔г╔╦╔©╔К╫Пл╬╓╣╓Л©╝мЙ╓г╓╜╓К╓Б╓н╓г╓╧"
 
-#: mail/mail-format.c:1180
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓о╔г╔╦╔©╔К╫Пл╬╓╣╓Л╓©╓Б╓н╓г╓╧╓╛, ©╝мЙ╓Р╬злю╫пмХ╓ч╓╩╓С"
 
-#: mail/mail-format.c:1831
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ╔╣╔╓╔х (%s) ╓Р╩ь╓╥╓ф╓╓╓ч╓╧"
 
-#: mail/mail-format.c:1843
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1847
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "╔М║╪╔╚╔К╔у╔║╔╓╔К (%s) ╓Р╩ь╓╥╓ф╓╓╓ч╓╧"
 
-#: mail/mail-format.c:1881
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "FTP ╔╣╔╓╔х (%s) ╓Р╩ь╓╥╓ф╓╓╓ч╓╧"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "л╓цн╓нЁ╟иТ╔г║╪╔© (\"%s\" ╔©╔╓╔в) ╓Р╩ь╓╥╓ф╓╓╓ч╓╧"
 
-#: mail/mail-format.c:1886
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:504
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "'%s' ╓Р╔╙║╪╔в╔СцФ"
 
-#: mail/mail-local.c:784
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "╔у╔╘╔К╔ю \"%s\" ╓Р \"%s\" ╥а╪╟╓ьйя╧╧╓╥╓ф╓╓╓ч╓╧"
 
-#: mail/mail-local.c:788
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "╔у╔╘╔К╔ю \"%s\" ╓Р \"%s\" ╥а╪╟╓ьйя╧╧╓╥╓ч╓╧"
-
-#: mail/mail-local.c:811
-msgid "Reconfiguring folder"
-msgstr "╔у╔╘╔К╔ю╓н╨ф╧╫ю╝цФ"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:840
-msgid "Closing current folder"
-msgstr "╦╫╨ъ╓н╔у╔╘╔К╔ю╓Р╔╞╔М║╪╔╨цФ"
-
-#: mail/mail-local.c:872
-msgid "Renaming old folder and opening"
-msgstr "╦е╓╓╔у╔╘╔К╔ю╓Р╔Й╔м║╪╔Ю╓╥╓ф╔╙║╪╔в╔СцФ"
-
-#: mail/mail-local.c:890
-msgid "Creating new folder"
-msgstr "©╥╣╛╔у╔╘╔К╔ю╓Р╨Ню╝цФ"
-
-#: mail/mail-local.c:904
-msgid "Copying messages"
-msgstr "╔А╔ц╔╩║╪╔╦╓Р╔Ё╔т║╪цФ"
-
-#: mail/mail-local.c:921
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6873,7 +7582,7 @@ msgstr ""
 "╔у╔╘╔К╔ю╓н╔А╔©╬ПйС╓Рйщб╦╫пмХ╓ч╓╩╓С; ╓Б╓о╓Д╓Ё╓н╔у╔╘╔К╔ю╓РЁ╚╓╞\n"
 "╓Ё╓х╓╛╫пмХ╓й╓╓╓х╓©╓ж╓С╣╓╓е╓╓╓©╓н╓г╓╥╓Г╓╕: %s"
 
-#: mail/mail-local.c:960
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6881,12 +7590,17 @@ msgstr ""
 "╓Б╓╥╓Ё╓н╔А║╪╔К╔э╔ц╔╞╔╧╓РЁ╚╓╞╓Ё╓х╓о╓й╓╓╓й╓И\n"
 "╪Йф╟╓г╡СиЭ╓╣╓╩╓Ки╛мв╓╛╓╒╓К╓╚╓Б╓╥╓Л╓ч╓╩╓С"
 
-#: mail/mail-local.c:1046
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "╓Ё╓н╔╢╔ъх╒╔у╔╘╔К╔ю╓╚╓И╔А╔ц╔╩║╪╔╦╓Р╔Ё╔т║╪╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С"
+
+#: mail/mail-local.c:1011
 #, c-format
 msgid "Reconfigure %s"
 msgstr "%s ╓н╨фюъдЙ"
 
-#: mail/mail-mt.c:190
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6895,7 +7609,7 @@ msgstr ""
 "'%s' ╓н╨щ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©:\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6904,120 +7618,104 @@ msgstr ""
 "аЮ╨Н╓н╫ЮхВ╓╥╓ф╓╓╓К╢ж╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:880
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "╨Н╤хцФ"
 
-#: mail/mail-mt.c:862
-msgid "Evolution progress"
-msgstr "Evolution ©й╧т"
-
-#: mail/mail-ops.c:607
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" ╓РаВ©╝цФ"
 
-#: mail/mail-ops.c:611
-msgid "Sending message"
-msgstr "╔А╔ц╔╩║╪╔╦╓РаВ©╝цФ"
-
-#: mail/mail-ops.c:726
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "╔А╔ц╔╩║╪╔╦ %d / %d ╓РаВ©╝цФ"
 
-#: mail/mail-ops.c:745
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "╔А╔ц╔╩║╪╔╦ %d / %d ╓о╪╨гт╓╥╓ч╓╥╓©"
 
-#: mail/mail-ops.c:747 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "╢╟н╩╓╥╓ч╓╥╓©"
 
-#: mail/mail-ops.c:833
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "╔у╔╘╔К╔ю╓ь╔А╔ц╔╩║╪╔╦╓Рйщб╦цФ"
 
-#: mail/mail-ops.c:907
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "%s ╓ь╔А╔ц╔╩║╪╔╦╓Р╟эф╟цФ"
 
-#: mail/mail-ops.c:907
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "%s ╓ь╔А╔ц╔╩║╪╔╦╓Р╔Ё╔т║╪цФ"
 
-#: mail/mail-ops.c:923
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "╟эф╟цФ"
 
-#: mail/mail-ops.c:926
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "╔Ё╔т║╪цФ"
 
-#: mail/mail-ops.c:1002
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" ╓нцФ╓н╔у╔╘╔К╔ю╓РаЖ╨╨цФ"
 
-#: mail/mail-ops.c:1164
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "╓╢╓ъх╒"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "╔А╔ц╔╩║╪╔╦╓Ре╬аВ"
 
-#: mail/mail-ops.c:1205 mail/mail-ops.c:1343
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "╔у╔╘╔К╔ю %s ╓Р╔╙║╪╔в╔СцФ"
 
-#: mail/mail-ops.c:1272
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr "йщб╦╓╣╓Л╓© %s ╓Р╔╙║╪╔в╔СцФ"
 
-#: mail/mail-ops.c:1411
+#: mail/mail-ops.c:1436
 #, c-format
 msgid "Removing folder %s"
 msgstr "╔у╔╘╔К╔ю %s ╓Р╨О╫ЭцФ"
 
-#: mail/mail-ops.c:1495
-#, c-format
-msgid "Moving folder %s to %s"
-msgstr "%s ╓╚╓И %s ╓ь╔у╔╘╔К╔ю╓Р╟эф╟цФ"
-
-#: mail/mail-ops.c:1497
-#, c-format
-msgid "Copying folder %s to %s"
-msgstr "%s ╓╚╓И %s ╓ь╔у╔╘╔К╔ю╓Р╔Ё╔т║╪цФ"
-
-#: mail/mail-ops.c:1650
+#: mail/mail-ops.c:1568
 msgid "Refreshing folder"
 msgstr "╔у╔╘╔К╔ю╓Р╧╧©╥цФ"
 
-#: mail/mail-ops.c:1686
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "╔у╔╘╔К╔ю╓Р╨О╫ЭцФ"
 
-#: mail/mail-ops.c:1735
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "╔А╔ц╔╩║╪╔╦ %s ╓Р╪ХфюцФ"
 
-#: mail/mail-ops.c:1802
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╪ХфюцФ"
 
-#: mail/mail-ops.c:1812
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "╔А╔ц╔╩║╪╔╦хж╧Ф %d / %d (uid \"%s\") ╓Р╪ХфюцФ"
-
-#: mail/mail-ops.c:1886
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "╔А╔ц╔╩║╪╔╦╓Рйщб╦цФ"
 
-#: mail/mail-ops.c:1965
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7026,12 +7724,7 @@ msgstr ""
 "╫пно╔у╔║╔╓╔К╓Р╨Ню╝╫пмХ╓ч╓╩╓С: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "╔А╔ц╔╩║╪╔╦ %d / %d (uid \"%s\") ╓Рйщб╦цФ"
-
-#: mail/mail-ops.c:1992
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7040,11 +7733,11 @@ msgstr ""
 "╔у╔║╔╓╔К╓нйщб╦цФ╓к╔╗╔И║╪: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "е╨иу╓Рйщб╦цФ"
 
-#: mail/mail-ops.c:2081
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7053,12 +7746,12 @@ msgstr ""
 "╫пно╔у╔║╔╓╔К╓Р╨Ню╝╫пмХ╓ч╓╩╓С: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2109
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "╔г║╪╔©╓Р╫Я╓╜╫п╓╧╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: mail/mail-ops.c:2176
+#: mail/mail-ops.c:2101
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s ╓х╓нюэбЁ╓Рюз╓ц╓ф╓╓╓ч╓╧"
@@ -7067,222 +7760,174 @@ msgstr "%s ╓х╓нюэбЁ╓Рюз╓ц╓ф╓╓╓ч╓╧"
 msgid "(Untitled Message)"
 msgstr "(╔©╔╓╔х╔К╓й╓╥╔А╔ц╔╩║╪╔╦)"
 
-#: mail/mail-search.c:268
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(╔©╔╓╔х╔К╓й╓╥╔А╔ц╔╩║╪╔╦)"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "╔А╔ц╔╩║╪╔╦"
+
+#: mail/mail-search.c:284
 msgid "Find in Message"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╦║╨В"
 
-#: mail/mail-search.c:298
+#: mail/mail-search.c:314
 msgid "Case Sensitive"
 msgstr "бГй╦╩З/╬╝й╦╩З╓Р╤Хйл╓╧╓К"
 
-#: mail/mail-search.c:299
+#: mail/mail-search.c:315
 msgid "Search Forward"
 msgstr "а╟йЩ╦║╨В"
 
-#: mail/mail-search.c:316
+#: mail/mail-search.c:332
 msgid "Find:"
 msgstr "╦║╨В:"
 
-#: mail/mail-search.c:319
+#: mail/mail-search.c:335
 msgid "Matches:"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "╦║╨В(_S)"
-
-#: mail/mail-send-recv.c:138
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "╔╜╔Ц╔С╔╩╔КцФ..."
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "╔А║╪╔К╓наВ╪У©╝"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "╪У©╝цФ"
 
-#: mail/mail-send-recv.c:285
+#: mail/mail-send-recv.c:302
 msgid "Updating..."
 msgstr "╧╧©╥цФ..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
 msgid "Waiting..."
 msgstr "бт╣║цФ..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "аВ©╝цФ"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "╔╜╔Ц╔С╔╩╔К╓╥╓ч╓╥╓©"
 
-#: mail/mail-summary.c:110
-msgid "Incomplete message written on pipe!"
-msgstr "╔я╔╓╔в╬Е╓кит╢╟а╢╓й╔А╔ц╔╩║╪╔╦╓╛╫Я╓╚╓Л╓ч╓╥╓©!"
-
-#: mail/mail-summary.c:468
-msgid "Mail Summary"
-msgstr "╔А║╪╔К╔╣╔ч╔Й"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
+msgstr "╔Ф║╪╔╤╓к╓Х╓ц╓фаЮ╨Н╓Р╔╜╔Ц╔С╔╩╔К╓╣╓Л╓ч╓╥╓©"
 
-#: mail/mail-tools.c:156
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "╔ф╔С╔щ╔И╔Й mbox '%s' ╓Р╨Ню╝╓г╓╜╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: mail/mail-tools.c:203
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (╔А╔ц╔╩║╪╔╦╓Ре╬аВ)"
-
-#: mail/mail-tools.c:213
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (╥Ол╬╓й╓╥)"
-
-#: mail/mail-tools.c:230
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "╔А╔ц╔╩║╪╔╦╓Ре╬аВ╓╥╓ч╓╥╓© - %s"
 
-#: mail/mail-tools.c:232
-msgid "Forwarded message (no subject)"
-msgstr "╔А╔ц╔╩║╪╔╦╓Ре╬аВ╓╥╓ч╓╥╓© (╥Ол╬╓й╓╥)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "╔А╔ц╔╩║╪╔╦╓Ре╬аВ"
 
-#: mail/mail-tools.c:439
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
-"s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
-"s<br><b>Subject:</b> %s<br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "╔А╔ц╔╩║╪╔╦╓Ре╬аВ"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "╡╬аш╔у╔╘╔К╔ю"
 
-#: mail/mail-vfolder.c:438
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "©╥╣╛╡╬аш╔у╔╘╔К╔ю"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:197 ui/evolution-mail.xml.h:75
-msgid "Reply"
-msgstr "йж©╝"
-
-#: mail/message-browser.c:197
-msgid "Reply to the sender of this message"
-msgstr "╔А╔ц╔╩║╪╔╦╓наВ©╝╪т╓ьйж©╝╓╥╓ч╓╧"
-
-#: mail/message-browser.c:200 ui/evolution-mail.xml.h:76
-msgid "Reply to All"
-msgstr "а╢╟В╓ьйж©╝"
-
-#: mail/message-browser.c:200
-msgid "Reply to all recipients of this message"
-msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓н╪У©╝╪та╢╟В╓ьйж©╝╓╥╓ч╓╧"
-
-#: mail/message-browser.c:203 ui/evolution-mail.xml.h:38
-msgid "Forward"
-msgstr "е╬аВ"
-
-#: mail/message-browser.c:203
-msgid "Forward this message"
-msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓Ре╬аВ╓╥╓ч╓╧"
-
-#: mail/message-browser.c:208
-msgid "Print the selected message"
-msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╟У╨Ч╓╥╓ч╓╧"
-
-#: mail/message-browser.c:211
-msgid "Delete this message"
-msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓Р╨О╫Э╓╥╓ч╓╧"
-
-#: mail/message-browser.c:216 ui/evolution-event-editor.xml.h:33
-#: ui/evolution-mail.xml.h:69 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "а╟"
-
-#: mail/message-browser.c:216
-msgid "Previous message"
-msgstr "а╟╓н╔А╔ц╔╩║╪╔╦╓ь╟эф╟╓╥╓ч╓╧"
-
-#: mail/message-browser.c:219 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:62
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "╪║"
-
-#: mail/message-browser.c:219
-msgid "Next message"
-msgstr "╪║╓н╔А╔ц╔╩║╪╔╦╓ь╟эф╟╓╥╓ч╓╧"
-
-#: mail/message-list.c:684
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "л╓фи"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "╢Шфи"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "йжеЗ╨я╓ъ"
 
-#: mail/message-list.c:687
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "йё©Т╓нл╓фи╔А╔ц╔╩║╪╔╦"
 
-#: mail/message-list.c:688
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "йё©Т╓н╔А╔ц╔╩║╪╔╦"
 
-#: mail/message-list.c:692
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "╨г╓БдЦ╓╓"
 
-#: mail/message-list.c:693
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "дЦ╓╓"
 
-#: mail/message-list.c:697
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "╧Б╓╓"
 
-#: mail/message-list.c:698
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "╨г╓Б╧Б╓╓"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "╨ёфЭ╓н %p %l:%M"
 
-#: mail/message-list.c:964
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "╨РфЭ╓н %p %l:%M"
 
-#: mail/message-list.c:976
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%p %l:%M (%a)"
 
-#: mail/message-list.c:984
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%m╥Н %dфЭ %p %l:%M"
 
-#: mail/message-list.c:986
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%Yг╞ %m╥Н %dфЭ"
 
-#: mail/mail-session.c:161
-msgid "User canceled operation."
-msgstr "╔Ф║╪╔╤╓к╓Х╓ц╓фаЮ╨Н╓Р╔╜╔Ц╔С╔╩╔К╓╣╓Л╓ч╓╥╓©"
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "╔А╔ц╔╩║╪╔╦╓Рйщб╦цФ"
+
+#: mail/message-list.etspec.h:2
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Received"
+msgstr "╪У©╝цФ"
+
+#: mail/message-list.etspec.h:7
+#, fuzzy
+msgid "Size"
+msgstr "╔╣╔╓╔╨:"
 
 #: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
@@ -7312,15 +7957,1456 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "╔у╔╘╔К╔ю \"%s\" ╓н╧ьфи╡Р╫ЭцФ"
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "╧ьфи╢имЩ"
 
-#: shell/e-setup.c:124 shell/e-setup.c:197
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr "╪б╧т╔╣╔ч╔Й╓н╓©╓А╓н Evolution ╔Ё╔С╔щ║╪╔м╔С╔х"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr "Evolution ╪б╧т╔╣╔ч╔Й╔Ё╔С╔щ║╪╔м╔С╔х╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
+
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Evolution ╪б╧т╔╣╔ч╔Й║╪╔Ё╔С╔щ║╪╔м╔С╔х╓н╫И╢Э╡╫╓╛╫пмХ╓ч╓╩╓С"
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+msgid "Appointments"
+msgstr "лСб╚"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "лСб╚╓ни╫╪╗"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%p %I:%M"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%p %l:%M (%a)"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "╔А║╪╔К╔╣╔ч╔Й"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "My Evolution"
+
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
+msgstr "╔╚╔Л╔С╔ю╔у╔║╔╓╔К╓Рфи╓ъ╧Ч╓ъцФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©"
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>╔╚╔Л╔С╔ю╓Р╔М║╪╔ицФ╓к╔╗╔И║╪</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "╔©╔╧╔╞╓ни╫╪╗"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "╔╩╔╞╔╥╔Г╔С:"
+
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%Y/%B/%e %A"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "My Evolution"
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "╔А╔ц╔╩║╪╔╦╓н╟У╨Ч╓к╪╨гт╓╥╓ч╓╥╓©"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): Bonobo ╓Р╫И╢Э╡╫╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "╔╞╔Й╔╒"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+#, fuzzy
+msgid "Invalid"
+msgstr "╔╓╔С╔И╔╓╔С"
+
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "Variable"
+msgstr "л╣╦З"
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "╔н║╪╔х"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "╔н║╪╔х(_t):"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "╓╛б╦╨ъ╓╧╓К"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "╔╫║╪╔╧"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "╥Н"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "╨г╓БдЦ╓╓"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "╔ф╔╧╔х"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "╨г╓БдЦ╓╓"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "и╫╪╗"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "╔И╔╦╔╙"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Drifting rain"
+msgstr "юБлю╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "╨ф╦║╨В"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "╨ё"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Moderate snow"
+msgstr "╨ё╓╧╓╟╧╧©╥"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+#, fuzzy
+msgid "Drifting snow grains"
+msgstr "юБлю╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "╔А║╪╔К"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "╪║╓н╩Ч╓к╔ю╔╓╔╒╔М╔╟╓Ри╫╪╗╓╧╓К:"
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "╪Гмв╓й╔А║╪╔К"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "╔А║╪╔К╓н╪У©╝"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Shallow small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Showers of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown precipitation"
+msgstr "л╓цн╓нг╖╬з╬Убж╓г╓╧"
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Light precipitation"
+msgstr "╟Змя╓Р╤╞д╢╓╧╓К"
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "л╓цн╓н╔╗╔И║╪"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "бг╧Г╓╩╓н╟ффБ"
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "Miss"
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "╫дд╧"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Drifting mist"
+msgstr "╔А║╪╔Й╔С╔╟╔Й╔╧╔х"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "╓Ё╓н╔╕╔ё╔С╔и╔╕╓Рйд╓╦╓ч╓╧"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "╣╜о©"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "╔©╔╧╔╞╓ни╫╪╗"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "╓Ё╓н╔╕╔ё╔С╔и╔╕╓Рйд╓╦╓ч╓╧"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "аВ©╝"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "╔ь╔ц╔ю"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "фЭ"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "8 ╥Н"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Raging tornado"
+msgstr "TODO╓н╬У╤╥"
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Thunderous tornado"
+msgstr "TODO╓н╬У╤╥"
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "йжеЗ╨я╓ъ"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "╔у╔╘╔К╔ю╓Ра╙бР"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "╓╧╓ы╓ф╓ниу╓╜е╨╓╓"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "и╫╪╗╓╧╓К╔у╔╘╔К╔ю╓РЁ╚╩о╓╧╓К:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "и╫╪╗╔╙╔в╔╥╔Г╔С"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "и╫╪╗"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "╤БмкфЭ"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+#, fuzzy
+msgid "News Feed Settings"
+msgstr "юъдЙ"
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "1 фЭ"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "╥Н"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr "1 ╫╣╢ж"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr ""
+"╔╧╔╠╔╦╔Е║╪╔К\n"
+"╩Ч╢ж"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "╔©╔╧╔╞╓ни╫╪╗"
+
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "╓╧╓ы╓ф╓н╔ь╔ц╔ю╓Ри╫╪╗(_H)"
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "╔©╔╧╔╞╓ни╫╪╗"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "╔©╔╧╔╞"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
+msgstr ""
+"\n"
+"  иТ╫П:  "
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "╓╫╓нб╬"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "а╙бР╓╣╓Л╓©╓Б╓н╓Р╔╞╔Й╔╒╓╥╓ч╓╧"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "4 ╥Н"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "Evolution ╔╥╔╖╔К"
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "╬э╨ы"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "бг╧Г╓╩╓Р╔╜╔Ц╔С╔╩╔К"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "фцйл╓й╔у╔╘╔К╔ю"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Evolution ╓н╔╓╔С╔╧╔х║╪╔К"
 
-#: shell/e-setup.c:128
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -7328,28 +9414,24 @@ msgstr ""
 "╓Ё╓н Evolution ╓н©╥╓╥╓╓╔п║╪╔╦╔Г╔С╓о╓╒╓й╓©╓н╔я║╪╔╫╔й╔К Evolution\n"
 "╔г╔ё╔Л╔╞╔х╔Й╓нцФ╓киу╡ц╔у╔║╔╓╔К╓Р╔╓╔С╔╧╔х║╪╔К╓╧╓Ки╛мв╓╛╓╒╓Й╓ч╓╧"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "\"OK\" ╓г╔у╔║╔╓╔К╓Р╔╓╔С╔╧╔х║╪╔К, ╓ч╓©╓о \"╔╜╔Ц╔С╔╩╔К\" ╓г╫╙н╩╓╥╓ч╓╧"
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "ю╣╓╥╓╞╔у╔║╔╓╔К╓Р╧╧©╥╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: shell/e-setup.c:172 shell/e-setup.c:240
-msgid "Evolution files successfully installed."
-msgstr "Evolution ╓н╔у╔║╔╓╔К╓ою╣╓╥╓╞╔╓╔С╔╧╔х║╪╔К╓╣╓Л╓ч╓╥╓©"
-
-#: shell/e-setup.c:201
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "╓Ё╓Л╓о Evolution ╓Р╪б╧т╓╥╓©╨г╫И╓н╓Х╓╕╓к╩в╓О╓Л╓ч╓╧"
 
-#: shell/e-setup.c:202
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Evolution ╔Ф║╪╔╤╔у╔║╔╓╔К╓Р╔╓╔С╔╧╔х║╪╔К╓╥╓ч╓╧╓н╓г \"OK\" ╓Р╔╞╔Й╔ц╔╞╓╥╓ф╡╪╓╣╓╓"
 
-#: shell/e-setup.c:221
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -7360,16 +9442,14 @@ msgstr ""
 "\n"
 "╔╗╔И║╪: %s"
 
-#: shell/e-setup.c:236
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
-msgstr ""
-"'%s' ╓нцФ╓к╔у╔║╔╓╔К╓Р\n"
-"╔Ё╔т║╪╫пмХ╓ч╓╩╓С"
+msgstr "╔у╔║╔╓╔Кфи╧ЧцФ╓н╢ж╓к╔╗╔И║╪╓ох╞ю╦╓╥╓ч╓╥╓©"
 
-#: shell/e-setup.c:303
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7380,7 +9460,7 @@ msgstr ""
 "Evolution ╔Ф║╪╔╤╔у╔║╔╓╔К╓н╔╓╔С╔╧╔х║╪╔К╓Р\n"
 "╣Жмф╓╧╓К╓©╓А╓к╟эф╟╓╥╓ф╡╪╓╣╓╓"
 
-#: shell/e-setup.c:317
+#: shell/e-setup.c:322
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -7394,7 +9474,7 @@ msgstr ""
 "╨О╫Э╓╧╓Ки╛мв╓╛╓╒╓Й╓ч╓╧\n"
 "╓Ё╓н╔г╔ё╔Л╔╞╔х╔Й╓Р╨О╫Э╓╥╓ч╓╧╓╚?"
 
-#: shell/e-setup.c:342
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7405,39 +9485,56 @@ msgstr ""
 "╔г╔ё╔Л╔╞╔х╔Й╓г╓о╓╒╓Й╓ч╓╩╓С║╔Evolution ╔Ф║╪╔╤\n"
 "╔у╔║╔╓╔К╓н╔╓╔С╔╧╔х║╪╔К╓Р╣Жмф╓╧╓К╓©╓А╓к╟эф╟╓╥╓ф╡╪╓╣╓╓"
 
-#: shell/e-shell.c:391
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "╤ииТ╣╜╡╠аУцж╓н╔╩╔ц╔х╔╒╔ц╔в╓╛╫пмХ╓ч╓╩╓С -- %s"
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "╔у╔╘╔К╔ю╓Р╪Хфю╫пмХ╓ч╓╩╓С: %s: %s"
 
-#: shell/e-shell.c:1256
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"'%s' ╓нцФ╓к╔у╔║╔╓╔К╓Р\n"
+"╔Ё╔т║╪╫пмХ╓ч╓╩╓С"
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
 msgstr ""
-"`%s' ╔с╔Е║╪╓офмаЁ╩Юк╢╓╥╓ч╓╥╓© :-(\n"
-"╓Ё╓Л╓о╓©╓ж╓С %s ╔Ё╔С╔щ║╪╔м╔С╔х╓╛╔╞╔И╔ц╔╥╔Е╓╥╓©╓Ё╓х╓Р╟улё╓╥╓ч╓╧"
 
-#: shell/e-shell-folder-commands.c:239
+#: shell/e-shell-folder-commands.c:270
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "╔у╔╘╔К╔ю \"%s\" ╓Р╔Ё╔т║╪╓╧╓К╔у╔╘╔К╔ю╓Р╩ьдЙ╓╥╓ч╓╧:"
 
-#: shell/e-shell-folder-commands.c:244
+#: shell/e-shell-folder-commands.c:275
 msgid "Copy folder"
 msgstr "╔у╔╘╔К╔ю╓н╔Ё╔т║╪"
 
-#: shell/e-shell-folder-commands.c:281
+#: shell/e-shell-folder-commands.c:313
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "╔у╔╘╔К╔ю \"%s\" ╓Р╟эф╟╓╧╓К╔у╔╘╔К╔ю╓Р╩ьдЙ╓╥╓ч╓╧:"
 
-#: shell/e-shell-folder-commands.c:286
+#: shell/e-shell-folder-commands.c:318
 msgid "Move folder"
 msgstr "╔у╔╘╔К╔ю╓н╟эф╟"
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "╓Ё╓н╔у╔╘╔К╔ю╓Р╨О╫Э╓╥╓ч╓╧"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "кэеЖ╓к╔©╔╧╔╞ `%s' ╓Р╨О╫Э╓╥╓ф╓Б╓Х╓М╓╥╓╓╓г╓╧╓╚?"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "╔у╔╘╔К╔ю %s ╓Р╨О╫ЭцФ"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -7446,15 +9543,15 @@ msgstr ""
 "╩ьдЙ╓╣╓Л╓©╔у╔╘╔К╔ю╓Р╨Ню╝╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "╩ьдЙ╓╣╓Л╓©╔у╔╘╔К╔юл╬╓ом╜╦З╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - ©╥╣╛╔у╔╘╔К╔ю╓н╨Ню╝"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -7462,11 +9559,11 @@ msgstr ""
 "а╙бР╓╥╓©╔у╔╘╔К╔ю╓н╪Ойл╓омв╣А╓╣╓Л╓©аЮ╨Н╓н╓©╓А╓к\n"
 "м╜╦З╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: shell/e-shell-folder-selection-dialog.c:328
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "©╥╣╛..."
 
-#: shell/e-shell-folder-title-bar.c:468 shell/e-shell-folder-title-bar.c:469
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(╔©╔╓╔х╔К╓й╓╥)"
 
@@ -7478,11 +9575,12 @@ msgid ""
 "You can select \"Automatic\" if you do not know, and Evolution will attempt "
 "to work it out."
 msgstr ""
-"Evolution ╓ь╔╓╔С╔щ║╪╔х╓╥╓©╓╓╔у╔║╔╓╔К╓Ра╙бР╓╥╓ф║╓╔Й╔╧╔х╓╚╓И╔у╔║╔╓╔К╪Ойл╓Ра╙бР"
-"╓╥╓ф╓╞╓ю╓╣╓╓║╔\n"
+"Evolution "
+"╓ь╔╓╔С╔щ║╪╔х╓╥╓©╓╓╔у╔║╔╓╔К╓Ра╙бР╓╥╓ф║╓╔Й╔╧╔х╓╚╓И╔у╔║╔╓╔К╪Ойл╓Ра╙бР╓╥╓ф╓╞╓ю╓╣╓╓"
+"║╔\n"
 "\n"
-"╓Б╓╥й╛╓╚╓И╓й╓╓╓й╓И \"╪╚ф╞\" ╓Ра╙бР╓╧╓К╓Ё╓х╓╛╫пмХ║╓Evolution ╓о╡Р╥Х╓Р╩Н╓ъ╓К╓г"
-"╓╥╓Г╓╕"
+"╓Б╓╥й╛╓╚╓И╓й╓╓╓й╓И \"╪╚ф╞\" ╓Ра╙бР╓╧╓К╓Ё╓х╓╛╫пмХ║╓Evolution "
+"╓о╡Р╥Х╓Р╩Н╓ъ╓К╓г╓╥╓Г╓╕"
 
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
@@ -7575,54 +9673,19 @@ msgstr "╓Ё╓н╔г║╪╔©╓Р╔╓╔С╔щ║╪╔х╓╧╓КаВ╓ЙюХ╓н╔у╔╘╔К╔ю╓Ра╙бР╓╥╓ф╓╞╓ю╓╣╓╓"
 msgid "Closing connections..."
 msgstr "юэбЁ╓Рйд╓╦╓ф╓╓╓ч╓╧..."
 
-#: shell/e-shell-view.c:167
-msgid "(No folder displayed)"
-msgstr "(и╫╪╗╓╥╓©╔у╔╘╔К╔ю╓о╓╒╓Й╓ч╓╩╓С)"
-
-#. Special case for My Evolution
-#: shell/e-shell-view.c:1383
-msgid "My Evolution"
-msgstr "My Evolution"
-
-#: shell/e-shell-view.c:1400
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution - %s"
-
-#: shell/e-shell-view.c:1402
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell-view.c:1440
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Evolution ╓о╦╫╨ъ╔╙╔С╔И╔╓╔С╓г╓╧║╔╔╙╔у╔И╔╓╔С╓к╓╧╓К╓к╓о╓Ё╓н╔э╔©╔С╓Р╔╞╔Й╔ц╔╞╓╥╓ф"
-"╓╞╓ю╓╣╓╓"
-
-#: shell/e-shell-view.c:1447
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution ╓о╔╙╔у╔И╔╓╔С╫ХмЩцФ╓г╓╧"
-
-#: shell/e-shell-view.c:1453
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Evolution ╓о╦╫╨ъ╔╙╔у╔И╔╓╔С╓г╓╧║╔╔╙╔С╔И╔╓╔С╓к╓╧╓К╓к╓о╓Ё╓н╔э╔©╔С╓Р╔╞╔Й╔ц╔╞╓╥╓ф"
-"╓╞╓ю╓╣╓╓"
-
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy ╓о╓╒╓й╓©╓н $PATH ╓к╓о╦╚╓д╓╚╓Й╓ч╓╩╓С"
 
-#: shell/e-shell-view-menu.c:185
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy ╓о╪б╧т╓г╓╜╓ч╓╩╓С╓г╓╥╓©"
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:232
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -7634,35 +9697,92 @@ msgstr ""
 "╔╟╔К║╪╔в╔╕╔╖╔╒╔╒╔в╔Й╔╠║╪╔╥╔Г╔С╓н\n"
 "╔я╔ц╔╠║╪╔╦╔╫╔у╔х╓г╓╧"
 
-#: shell/e-shell-view-menu.c:465
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "╔у╔╘╔К╔ю╓ь╟эф╟..."
 
-#: shell/e-shell-view-menu.c:466
+#: shell/e-shell-view-menu.c:438
 msgid "Select the folder that you want to open"
 msgstr "Ё╚╓╜╓©╓╓╔у╔╘╔К╔ю╓Ра╙бР╓╥╓ч╓╧"
 
-#: shell/e-shell-view-menu.c:653
-msgid "Work online"
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "©╥╣╛╔╥╔Г║╪╔х╔╚╔ц╔х╔╟╔К║╪╔в╓Р╨Ню╝╓╥╓ч╓╧"
+
+#: shell/e-shell-view-menu.c:584
+#, fuzzy
+msgid "Select the folder you want the shortcut to point to:"
+msgstr "Ё╚╓╜╓©╓╓╔у╔╘╔К╔ю╓Ра╙бР╓╥╓ч╓╧"
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
 msgstr "╔╙╔С╔И╔╓╔С╨Н╤х"
 
-#: shell/e-shell-view-menu.c:665 shell/e-shell-view-menu.c:677
-msgid "Work offline"
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
 msgstr "╔╙╔у╔И╔╓╔С╨Н╤х"
 
-#: shell/e-shortcuts.c:382
-msgid "Error saving shortcuts."
-msgstr "╔╥╔Г║╪╔х╔╚╔ц╔х╓нйщб╦цФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©"
+#: shell/e-shell-view.c:175
+msgid "(No folder displayed)"
+msgstr "(и╫╪╗╓╥╓©╔у╔╘╔К╔ю╓о╓╒╓Й╓ч╓╩╓С)"
 
-#: shell/e-shortcuts-view.c:134
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+msgid "My Evolution"
+msgstr "My Evolution"
+
+#: shell/e-shell-view.c:1411
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution - %s"
+
+#: shell/e-shell-view.c:1413
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Evolution "
+"╓о╦╫╨ъ╔╙╔С╔И╔╓╔С╓г╓╧║╔╔╙╔у╔И╔╓╔С╓к╓╧╓К╓к╓о╓Ё╓н╔э╔©╔С╓Р╔╞╔Й╔ц╔╞╓╥╓ф╓╞╓ю╓╣╓╓"
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution ╓о╔╙╔у╔И╔╓╔С╫ХмЩцФ╓г╓╧"
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Evolution "
+"╓о╦╫╨ъ╔╙╔у╔И╔╓╔С╓г╓╧║╔╔╙╔С╔И╔╓╔С╓к╓╧╓К╓к╓о╓Ё╓н╔э╔©╔С╓Р╔╞╔Й╔ц╔╞╓╥╓ф╓╞╓ю╓╣╓╓"
+
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "╤ииТ╣╜╡╠аУцж╓н╔╩╔ц╔х╔╒╔ц╔в╓╛╫пмХ╓ч╓╩╓С -- %s"
+
+#: shell/e-shell.c:1311
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"`%s' ╔с╔Е║╪╓офмаЁ╩Юк╢╓╥╓ч╓╥╓© :-(\n"
+"╓Ё╓Л╓о╓©╓ж╓С %s ╔Ё╔С╔щ║╪╔м╔С╔х╓╛╔╞╔И╔ц╔╥╔Е╓╥╓©╓Ё╓х╓Р╟улё╓╥╓ч╓╧"
+
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "©╥╣╛╔╥╔Г║╪╔х╔╚╔ц╔х╔╟╔К║╪╔в╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "╔╟╔К║╪╔вл╬:"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -7671,110 +9791,204 @@ msgstr ""
 "кэеЖ╓к╔╥╔Г║╪╔х╔╚╔ц╔х╔п║╪╓╚╓И╔╟╔К║╪╔в\n"
 "`%s' ╓Р╨О╫Э╓╥╓©╓╓╓г╓╧╓╚?"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "╨О╫Э╓╥╓ч╓╩╓С"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "╓Ё╓н╔╥╔Г║╪╔х╔╚╔ц╔х╔╟╔К║╪╔в╓Р╨О╫Э╓╥╓ч╓╧"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "╓Ё╓н╔╥╔Г║╪╔х╔╚╔ц╔х╔╟╔К║╪╔в╓Р╨О╫Э╓╥╓ч╓╧"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "╬╝╓╣╓╓╔╒╔╓╔Ё╔С(_S)"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "╬╝╓╣╓╓╔╒╔╓╔Ё╔С╓г╔╥╔Г║╪╔х╔╚╔ц╔х╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "бГ╓╜╓╓╔╒╔╓╔Ё╔С(_L)"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "бГ╓╜╓╓╔╒╔╓╔Ё╔С╓г╔╥╔Г║╪╔х╔╚╔ц╔х╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "©╥╣╛╔╟╔К║╪╔в(_N)..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "©╥╣╛╔╥╔Г║╪╔х╔╚╔ц╔х╔╟╔К║╪╔в╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "╓Ё╓н╔╟╔К║╪╔в╓Р╨О╫Э(_R)..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "╓Ё╓н╔╥╔Г║╪╔х╔╚╔ц╔х╔╟╔К║╪╔в╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "╓Ё╓н╔╟╔К║╪╔в╓Р╨О╫Э(_R)..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "╓Ё╓н╔╥╔Г║╪╔х╔╚╔ц╔х╔╟╔К║╪╔в╓Р╨О╫Э╓╥╓ч╓╧"
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "╔╥╔Г║╪╔х╔╚╔ц╔х╔п║╪╓Р╠ё╓╧(_H)"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "╔╥╔Г║╪╔х╔╚╔ц╔х╔п║╪╓Р╠ё╓╥╓ч╓╧"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "╔╒╔╞╔ф╔ё╔ж"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "╓Ё╓н╔╥╔Г║╪╔х╔╚╔ц╔х╔╟╔К║╪╔в╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
-msgstr "╓Ё╓н╔╥╔Г║╪╔х╔╚╔ц╔х╓Р╔╒╔╞╔ф╔ё╔ж╓к╓╥╓ч╓╧"
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "╓Ё╓н╔╥╔Г║╪╔х╔╚╔ц╔х╔╟╔К║╪╔в╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Ё╚╓╞"
+
+#: shell/e-shortcuts-view.c:474
+#, fuzzy
+msgid "Open the folder linked to this shortcut"
+msgstr "йл╓н╔╕╔ё╔С╔и╔╕╓г╓Ё╓н╔у╔╘╔К╔ю╓РЁ╚╓╜╓ч╓╧"
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr "©╥╣╛╔╕╔ё╔С╔и╔╕╓гЁ╚╓╞"
+
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "©╥╣╛╔╕╔ё╔С╔и╔╕╓га╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓РЁ╚╓╜╓ч╓╧"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "╔Й╔м║╪╔Ю(_R)..."
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "╓Ё╓н╔╥╔Г║╪╔х╔╚╔ц╔х╔╟╔К║╪╔в╓Р╨О╫Э╓╥╓ч╓╧"
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "╔╥╔Г║╪╔х╔╚╔ц╔х╔п║╪╓╚╓И╓Ё╓н╔╥╔Г║╪╔х╔╚╔ц╔х╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:585
+msgid "Error saving shortcuts."
+msgstr "╔╥╔Г║╪╔х╔╚╔ц╔х╓нйщб╦цФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©"
+
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "╔╥╔Г║╪╔х╔╚╔ц╔х╔п║╪(_S)"
+
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "╔Ё╔С╔©╔╞╔х(_C)"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(л╬а╟╓й╓╥)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "╔╗╔И║╪╓о╓╒╓Й╓ч╓╩╓С"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "╟Лхле╙╓й╔╗╔И║╪"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "ф╠╓╦л╬а╟╓н╔у╔╘╔К╔ю╓╛╓╧╓г╓кб╦╨ъ╓╥╓ф╓╓╓ч╓╧"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "╩ьдЙ╓╣╓Л╓©╔у╔╘╔К╔ю╪Ойл╓ом╜╦З╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "I/O ╔╗╔И║╪"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "╔у╔╘╔К╔ю╓Р╨Ню╝╓╧╓К╫╫й╛╓й╤У╓╜╓╛╓╒╓Й╓ч╓╩╓С"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "╩ьдЙ╓╣╓Л╓©╔у╔╘╔К╔ю╓о╦╚иу╓╚╓Й╓ч╓╩╓С╓г╓╥╓©"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "╣║г╫╓о╓Ё╓н╣╜╡╠аУцж╓г╓о╪баУ╓╣╓Л╓ф╓╓╓ч╓╩╓С"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "╣Ж╡д╓╛╓╒╓Й╓ч╓╩╓С"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "аЮ╨Н╓о╔╣╔щ║╪╔х╓╣╓Л╓ф╓╓╓ч╓╩╓С"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "╩ьдЙ╓╣╓Л╓©╪Ойл╓о╓Ё╓н╣╜╡╠аУцж╓г╓о╔╣╔щ║╪╔х╓╣╓Л╓ф╓╓╓ч╓╩╓С"
 
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
+
+#: shell/e-task-widget.c:173
+#, fuzzy
+msgid "%s (%d%% complete)"
+msgstr "% ╢╟н╩(_l):"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "юэбЁ╓Рйд╓╦╓ф╓╓╓ч╓╧..."
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "╔ш╔╧╔х:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "╔у╔╘╔К╔юл╬:"
@@ -7787,15 +10001,11 @@ msgstr "╔у╔╘╔К╔ю╪Ойл:"
 msgid "Specify where to create the folder:"
 msgstr "╔у╔╘╔К╔ю╓Р╨Ню╝╓╧╓К╬Л╫Й╓Р╩ьдЙ╓╥╓ф╓╞╓ю╓╣╓╓:"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "Evolution ╔╥╔╖╔К"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
-"\"╔╓╔С╔щ║╪╔х\" ╓Р╔╞╔Й╔ц╔╞╓╥╓ф Evolution ╓ь╔у╔║╔╓╔К╓н╔╓╔С╔щ║╪╔х╓РЁ╚╩о╓╥╓ф╓╞╓ю"
-"╓╣╓╓"
+"\"╔╓╔С╔щ║╪╔х\" ╓Р╔╞╔Й╔ц╔╞╓╥╓ф Evolution "
+"╓ь╔у╔║╔╓╔К╓н╔╓╔С╔щ║╪╔х╓РЁ╚╩о╓╥╓ф╓╞╓ю╓╣╓╓"
 
 #: shell/importer/import.glade.h:2
 msgid "Evolution Import Utility"
@@ -7815,30 +10025,34 @@ msgstr ""
 "╓Ё╓н╔╕╔ё╔╤║╪╔и╓г╓о Evolution ╓нцФ╓кЁ╟иТ╔у╔║╔╓╔К╓Р╔╓╔С╔щ║╪╔х\n"
 "╓╧╓К╫ХмЩ╓Рдл╓╥╓ф╟ффБ╓╥╓ч╓╧"
 
-#: shell/importer/intelligent.c:187
+#: shell/importer/intelligent.c:191
 msgid "Importers"
 msgstr "╔╓╔С╔щ║╪╔х"
 
-#: shell/importer/intelligent.c:193
+#: shell/importer/intelligent.c:197
 msgid "Don't import"
 msgstr "╔╓╔С╔щ║╪╔х╓╥╓ч╓╩╓С"
 
-#: shell/main.c:82
-#, no-c-format
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓РфСеы╓хи╫╪╗╓╥╓й╓╓"
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
@@ -7859,7 +10073,7 @@ msgstr ""
 "╡Ф║╧╓о╓╒╓й╓©╓╛╡Ф║╧╓ню╝╡л╓РЁз╓╥╓Ю╓Ё╓х╓Рк╬╓С╓г╓╓╓ч╓╧║╔╓╫╓╥╓ф╡Ф║╧╓о\n"
 "г╝©╢╓к╓╒╓й╓©╓н╧в╦╔╓Рбт╓а╪У╓╠╓ф╓╓╓ч╓╧!\n"
 
-#: shell/main.c:107
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7867,34 +10081,29 @@ msgstr ""
 "╓╒╓Й╓╛╓х╓╕\n"
 "Evolution ╔а║╪╔Ю\n"
 
-#: shell/main.c:138
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "Evolution ╔╥╔╖╔К╓н╫И╢Э╡╫╓╛╫пмХ╓ч╓╩╓С"
 
-#: shell/main.c:184
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "╔╧╔в╔И╔ц╔╥╔Е╡Хлл╓Рл╣╦З╓к╓╧╓К"
 
-#: shell/main.c:185
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr "╓╧╓ы╓ф╓н╔Ё╔С╔щ║╪╔м╔С╔х╓н╔г╔п╔ц╔╟╫пно╓Р╔у╔║╔╓╔К╓ьаВ╓К"
 
-#: shell/main.c:217
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo ╔Ё╔С╔щ║╪╔м╔С╔х╔╥╔╧╔ф╔Ю╓Р╫И╢Э╡╫╫пмХ╓ч╓╩╓С"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-event-editor.xml.h:6
-#: ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "юз╓Й╪Х╓Й(_u)"
-
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-event-editor.xml.h:13
-#: ui/evolution-mail.xml.h:8 ui/evolution-task-editor-dialog.xml.h:14
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
 msgid "Copy"
 msgstr "╔Ё╔т║╪"
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:15
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
 msgstr "а╙бР╓╣╓Л╓©╓Б╓н╓Р╔Ё╔т║╪╓╥╓ч╓╧"
 
@@ -7902,68 +10111,66 @@ msgstr "а╙бР╓╣╓Л╓©╓Б╓н╓Р╔Ё╔т║╪╓╥╓ч╓╧"
 msgid "Create new contact"
 msgstr "©╥╣╛╔Ё╔С╔©╔╞╔х╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-event-editor.xml.h:15
-#: ui/evolution-task-editor-dialog.xml.h:16
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "©╥╣╛╔Ё╔С╔©╔╞╔х╓Р╨Ню╝╓╥╓ч╓╧"
+
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
 msgid "Cut"
 msgstr "юз╓Й╪Х╓Й"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-event-editor.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:17
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
 msgid "Cut the selection"
 msgstr "а╙бР╓╣╓Л╓©╓Б╓н╓Рюз╓Й╪Х╓Й╓ч╓╧"
 
-#: ui/evolution-addressbook.xml.h:8
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "а╙бР╓╥╓©╔Ё╔С╔©╔╞╔х╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "©╥╣╛╔Ё╔С╔©╔╞╔х"
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:30
-#: ui/evolution-task-editor-dialog.xml.h:33
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New list"
+msgstr "╔к╔Е║╪╔╧"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
 msgid "Paste"
 msgstr "е╫╓Йиу╓╠"
 
-#: ui/evolution-addressbook.xml.h:11 ui/evolution-event-editor.xml.h:31
-#: ui/evolution-task-editor-dialog.xml.h:34
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "╔╞╔Й╔ц╔в╔э║╪╔и╓ье╫╓Йиу╓╠╓ч╓╧"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:68
-msgid "Previews the message to be printed"
-msgstr "╟У╨Ч╓╣╓Л╓К╔А╔ц╔╩║╪╔╦╓н╔в╔Л╔с╔Е║╪╓Ри╫╪╗╓╥╓ч╓╧"
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
+msgstr "╟У╨Ч╓╣╓Л╓К╔╚╔Л╔С╔ю╓н╔в╔Л╔с╔Е║╪╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:17
 msgid "Print selected contacts"
 msgstr "а╙бР╓╥╓©╔Ё╔С╔©╔╞╔х╓Р╟У╨Ч╓╥╓ч╓╧"
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-event-editor.xml.h:48
-#: ui/evolution-task-editor-dialog.xml.h:57
+#: ui/evolution-addressbook.xml.h:18
 msgid "Select All"
 msgstr "╓╧╓ы╓фа╙бР"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "╓╧╓ы╓ф╓н╓Б╓н╓Ра╙бР╓╥╓ч╓╧"
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "╓╧╓ы╓ф╓н╔Ё╔С╔©╔╞╔х╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "дД╩ъ"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "╠с╓ъ╧Ч╓ъ╓РдД╩ъ╓╥╓ч╓╧"
 
-#: ui/evolution-addressbook.xml.h:20
-msgid "View All"
-msgstr "╓╧╓ы╓фи╫╪╗"
-
-#: ui/evolution-addressbook.xml.h:21
-msgid "View all contacts"
-msgstr "╓╧╓ы╓ф╓н╔Ё╔С╔©╔╞╔х╓Ри╫╪╗╓╥╓ч╓╧"
-
 #: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "╔╒╔и╔Л╔╧д╒╓н╔╫║╪╔╧(_A)..."
@@ -7972,183 +10179,223 @@ msgstr "╔╒╔и╔Л╔╧д╒╓н╔╫║╪╔╧(_A)..."
 msgid "_Contact"
 msgstr "╔Ё╔С╔©╔╞╔х(_C)"
 
-#: ui/evolution-addressbook.xml.h:24 ui/evolution-event-editor.xml.h:55
-#: ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "╔Ё╔т║╪(_C)"
-
-#: ui/evolution-addressbook.xml.h:25 ui/evolution-event-editor.xml.h:68
-#: ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "е╫╓Йиу╓╠(_P)"
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "╔Ё╔С╔©╔╞╔х(_C)"
 
-#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "╟У╨Ч(_P)..."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "╔Ё╔С╔©╔╞╔х╓н╦║╨В(_S)"
 
-#: ui/evolution-addressbook.xml.h:28 ui/evolution-event-editor.xml.h:72
-#: ui/evolution-task-editor-dialog.xml.h:86
+#: ui/evolution-addressbook.xml.h:29
 msgid "_Select All"
 msgstr "╓╧╓ы╓фа╙бР(_A)"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-task-editor-dialog.xml.h:88
-#: ui/evolution.xml.h:64
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "╔д║╪╔К(_T)"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 фЭ"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a new all day Event"
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "©╥╣╛╓ккХфЭ╓н╔╓╔ы╔С╔х╓Р╨Ню╝╓╥╓ч╓╧"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "©╥╣╛лСб╚╓Р╨Ню╝╓╥╓ч╓╧"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "©╥╣╛╔╚╔Л╔С╔ю╓Р╨Ню╝╓╥╓ч╓╧"
+msgid "Create a new appointment"
+msgstr "©╥╣╛лСб╚╓Р╨Ню╝╓╥╓ч╓╧"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "фЭ"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "╟эф╟"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "╩Ч╢ж╓РлА╓╥╓ч╓╧"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "╩Ч╢ж╓Р©й╓А╓ч╓╧"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "╩ьдЙфЭ╓к╟эф╟(_D)"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
-msgstr "╨ёфЭ╓ь╟эф╟(_T)"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "╩ьдЙфЭ╓к╟эф╟╓╥╓ч╓╧"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "╦╫╨ъ╓н╩Ч╢ж╓ь╟эф╟╓╥╓ч╓╧"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "╥Н"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr "©╥╣╛╔╓╔ы╔С╔х(_E)"
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "╔╚╔Л╔С╔ю╓РЁ╚╓╞"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "а╟"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "©╥╣╛лСб╚"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "╟У╨Ч╓╣╓Л╓К╔╚╔Л╔С╔ю╓н╔в╔Л╔с╔Е║╪╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "╔╚╔Л╔С╔ю╓н╟У╨Ч"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "╓Ё╓н╔╚╔Л╔С╔ю╓н╟У╨Ч╓╥╓ч╓╧"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:19
-msgid "Save As"
-msgstr "йлл╬╓гйщб╦"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "и╛©э╬ПйС"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "йл╓н╓Б╓н╓х╓╥╓ф╔╚╔Л╔С╔ю╓Рйщб╦╓╥╓ч╓╧"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "1 фЭ╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "1 ╔Ж╥Н╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "1 ╫╣╢ж╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "╫╣╢жо╚ф╞╩Ч╢ж╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
-msgid "Today"
-msgstr "╨ёфЭ"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "╫╣╢жо╚ф╞╩Ч╢ж(_o)"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "╫╣"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "лСб╚(_A)"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "╔А║╪╔КюъдЙ(_M)..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "фЭ(_D)"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "╥Н(_M)"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:58
-msgid "_New"
-msgstr "©╥╣╛(_N)"
-
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "╔╚╔Л╔С╔ю╓РЁ╚╓╞(_O)"
-
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "╫╣(_W)"
 
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "йд╓╦╓К"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "╓Ё╓нлСб╚╓Рйд╓╦╓ч╓╧"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "╓Ё╓нлСб╚╓Р╨О╫Э"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "╔А╔╓╔С╔д║╪╔К╔п║╪"
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "╟У╨Ч╓╣╓Л╓К╔А╔ц╔╩║╪╔╦╓н╔в╔Л╔с╔Е║╪╓Ри╫╪╗╓╥╓ч╓╧"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "╟У╨Ч╔в╔Л╔с╔Е║╪(_v)"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "╔в╔Й╔С╔©╓нюъдЙ"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "╓Ё╓н╔╒╔╓╔ф╔Ю╓Р╟У╨Ч"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "╟У╨Ч..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "йщб╦╓хйд╓╦╓К"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "лСб╚╓Рйщб╦╓╥╓ф╔ю╔╓╔╒╔М╔╟╔э╔ц╔╞╔╧╓Рйд╓╦╓ч╓╧"
+
+#: ui/evolution-comp-editor.xml.h:17
+#, fuzzy
+msgid "Save this item to disk"
+msgstr "%s ╓ь╔с╔Е║╪╓Рйя╧╧"
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr "╦╫╨ъ╓н╔в╔Й╔С╔©╓н╔з║╪╔╦юъдЙ╓Р╧т╓╓╓ч╓╧"
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "ф╟╨Н(_A)"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "╔у╔║╔╓╔К(_F)"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "╓Ё╓н╔╒╔╓╔ф╔Ю╓Р╨О╫Э╓╥╓ч╓╧"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "╨О╫Э..."
 
@@ -8160,27 +10407,12 @@ msgstr "╔ь╔К╔в"
 msgid "Print En_velope..."
 msgstr "и╫╩Ф╓Р╟У╨Ч(_v)..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "╓Ё╓н╔╒╔╓╔ф╔Ю╓Р╟У╨Ч"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "╟У╨Ч..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "йлл╬╓гйщб╦(_A)..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "йщб╦╓хйд╓╦╓К"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "╔Ё╔С╔©╔╞╔х╓Рйщб╦╓╥╓ф╓Ё╓н╔ю╔╓╔╒╔М╔╟╔э╔ц╔╞╔╧╓Рйд╓╦╓ч╓╧"
@@ -8197,670 +10429,672 @@ msgstr "╔╙╔С╔И╔╓╔С╔ь╔К╔в╓Р╩╡╬х╓╥╓ф╓╞╓ю╓╣╓╓"
 msgid "Send _message to contact..."
 msgstr "╔Ё╔С╔©╔╞╔х╓ь╔А╔ц╔╩║╪╔╦╓РаВ©╝(_m)..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:48 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:49
-msgid "_File"
-msgstr "╔у╔║╔╓╔К(_F)"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:55
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "йщб╦(_S)"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "╓Ё╓н╔╒╔в╔Й╔╠║╪╔╥╔Г╔С╓к╓д╓╓╓ф"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "╓Ё╓н╔╒╔╓╔ф╔Ю╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "╬ПйС..."
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "╔©╔╧╔╞╓Рйщб╦╓╥╓ф╔ю╔╓╔╒╔М╔╟╔э╔ц╔╞╔╧╓Рйд╓╦╓ч╓╧"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "ф╟╨Н(_n)"
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "б╬╓ь╔Ё╔С╔©╔╞╔х╓РаВ©╝(_n)..."
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "╔╒╔и╔Л╔╧д╒(_B)... (FIXME)"
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "╔Ё╔С╔©╔╞╔х╓ь╔А╔ц╔╩║╪╔╦╓РаВ©╝(_m)..."
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "╔╞╔Й╔╒(_l)"
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "бг╧Г╓╩╓Р╔╜╔Ц╔С╔╩╔К"
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "л╬а╟╓н╔а╔╖╔ц╔╞ (_k) (FIXME)"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#, fuzzy
+msgid "Cancel the meeting for this item"
+msgstr "╓Ё╓н╔у╔╘╔К╔ю╓нюъдЙ╓Рйя╧╧╓╥╓ч╓╧"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "╔╞╔Й╔╒"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Forward as i_Calendar"
+msgstr "vCalender╓х╓╥╓фе╬аВ(_C) (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "а╙бР╓╣╓Л╓©╓Б╓н╓Р╔╞╔Й╔╒╓╥╓ч╓╧"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓Ре╬аВ╓╥╓ч╓╧"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "╓Ё╓нлСб╚╓Рйд╓╦╓ч╓╧"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "╔у╔╘╔К╔ю╓ь╔Ё╔т║╪(_y)... (FIXME)"
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr ""
+"мв╣А\n"
+"бг╧Г╓╩"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "╓Ё╓нлСб╚╓Р╨О╫Э"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr "бг╧Г╓╩╓н╔╧╔╠╔╦╔Е║╪╔К(_M)"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "XML╓н╔ю╔С╔в"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#, fuzzy
+msgid "Schedule a meeting for this item"
+msgstr "бг╧Г╓╩╓н╔╧╔╠╔╦╔Е║╪╔К"
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "UI XML ╓н╣╜╫р╓Р╔ю╔С╔в╓╥╓ч╓╧"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "ф╟╨Н(_A)"
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "╔у╔╘╔К╔ю╓н╨г╫И╓н╔╒╔╓╔ф╔Ю(_r) (FIXME)"
+#: ui/evolution-executive-summary.xml.h:1
+msgid "Customise My Evolution"
+msgstr "My Evolution ╓н╔╚╔╧╔©╔ч╔╓╔╨"
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "е╬аВ(_w) (FIXME)"
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "╔╜╔Ц╔С╔╩╔К"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "vCalender╓х╓╥╓фе╬аВ(_C) (FIXME)"
+#: ui/evolution-mail-global.xml.h:2
+msgid "Cancel the current mail operation"
+msgstr "╦╫╨ъ╓н╔А║╪╔КаЮ╨Н╓Р╔╜╔Ц╔С╔╩╔К╓╥╓ч╓╧"
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "╪║╓н╔╒╔╓╔ф╔Ю╓ь╟эф╟╓╥╓ч╓╧"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "╨Ню╝"
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "а╟╓н╔╒╔╓╔ф╔Ю╓ь╟эф╟╓╥╓ч╓╧"
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "╔А╔ц╔╩║╪╔╦╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "л╓╢╟н╩╔©╔╧╔╞(_c) (FIXME)"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
+msgstr "╔А║╪╔К╔╒╔╚╔╕╔С╔х╓хб╬╓нюъдЙ╓Р╨Ню╝/йт╫╦╓╥╓ч╓╧"
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "╔у╔║╔╓╔К╓н╔в╔М╔я╔ф╔ё╓Р╫╓ю╣╓╥╓ч╓╧"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr "©╥╣╛╔А║╪╔К╓Р╔у╔ё╔К╔©╓╧╓К╔К║╪╔К╓н╨Ню╝/йт╫╦╓Р╓╥╓ч╓╧"
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "╪║(_e)"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr "╡╬аш╔у╔╘╔К╔ю╓ндЙ╣а╓Р╨Ню╝/йт╫╦╓╥╓ч╓╧"
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "а╟(_v)"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr "╔╢╔ъх╒╓Р╤У╓к╓╧╓К(_T)"
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "╟У╨Ч╔в╔Л╔с╔Е║╪(_v)"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "╔я╔╧╔О║╪╔и╓нй╤╪╨(_P)"
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "╔в╔Й╔С╔©╓нюъдЙ(_e)..."
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr "╣╜╡╠╓╥╓©╔я╔╧╔О║╪╔и╓Рк╨╓Л╓©╬Л╧Г╓к╨ф╓си╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "╔в╔Й╔С╔©╓нюъдЙ"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
+msgstr "дЙ╢Э╧ьфи╢имЩ(_S)..."
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:18
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:241
-msgid "Save"
-msgstr "йщб╦"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr "╔А║╪╔К╓Р╨Ню╝╓╧╓К╓©╓А╓к╔╕╔ё╔С╔и╔╕╓РЁ╚╓╜╓ч╓╧"
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "лСб╚╓Рйщб╦╓╥╓ф╔ю╔╓╔╒╔М╔╟╔э╔ц╔╞╔╧╓Рйд╓╦╓ч╓╧"
+#: ui/evolution-mail-global.xml.h:13
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "╓╧╓ы╓ф╓н╔у╔╘╔К╔ю╓╚╓И╨О╫Э╔ч║╪╔╞╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╠й╣ве╙╓к╨О╫Э╓╥╓ч╓╧"
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:24
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "╦╫╨ъ╓н╔у╔║╔╓╔К╓Рйщб╦╓╥╓ч╓╧"
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send / Receive"
+msgstr "аВ╪У©╝"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "бг╧Г╓╩╓н╔╧╔╠╔╦╔Е║╪╔К(_M)"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "╔╜╔Е║╪╓к╓╒╓К╔А║╪╔К╓РаВ©╝╓╥╓ф©╥╣╛╔А║╪╔К╓Р╪Хфю╓╥╓ч╓╧"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr ""
+#: ui/evolution-mail-global.xml.h:16
+#, fuzzy
+msgid "Show message preview window"
+msgstr "дл╬О╓н╔А╔ц╔╩║╪╔╦╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "╦╫╨ъ╓н╔в╔Й╔С╔©╓н╔з║╪╔╦юъдЙ╓Р╧т╓╓╓ч╓╧"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "╔╣║╪╔п╬Е╓н╔у╔╘╔К╔ю╓н╧ьфи/╧ьфи╡Р╫Э╓Р╓╥╓ч╓╧"
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "╔©╔╧╔╞мв╣А(_R) (FIXME)"
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
+msgstr "╡╬аш╔у╔╘╔К╔ю╔╗╔г╔ё╔©(_E)..."
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "╬ПйС(_A)..."
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
+msgstr "╔у╔ё╔К╔©(_F)..."
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:44
-msgid "_Close"
-msgstr "йд╓╦╓К(_C)"
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr "╔А╔ц╔╩║╪╔╦╓Р╔А║╪╔К(_M)"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:45
-msgid "_Contact (FIXME)"
-msgstr "╔Ё╔С╔©╔╞╔х(_C) (FIXME)"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "╔А║╪╔КюъдЙ(_M)..."
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:45
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "╔г╔п╔ц╔╟(_D)"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "╔в╔Л╔с╔Е║╪"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:50
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:53
-msgid "_Help"
-msgstr "╔ь╔К╔в(_H)"
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
+msgstr "аВ╪У©╝(_S)"
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "╔╒╔╓╔ф╔Ю(_I) (FIXME)"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr "╓Ё╓н╔у╔╘╔К╔ю╓нюъдЙ╓Рйя╧╧╓╥╓ч╓╧"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "╩елУ╣╜фЧ(_J) (FIXME)"
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╠ё╓╧(_e)"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "╔у╔╘╔К╔ю╓н╨г╦Е╓н╔╒╔╓╔ф╔Ю(_L) (FIXME)"
+#: ui/evolution-mail-list.xml.h:5
+#, fuzzy
+msgid "Cut selected messages"
+msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╟У╨Ч╓╥╓ч╓╧"
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "╔А╔ц╔╩║╪╔╦╓Р╔А║╪╔К(_M) (FIXME)"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╠ё╓╧(_e)"
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "╔у╔╘╔К╔ю╓ь╟эф╟(_M)... (FIXME)"
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "╨О╫Э╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╠ё╓╧(_D)"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "╔н║╪╔х(_N) (FIXME)"
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
+msgstr "╢Шфи╔А╔ц╔╩║╪╔╦╓Р╠ё╓╧(_R)"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:120
-#: ui/evolution-task-editor-dialog.xml.h:83 ui/evolution.xml.h:60
-msgid "_Properties..."
-msgstr "╔в╔М╔я╔ф╔ё(_P)..."
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr "и╫╪╗╓╥╓ф╓╓╓К╔А╔ц╔╩║╪╔╦╓г╓о╓й╓╞╨О╫Э╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╠ё╓╥╓ч╓╧"
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:63
-msgid "_Task (FIXME)"
-msgstr "╔©╔╧╔╞(_T) (FIXME)"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "╢Шфи╓х╓╥╓ф╓╧╓ы╓ф╔ч║╪╔╞(_e)"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "л╓фи╔╒╔╓╔ф╔Ю(_U) (FIXME)"
+#: ui/evolution-mail-list.xml.h:11
+msgid "Mark all visible messages as read"
+msgstr "╢Шфи╓х╓╥╓ф╓╧╓ы╓ф╓н╔А╔ц╔╩║╪╔╦╓Р╔ч║╪╔╞╓╥╓ч╓╧"
 
-#: ui/evolution-event-editor.xml.h:76 ui/evolution-message-composer.xml.h:57
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:65
-msgid "_View"
-msgstr "и╫╪╗(_V)"
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "╔╞╔Й╔ц╔в╔э║╪╔и╓ье╫╓Йиу╓╠╓ч╓╧"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
-msgstr "My Evolution ╓н╔╚╔╧╔©╔ч╔╓╔╨"
+#: ui/evolution-mail-list.xml.h:14
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "╓Ё╓н╔у╔╘╔К╔ю╓╚╓И╨О╫Э╔ч║╪╔╞╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╠й╣ве╙╓к╨О╫Э╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:1
-msgid "Apply filter rules to the selected messages"
-msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓ь╔у╔ё╔К╔©╔К║╪╔К╓Ре╛мя╓╥╓ч╓╧"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "╓╧╓ы╓фа╙бР(_A)"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Cancel"
-msgstr "╔╜╔Ц╔С╔╩╔К"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "╔╧╔Л╔ц╔и╓Ра╙бР(_T)"
 
-#: ui/evolution-mail.xml.h:3
-msgid "Cancel the current mail operation"
-msgstr "╦╫╨ъ╓н╔А║╪╔КаЮ╨Н╓Р╔╜╔Ц╔С╔╩╔К╓╥╓ч╓╧"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr "╦╫╨ъа╙бР╓╣╓Л╓ф╓╓╓й╓╓╔А╔ц╔╩║╪╔╦╓ю╓╠╓Р╓╧╓ы╓фа╙бР╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:4
-msgid "Change the properties of this folder"
-msgstr "╓Ё╓н╔у╔╘╔К╔ю╓нюъдЙ╓Рйя╧╧╓╥╓ч╓╧"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓хф╠╓╦╔╧╔Л╔ц╔и╓н╔А╔ц╔╩║╪╔╦╓Р╓╧╓ы╓фа╙бР╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose"
-msgstr "╨Ню╝"
+#: ui/evolution-mail-list.xml.h:19
+msgid "Select all visible messages"
+msgstr "╓╧╓ы╓ф╓н╔А╔ц╔╩║╪╔╦╓Ра╙бР╓╥╓ч╓╧"
+
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "╓╧╓ы╓фи╫╪╗(_A)"
+
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr "╟Л╩Че╙╓к╠ё╓╥╓©╔А╔ц╔╩║╪╔╦╓Ри╫╪╗╓╥╓ч╓╧"
+
+#: ui/evolution-mail-list.xml.h:22
+msgid "Temporarily hide all messages that have already been read"
+msgstr "╓╧╓ы╓ф╓н╢Шфи╔А╔ц╔╩║╪╔╦╓Р╟Л╩Че╙╓к╠ё╓╥╓ч╓╧"
+
+#: ui/evolution-mail-list.xml.h:23
+msgid "Temporarily hide the selected messages"
+msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╟Л╩Че╙╓к╠ё╓╥╓ч╓╧"
+
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "╔А╔ц╔╩║╪╔╦╔Й╔╧╔х╓Р╔╧╔Л╔ц╔и╡╫╓╥╓ч╓╧"
+
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "кУ╬ц(_E)"
+
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "╔у╔╘╔К╔ю(_F)"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "а╙бР╓Рх©е╬(_I)"
+
+#: ui/evolution-mail-list.xml.h:28
+msgid "_Properties..."
+msgstr "╔в╔М╔я╔ф╔ё(_P)..."
+
+#: ui/evolution-mail-list.xml.h:29
+msgid "_Threaded Message List"
+msgstr "╔А╔ц╔╩║╪╔╦╔Й╔╧╔х╓Р╔╧╔Л╔ц╔и╡╫(_T)"
 
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail-message.xml.h:1
+msgid "Apply filter rules to the selected messages"
+msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓ь╔у╔ё╔К╔©╔К║╪╔К╓Ре╛мя╓╥╓ч╓╧"
+
+#: ui/evolution-mail-message.xml.h:2
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓н╪У©╝╪та╢╟В╓ь╓нйж©╝╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:7
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓наВ©╝╪т╓ь╓нйж©╝╓Р╨Ню╝╓╥╓ч╓╧"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Compose a reply to the sender of the selected message"
 msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓наВ©╝╪т╓ь╓нйж©╝╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail-message.xml.h:6
 msgid "Copy selected messages to another folder"
 msgstr "йл╓н╔у╔╘╔К╔ю╓ьа╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╔Ё╔т║╪╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail-message.xml.h:7
 msgid "Create _Virtual Folder From Message"
 msgstr "╔А╔ц╔╩║╪╔╦╓╚╓И╡╬аш╔у╔╘╔К╔ю╓Р╨Ню╝(_V)"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail-message.xml.h:8
 msgid "Create a rule to filter messages from this sender"
 msgstr "╓Ё╓наВ©╝╪т╓╚╓И╓н╔А╔ц╔╩║╪╔╦╓Р╔у╔ё╔К╔©╓╧╓К╔К║╪╔К╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail-message.xml.h:9
 msgid "Create a rule to filter messages to these recipients"
 msgstr "╓Ё╓Л╓И╓н╪У©╝╪т╓ь╓н╔А╔ц╔╩║╪╔╦╓Р╔у╔ё╔К╔©╓╧╓К╔К║╪╔К╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "╓Ё╓н╔А║╪╔Й╔С╔╟╔Й╔╧╔х╓ь╓н╔А╔ц╔╩║╪╔╦╓Р╔у╔ё╔К╔©╓╧╓К╔К║╪╔К╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:14
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages with this subject"
 msgstr "╓Ё╓н╥Ол╬╓н╔А╔ц╔╩║╪╔╦╓Р╔у╔ё╔К╔©╓╧╓К╔К║╪╔К╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a virtual folder for these recipients"
 msgstr "╓Ё╓Л╓И╓н╪У©╝╪т╓н╓©╓А╓н╡╬аш╔у╔╘╔К╔ю╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a virtual folder for this mailing list"
 msgstr "╓Ё╓н╔А║╪╔Й╔С╔╟╔Й╔╧╔х╓н╓©╓А╓н╡╬аш╔у╔╘╔К╔ю╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a virtual folder for this sender"
 msgstr "╓Ё╓наВ©╝╪т╓н╓©╓А╓н╡╬аш╔у╔╘╔К╔ю╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for this subject"
 msgstr "╓Ё╓н╥Ол╬╓н╓©╓А╓н╡╬аш╔у╔╘╔К╔ю╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Create or edit mail accounts and other preferences"
-msgstr "╔А║╪╔К╔╒╔╚╔╕╔С╔х╓хб╬╓нюъдЙ╓Р╨Ню╝/йт╫╦╓╥╓ч╓╧"
-
-#: ui/evolution-mail.xml.h:20
-msgid "Create or edit rules for filtering new mail"
-msgstr "©╥╣╛╔А║╪╔К╓Р╔у╔ё╔К╔©╓╧╓К╔К║╪╔К╓н╨Ню╝/йт╫╦╓Р╓╥╓ч╓╧"
-
-#: ui/evolution-mail.xml.h:21
-msgid "Create or edit virtual folder definitions"
-msgstr "╡╬аш╔у╔╘╔К╔ю╓ндЙ╣а╓Р╨Ню╝/йт╫╦╓╥╓ч╓╧"
-
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail-message.xml.h:17
 msgid "Display the next important message"
 msgstr "╪║╓н╫емв╓й╔А╔ц╔╩║╪╔╦╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail-message.xml.h:18
 msgid "Display the next message"
 msgstr "╪║╓н╔А╔ц╔╩║╪╔╦╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail-message.xml.h:19
 msgid "Display the next unread message"
 msgstr "╪║╓нл╓фи╔А╔ц╔╩║╪╔╦╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail-message.xml.h:20
 msgid "Display the next unread thread"
 msgstr "╪║╓нл╓фи╔╧╔Л╔ц╔и╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the previous important message"
 msgstr "а╟╓н╫емв╓й╔А╔ц╔╩║╪╔╦╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the previous message"
 msgstr "а╟╓н╔А╔ц╔╩║╪╔╦╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the previous unread message"
 msgstr "а╟╓нл╓фи╔А╔ц╔╩║╪╔╦╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:30
-msgid "Empty _Trash"
-msgstr "╔╢╔ъх╒╓Р╤У╓к╓╧╓К(_T)"
-
-#: ui/evolution-mail.xml.h:31
-msgid "Filter on Mailing _List"
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "╔А║╪╔Й╔С╔╟╔Й╔╧╔х╓н╔у╔ё╔К╔©(_L)"
 
-#: ui/evolution-mail.xml.h:32
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "аВ©╝╪т╓н╔у╔ё╔К╔©(_n)"
 
-#: ui/evolution-mail.xml.h:33
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "╪У©╝╪т╓н╔у╔ё╔К╔©(_R)"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "╥Ол╬╓н╔у╔ё╔К╔©(_S)"
 
-#: ui/evolution-mail.xml.h:35
+#: ui/evolution-mail-message.xml.h:28
 msgid "Force images in HTML mail to be loaded"
 msgstr "╤╞ю╘е╙╓к HTML ╔А║╪╔К╓н╡ХаЭ╓Рфи╓ъ╧Ч╓Ю"
 
-#: ui/evolution-mail.xml.h:36
-msgid "Forget _Passwords"
-msgstr "╔я╔╧╔О║╪╔и╓нй╤╪╨(_P)"
-
-#: ui/evolution-mail.xml.h:37
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "╣╜╡╠╓╥╓©╔я╔╧╔О║╪╔и╓Рк╨╓Л╓©╬Л╧Г╓к╨ф╓си╫╪╗╓╥╓ч╓╧"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "е╬аВ"
 
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "е╬аВ"
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail-message.xml.h:31
 msgid "Forward _Attached"
 msgstr "е╨иу╓╥╓фе╬аВ(_A)"
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail-message.xml.h:32
 msgid "Forward _Inline"
 msgstr "╔╓╔С╔И╔╓╔С╓ге╬аВ(_I)"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail-message.xml.h:33
 msgid "Forward _Quoted"
 msgstr "╟Змя╓╥╓фе╬аВ(_Q)"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail-message.xml.h:34
 msgid "Forward the selected message in the body of a new message"
 msgstr "©╥╣╛╔А╔ц╔╩║╪╔╦╓нкэй╦╓нцФ╓ка╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Ре╬аВ╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail-message.xml.h:35
 msgid "Forward the selected message quoted like a reply"
 msgstr "╟Змя╓╥╓фа╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Ре╬аВ╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail-message.xml.h:36
 msgid "Forward the selected message to someone"
 msgstr "ц╞╓╚╓ьа╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Ре╬аВ╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message to someone as an attachment"
 msgstr "е╨иу╓х╓╥╓фц╞╓╚╓ьа╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Ре╬аВ╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:47
-msgid "Hide S_elected Messages"
-msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╠ё╓╧(_e)"
-
-#: ui/evolution-mail.xml.h:48
-msgid "Hide _Deleted Messages"
-msgstr "╨О╫Э╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╠ё╓╧(_D)"
-
-#: ui/evolution-mail.xml.h:49
-msgid "Hide _Read messages"
-msgstr "╢Шфи╔А╔ц╔╩║╪╔╦╓Р╠ё╓╧(_R)"
-
-#: ui/evolution-mail.xml.h:50
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr "и╫╪╗╓╥╓ф╓╓╓К╔А╔ц╔╩║╪╔╦╓г╓о╓й╓╞╨О╫Э╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╠ё╓╥╓ч╓╧"
-
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail-message.xml.h:39
 msgid "Load _Images"
 msgstr "╡ХаЭ╓Рфи╓ъ╧Ч╓Ю(_I)"
 
-#: ui/evolution-mail.xml.h:52
-msgid "Manage _Subscriptions..."
-msgstr "дЙ╢Э╧ьфи╢имЩ(_S)..."
-
-#: ui/evolution-mail.xml.h:53
-msgid "Mar_k As Read"
-msgstr "╢Шфи╓х╓╥╓ф╔ч║╪╔╞(_k)"
-
-#: ui/evolution-mail.xml.h:54
-msgid "Mark All as R_ead"
-msgstr "╢Шфи╓х╓╥╓ф╓╧╓ы╓ф╔ч║╪╔╞(_e)"
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "╫емв"
 
-#: ui/evolution-mail.xml.h:55
-msgid "Mark As U_nread"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
 msgstr "л╓фи╓х╓╥╓ф╔ч║╪╔╞(_n)"
 
-#: ui/evolution-mail.xml.h:56
-msgid "Mark all visible messages as read"
-msgstr "╢Шфи╓х╓╥╓ф╓╧╓ы╓ф╓н╔А╔ц╔╩║╪╔╦╓Р╔ч║╪╔╞╓╥╓ч╓╧"
-
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "╢Шфи╓х╓╥╓фа╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╔ч║╪╔╞╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓к╨О╫Э╔ч║╪╔╞╓Р╓╥╓ч╓╧"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "л╓фи╓х╓╥╓фа╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╔ч║╪╔╞╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓к╨О╫Э╔ч║╪╔╞╓Р╓╥╓ч╓╧"
+
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages for deletion"
 msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓к╨О╫Э╔ч║╪╔╞╓Р╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:60
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "╟эф╟"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "йл╓н╔у╔╘╔К╔ю╓ьа╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╟эф╟╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:63
-msgid "Open a window for composing a mail message"
-msgstr "╔А║╪╔К╓Р╨Ню╝╓╧╓К╓©╓А╓к╔╕╔ё╔С╔и╔╕╓РЁ╚╓╜╓ч╓╧"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "╪║"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "╪║╓н╔А╔ц╔╩║╪╔╦╓ь╟эф╟╓╥╓ч╓╧"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "╪║╓н╔А╔ц╔╩║╪╔╦╓ь╟эф╟╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:64
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "╔╧╔Л╔ц╔и╓Ра╙бР(_T)"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "╪║╓н╔А╔ц╔╩║╪╔╦╓ь╟эф╟╓╥╓ч╓╧"
+
+#: ui/evolution-mail-message.xml.h:56
 msgid "Open the selected message in a new window"
 msgstr "©╥╣╛╔╕╔ё╔С╔и╔╕╓га╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓РЁ╚╓╜╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail-message.xml.h:57
 msgid "Open the selected message in the composer to re-send it"
 msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╔Ё╔С╔щ║╪╔╤╓гЁ╚╓╜╨фаВ╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:66
-msgid "Permanently remove all deleted messages from all folders"
-msgstr "╓╧╓ы╓ф╓н╔у╔╘╔К╔ю╓╚╓И╨О╫Э╔ч║╪╔╞╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╠й╣ве╙╓к╨О╫Э╓╥╓ч╓╧"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "╟У╨Ч╓╣╓Л╓К╔А╔ц╔╩║╪╔╦╓н╔в╔Л╔с╔Е║╪╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:67
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "╓Ё╓н╔у╔╘╔К╔ю╓╚╓И╨О╫Э╔ч║╪╔╞╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╠й╣ве╙╓к╨О╫Э╓╥╓ч╓╧"
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "а╟"
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "а╟╓н╔А╔ц╔╩║╪╔╦╓ь╟эф╟╓╥╓ч╓╧"
+
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "а╟╓н╔А╔ц╔╩║╪╔╦╓ь╟эф╟╓╥╓ч╓╧"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "а╟╓н╔А╔ц╔╩║╪╔╦╓ь╟эф╟╓╥╓ч╓╧"
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Print Message..."
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╟У╨Ч..."
 
-#: ui/evolution-mail.xml.h:72
+#: ui/evolution-mail-message.xml.h:65
 msgid "Print Preview..."
 msgstr "╟У╨Ч╔в╔Л╔с╔Е║╪..."
 
-#: ui/evolution-mail.xml.h:73
-msgid "Print message to the printer"
-msgstr "╔А╔ц╔╩║╪╔╦╓Р╔в╔Й╔С╔©╓ь╟У╨Ч╓╥╓ч╓╧"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "╔А╔ц╔╩║╪╔╦╓Р╟У╨Ч"
 
-#: ui/evolution-mail.xml.h:74
-msgid "Redirect (FIXME: implement me)"
-msgstr "╟╦л╬╓Р╫Я╓╜╢╧╓╗╓К (FIXME: ╪баУ╓╥╓ф╓╞╓ю╓╣╓╓)"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "йж©╝"
 
-#: ui/evolution-mail.xml.h:78
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "а╢╟В╓ьйж©╝"
+
+#: ui/evolution-mail-message.xml.h:71
 msgid "S_earch Message"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╦║╨В(_e)"
 
-#: ui/evolution-mail.xml.h:79
+#: ui/evolution-mail-message.xml.h:72
 msgid "Save the message as a text file"
 msgstr "╔ф╔╜╔╧╔х╔у╔║╔╓╔К╓ь╔А╔ц╔╩║╪╔╦╓Рйщб╦╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:80
+#: ui/evolution-mail-message.xml.h:73
 msgid "Search for text in the body of the displayed message"
 msgstr "и╫╪╗╓╣╓Л╓©╔А╔ц╔╩║╪╔╦кэбн╓н╢ч╓ч╓Л╓К╔ф╔╜╔╧╔х╓Р╦║╨В╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:81 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "╓╧╓ы╓фа╙бР(_A)"
-
-#: ui/evolution-mail.xml.h:82
-msgid "Select _Thread"
-msgstr "╔╧╔Л╔ц╔и╓Ра╙бР(_T)"
-
-#: ui/evolution-mail.xml.h:83
-msgid "Select all and only the messages that are not currently selected"
-msgstr "╦╫╨ъа╙бР╓╣╓Л╓ф╓╓╓й╓╓╔А╔ц╔╩║╪╔╦╓ю╓╠╓Р╓╧╓ы╓фа╙бР╓╥╓ч╓╧"
-
-#: ui/evolution-mail.xml.h:84
-msgid "Select all messages in the same thread as the selected message"
-msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓хф╠╓╦╔╧╔Л╔ц╔и╓н╔А╔ц╔╩║╪╔╦╓Р╓╧╓ы╓фа╙бР╓╥╓ч╓╧"
-
-#: ui/evolution-mail.xml.h:85
-msgid "Select all visible messages"
-msgstr "╓╧╓ы╓ф╓н╔А╔ц╔╩║╪╔╦╓Ра╙бР╓╥╓ч╓╧"
-
-#: ui/evolution-mail.xml.h:86
-msgid "Send / Receive"
-msgstr "аВ╪У©╝"
-
-#: ui/evolution-mail.xml.h:87
-msgid "Send queued mail and retrieve new mail"
-msgstr "╔╜╔Е║╪╓к╓╒╓К╔А║╪╔К╓РаВ©╝╓╥╓ф©╥╣╛╔А║╪╔К╓Р╪Хфю╓╥╓ч╓╧"
-
-#: ui/evolution-mail.xml.h:88
+#: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "╔А║╪╔К╓н╔╫║╪╔╧╓Ри╫╪╗(_S)"
 
-#: ui/evolution-mail.xml.h:89
+#: ui/evolution-mail-message.xml.h:75
 msgid "Show Full _Headers"
 msgstr "╓╧╓ы╓ф╓н╔ь╔ц╔ю╓Ри╫╪╗(_H)"
 
-#: ui/evolution-mail.xml.h:90
-msgid "Show _All"
-msgstr "╓╧╓ы╓фи╫╪╗(_A)"
-
-#: ui/evolution-mail.xml.h:91
+#: ui/evolution-mail-message.xml.h:76
 msgid "Show message in the normal style"
 msgstr "дл╬О╓н╔А╔ц╔╩║╪╔╦╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:92
+#: ui/evolution-mail-message.xml.h:77
 msgid "Show message with all email headers"
 msgstr "╓╧╓ы╓ф╓н╔А║╪╔К╔ь╔ц╔ю╓Б╢ч╓А╓ф╔А╔ц╔╩║╪╔╦╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:93
-msgid "Show messages that have been temporarily hidden"
-msgstr "╟Л╩Че╙╓к╠ё╓╥╓©╔А╔ц╔╩║╪╔╦╓Ри╫╪╗╓╥╓ч╓╧"
-
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail-message.xml.h:78
 msgid "Show the raw email source of the message"
 msgstr "╔А╔ц╔╩║╪╔╦╓н╔╫║╪╔╧╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:95
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "╔╣║╪╔п╬Е╓н╔у╔╘╔К╔ю╓н╧ьфи/╧ьфи╡Р╫Э╓Р╓╥╓ч╓╧"
-
-#: ui/evolution-mail.xml.h:96
-msgid "Temporarily hide all messages that have already been read"
-msgstr "╓╧╓ы╓ф╓н╢Шфи╔А╔ц╔╩║╪╔╦╓Р╟Л╩Че╙╓к╠ё╓╥╓ч╓╧"
-
-#: ui/evolution-mail.xml.h:97
-msgid "Temporarily hide the selected messages"
-msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╟Л╩Че╙╓к╠ё╓╥╓ч╓╧"
-
-#: ui/evolution-mail.xml.h:98
-msgid "Threaded Message list"
-msgstr "╔А╔ц╔╩║╪╔╦╔Й╔╧╔х╓Р╔╧╔Л╔ц╔и╡╫╓╥╓ч╓╧"
-
-#: ui/evolution-mail.xml.h:99
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╨О╫Э╓Р╪Х╓Й╬ц╓╥╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:100
+#: ui/evolution-mail-message.xml.h:80
 msgid "VFolder on Mailing _List..."
 msgstr "╔А║╪╔Й╔С╔╟╔Й╔╧╔х╓н╡╬аш╔у╔╘╔К╔ю(_L)..."
 
-#: ui/evolution-mail.xml.h:101
+#: ui/evolution-mail-message.xml.h:81
 msgid "VFolder on Se_nder..."
 msgstr "аВ©╝╪т╓н╡╬аш╔у╔╘╔К╔ю(_n)..."
 
-#: ui/evolution-mail.xml.h:102
+#: ui/evolution-mail-message.xml.h:82
 msgid "VFolder on _Recipients..."
 msgstr "╪У©╝╪т╓н╡╬аш╔у╔╘╔К╔ю(_R)..."
 
-#: ui/evolution-mail.xml.h:103
+#: ui/evolution-mail-message.xml.h:83
 msgid "VFolder on _Subject..."
 msgstr "╥Ол╬╓н╡╬аш╔у╔╘╔К╔ю(_S)..."
 
-#: ui/evolution-mail.xml.h:104
-msgid "Virtual Folder _Editor..."
-msgstr "╡╬аш╔у╔╘╔К╔ю╔╗╔г╔ё╔©(_E)..."
-
-#: ui/evolution-mail.xml.h:105
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "╔у╔ё╔К╔©е╛мя(_A)"
 
-#: ui/evolution-mail.xml.h:106
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Copy to Folder"
 msgstr "╔у╔╘╔К╔ю╓ь╔Ё╔т║╪(_C)"
 
-#: ui/evolution-mail.xml.h:107
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "╔А╔ц╔╩║╪╔╦╓╚╓И╔у╔ё╔К╔©╓Р╨Ню╝(_C)"
 
-#: ui/evolution-mail.xml.h:109
-msgid "_Expunge"
-msgstr "кУ╬ц(_E)"
-
-#: ui/evolution-mail.xml.h:110
-msgid "_Filters..."
-msgstr "╔у╔ё╔К╔©(_F)..."
-
-#: ui/evolution-mail.xml.h:111 ui/evolution.xml.h:50
-msgid "_Folder"
-msgstr "╔у╔╘╔К╔ю(_F)"
-
-#: ui/evolution-mail.xml.h:112
+#: ui/evolution-mail-message.xml.h:88
 msgid "_Forward Message"
 msgstr "╔А╔ц╔╩║╪╔╦╓Ре╬аВ(_F)"
 
-#: ui/evolution-mail.xml.h:113 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "а╙бР╓Рх©е╬(_I)"
-
-#: ui/evolution-mail.xml.h:114
-msgid "_Mail Message"
-msgstr "╔А╔ц╔╩║╪╔╦╓Р╔А║╪╔К(_M)"
-
-#: ui/evolution-mail.xml.h:115
-msgid "_Mail Settings..."
-msgstr "╔А║╪╔КюъдЙ(_M)..."
-
-#: ui/evolution-mail.xml.h:116
+#: ui/evolution-mail-message.xml.h:89
 msgid "_Message Display"
 msgstr "╔А╔ц╔╩║╪╔╦и╫╪╗(_M)"
 
-#: ui/evolution-mail.xml.h:117
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Move to Folder"
 msgstr "╔у╔╘╔К╔ю╓ь╟эф╟(_M)"
 
-#: ui/evolution-mail.xml.h:118
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Normal Display"
 msgstr "дл╬Ои╫╪╗(_N)"
 
-#: ui/evolution-mail.xml.h:119
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Open Message"
 msgstr "╔А╔ц╔╩║╪╔╦╓РЁ╚╓╞(_O)"
 
-#: ui/evolution-mail.xml.h:121
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Re-send Message"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╨фаВ©╝(_R)"
 
-#: ui/evolution-mail.xml.h:124
-msgid "_Send / Receive"
-msgstr "аВ╪У©╝(_S)"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "╓Ё╓н╔╕╔ё╔С╔и╔╕╓Рйд╓╦╓ч╓╧"
 
-#: ui/evolution-mail.xml.h:125
-msgid "_Threaded Message List"
-msgstr "╔А╔ц╔╩║╪╔╦╔Й╔╧╔х╓Р╔╧╔Л╔ц╔и╡╫(_T)"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr "╔д║╪╔К╔п║╪╓н╔╚╔╧╔©╔ч╔╓╔╨(_z)..."
+
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "╔╚╔╧╔©╔ч╔╓╔╨"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "╔д║╪╔К╔п║╪╓Р╔╚╔╧╔©╔ч╔╓╔╨╓╥╓ч╓╧"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "йд╓╦╓К(_C)"
+
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "и╫╪╗(_V)"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "е╨иу"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "╦╫╨ъ╓н╔у╔║╔╓╔К╓Рйд╓╦╓ч╓╧"
 
@@ -8885,45 +11119,60 @@ msgid "HTML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "╔ф╔╜╔╧╔х╔у╔║╔╓╔К╓начфЧ..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "╔А╔ц╔╩║╪╔╦╓ь╔ф╔╜╔╧╔х╓х╓╥╓ф╔у╔║╔╓╔К╓РачфЧ╓╥╓ч╓╧"
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "╔ф╔╜╔╧╔х╔у╔║╔╓╔К╓начфЧ..."
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "╔у╔║╔╓╔К╓РЁ╚╓╞"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "PGP ╓к╓Х╓К╟е╧Ф╡╫"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "PGP ╔╣╔╓╔С"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
 msgstr "S/MIME ╓к╓Х╓К╟е╧Ф╡╫"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr "S/MIME ╫Пл╬"
 
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save _Draft"
-msgstr "аП╟ф╓Рйщб╦(_D)"
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "йщб╦"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "йлл╬╓гйщб╦"
 
 #: ui/evolution-message-composer.xml.h:22
-msgid "Save in _folder... (FIXME)"
-msgstr "╔у╔╘╔К╔ю╓ьйщб╦... (FIXME)"
+msgid "Save _Draft"
+msgstr "аП╟ф╓Рйщб╦(_D)"
 
 #: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "╔у╔╘╔К╔ю╓ьйщб╦..."
 
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "╦╫╨ъ╓н╔у╔║╔╓╔К╓Рйщб╦╓╥╓ч╓╧"
+
 #: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "╦╫╨ъ╓н╔у╔║╔╓╔К╓Рйлл╬╓гйщб╦╓╥╓ч╓╧"
@@ -8993,162 +11242,136 @@ msgid "Toggles whether the Reply-To field is displayed"
 msgstr "йж©╝юХ╔у╔ё║╪╔К╔и╓Ри╫╪╗╓╧╓К╓╚╓и╓╕╓╚юзбь╓╗╓ч╓╧"
 
 #: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "е╨иу╓нди╡ц..."
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "Bcc ╔у╔ё║╪╔К╔и(_B)"
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "Cc ╔у╔ё║╪╔К╔и(_C)"
 
 #: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "╔г╔п╔ц╔╟(_D)"
+
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
 msgstr "╓╧╓ы╓ф╨О╫Э(_D)"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "╨╧╫п©м╔у╔ё║╪╔К╔и(_F)"
 
 #: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "ачфЧ(_I)"
 
 #: ui/evolution-message-composer.xml.h:52
-msgid "_Insert text file... (FIXME)"
-msgstr "╔ф╔╜╔╧╔х╔у╔║╔╓╔К╓начфЧ(_I)... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:53
 msgid "_Open..."
 msgstr "Ё╚╓╞(_O)..."
 
-#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "йж©╝юХ╔у╔ё║╪╔К╔и(_R)"
 
-#: ui/evolution-message-composer.xml.h:56
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "╔╩╔╜╔Е╔Й╔ф╔ё(_S)"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "╔ь╔К╔в(_H)"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "╧ьфи╔у╔╘╔К╔ю╓н╔Й╔╧╔х╓ь╔у╔╘╔К╔ю╓Рди╡ц"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "╔у╔╘╔К╔ю(_o)"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "╔Й╔╧╔х╓Р╧╧©╥"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "╔у╔╘╔К╔ю╔Й╔╧╔х╓Р╧╧©╥"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "╧ьфи╔у╔╘╔К╔ю╓н╔Й╔╧╔х╓╚╓И╔у╔╘╔К╔ю╓Р╨О╫Э"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "╧ьфи"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "╧ьфи╡Р╫Э"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "╔©╔╧╔╞╓нЁДеЖ╓ф(_n) (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "╦║╨В"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "╨ф╦║╨В"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "бг╧Г╓╩мв╣А(_q) (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "╓Д╓Йд╬╓╥"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "л╓╢╟н╩╓нф╟╨Н╓Р╓Д╓Йд╬╓╥╓ч╓╧"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "цж╢╧"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "й╦╩З╓Рцж╢╧╓╥╓ч╓╧"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "а╢╟В╓ьйж©╝(_l) (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "аВ©╝╔╧╔ф║╪╔©╔╧╔Л╔щ║╪╔х(_e) (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "╫пмХ╩Ж╓Р╔╧╔╜╔ц╔в(_k) (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "╔©╔╧╔╞╓Рйщб╦╓╥╓ф╔ю╔╓╔╒╔М╔╟╔э╔ц╔╞╔╧╓Рйд╓╦╓ч╓╧"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "ф╠╓╦й╦╩ЗнС╓г╨ф╦║╨В╓Р╧т╓╓╓ч╓╧"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "й╦╩ЗнС╓г╦║╨В╓╥╓ч╓╧"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "╦╣╓клА╓╧"
+#: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Task"
+msgstr "╔╜╔Ц╔С╔╩╔К"
 
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "╨г╦Е╓нф╟╨Н╓Р╦╣╓клА╓╥╓ч╓╧"
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "╓Ё╓н╔©╔╧╔╞╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:43
-msgid "_Appointment (FIXME)"
-msgstr "лСб╚(_A) (FIXME)"
+#: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Re_fresh Task"
+msgstr "╔Й╔╧╔х╓Р╧╧©╥"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "╢╟н╩╓Р╔ч║╪╔╞ (_M) (FIXME)"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "йж©╝(_R) (FIXME)"
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "Copy selected task"
+msgstr "а╙бР╓╥╓©╔©╔╧╔╞╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "©╥╣╛╔©╔╧╔╞╓Р╨Ню╝╓╥╓ч╓╧"
 
 #: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "а╙бР╓╥╓©╔©╔╧╔╞╓Р╨О╫Э╓╥╓ч╓╧"
+
+#: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
+msgstr "а╙бР╓╥╓©╔©╔╧╔╞╓Р╨О╫Э╓╥╓ч╓╧"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "©╥╣╛╔©╔╧╔╞"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "╔╞╔Й╔ц╔в╔э║╪╔и╓ье╫╓Йиу╓╠╓ч╓╧"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "йл╓н╓Б╓н╓х╓╥╓ф╔©╔╧╔╞╓Рйщб╦╓╥╓ч╓╧"
 
-#: ui/evolution-tasks.xml.h:8
-msgid "Tasks Preferences..."
-msgstr "╔©╔╧╔╞╓нюъдЙ..."
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "╔А║╪╔КюъдЙ(_M)..."
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "╔©╔╧╔╞(_T)"
 
@@ -9164,202 +11387,193 @@ msgstr "╔╥╔Г║╪╔х╔╚╔ц╔х╔п║╪╓кди╡ц(_S)"
 msgid "Change the name of this folder"
 msgstr "╓Ё╓н╔у╔╘╔К╔ю╓нл╬а╟╓Рйя╧╧╓╥╓ч╓╧"
 
-#: ui/evolution.xml.h:4
-msgid "Change the properties for this folder"
-msgstr "╓Ё╓н╔у╔╘╔К╔ю╓нюъдЙ╓Рйя╧╧╓╥╓ч╓╧"
-
 #: ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "╓Ё╓н╔╕╔ё╔С╔и╔╕╓Рйд╓╦╓ч╓╧"
-
-#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "╔у╔╘╔К╔ю╓Р╔Ё╔т║╪╓╥╓ч╓╧"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:7
 msgid "Create _New Folder..."
 msgstr "©╥╣╛╔у╔╘╔К╔ю╓Р╨Ню╝(_N)..."
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:8
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "╔╥╔Г║╪╔х╔╚╔ц╔х╔п║╪╓к╓Ё╓н╔у╔╘╔К╔ю╓н╔Й╔С╔╞╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:9
 msgid "Create a new folder"
 msgstr "©╥╣╛╔у╔╘╔К╔ю╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: ui/evolution.xml.h:11
-msgid "Customi_ze Toolbars..."
-msgstr "╔д║╪╔К╔п║╪╓н╔╚╔╧╔©╔ч╔╓╔╨(_z)..."
-
-#: ui/evolution.xml.h:12
-msgid "Customize"
-msgstr "╔╚╔╧╔©╔ч╔╓╔╨"
-
 #: ui/evolution.xml.h:13
-msgid "Customize toolbars"
-msgstr "╔д║╪╔К╔п║╪╓Р╔╚╔╧╔©╔ч╔╓╔╨╓╥╓ч╓╧"
-
-#: ui/evolution.xml.h:14
 msgid "Delete this folder"
 msgstr "╓Ё╓н╔у╔╘╔К╔ю╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "йл╓н╔у╔╘╔К╔ю╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "╫╙н╩(_x)"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:16
 msgid "Evolution _FAQ"
 msgstr "Evolution FAQ(_F)"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "Evolution ╔╕╔ё╔С╔и╔╕(_W)"
 
-#: ui/evolution.xml.h:19
-msgid "Evolution bar _shortcut"
-msgstr "Evolution ╔п║╪╔╥╔Г║╪╔х╔╚╔ц╔х(_s)"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "╔в╔М╔╟╔И╔Ю╓Р╫╙н╩╓╥╓ч╓╧"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "╩о╓А╓к(_S)"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Ё╟иТ╔у╔║╔╓╔К╥а╪╟╓Р╔╓╔С╔щ║╪╔х╓╥╓ч╓╧"
 
-#: ui/evolution.xml.h:23
-msgid "Main toolbar"
-msgstr "╔А╔╓╔С╔д║╪╔К╔п║╪"
-
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:22
 msgid "Move this folder to another place"
 msgstr "йл╓н╬Л╫Й╓ь╓Ё╓н╔у╔╘╔К╔ю╓Р╟эф╟╓╥╓ч╓╧"
 
-#: ui/evolution.xml.h:25
-msgid "Open in New Window"
-msgstr "©╥╣╛╔╕╔ё╔С╔и╔╕╓гЁ╚╓╞"
-
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "©╥╣╛╔╕╔ё╔С╔и╔╕╓гЁ╚╓╞(_W)"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "йл╓н╔╕╔ё╔С╔и╔╕╓г╓Ё╓н╔у╔╘╔К╔ю╓РЁ╚╓╜╓ч╓╧"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Evolution ╓к╓д╓╓╓ф╓н╬ПйС╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "ит╤Я╧ГйС╧П╓ндС╫п"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "ит╤Я╧ГйС╧П╓ндС╫п(_B)"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "Bug Buddy╓Р╩х╓ц╓фит╤Я╧ГйС╧П╓РдС╫п╓╥╓ч╓╧"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 msgid "Toggle"
 msgstr "юзбь╓╗"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "╔у╔╘╔К╔ю╔п║╪╓Ри╫╪╗╓╧╓К╓╚╓и╓╕╓╚юзбь╓╗╓ч╓╧"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "╔╥╔Г║╪╔х╔╚╔ц╔х╔п║╪╓Ри╫╪╗╓╧╓К╓╚╓и╓╕╓╚юзбь╓╗╓ч╓╧"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "╔╙╔у╔И╔╓╔С╨Н╤х╓╚╓и╓╕╓╚╓Рюзбь╓╗╓ч╓╧"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "╔Ё╔С╔©╔╞╔х╔ч╔м║╪╔╦╔Ц╓Р╩х╓╕(_o)"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "╔╚╔Л╔С╔ю╓Р╩х╓╕(_C)"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "╔А║╪╔И╓Р╩х╓╕(_M)"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "View the selected folder"
 msgstr "а╙бР╓╣╓Л╓©╔у╔╘╔К╔ю╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: ui/evolution.xml.h:40
-msgid "Work Offline"
-msgstr "╔╙╔у╔И╔╓╔С╨Н╤х"
-
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "Evolution ╓к╓д╓╓╓ф(_A)..."
 
-#: ui/evolution.xml.h:42
-msgid "_Actions"
-msgstr "ф╟╨Н(_A)"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "лСб╚(_A) (FIXME)"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "╔Ё╔С╔©╔╞╔х(_C) (FIXME)"
+
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "╔Ё╔т║╪(_C)..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "╔у╔╘╔К╔ю╔п║╪(_F)"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "╔у╔╘╔К╔ю╓ь╟эф╟(_G)..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "╔у╔║╔╓╔К╓Р╔╓╔С╔щ║╪╔х(_I)..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "╔╓╔С╔г╔ц╔╞╔╧(_I)"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╔А║╪╔К(_M)"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_Move..."
 msgstr "╟эф╟(_M)..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "©╥╣╛(_N)"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "©╥╣╛╔у╔╘╔К╔ю(_N)"
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "╔Й╔м║╪╔Ю(_R)..."
 
-#: ui/evolution.xml.h:62
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "╔╥╔Г║╪╔х╔╚╔ц╔х╔п║╪(_S)"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "╔╥╔Г║╪╔х╔╚╔ц╔х╔п║╪(_S)"
 
-#: ui/evolution.xml.h:66
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "╔©╔╧╔╞(_T) (FIXME)"
+
+#: ui/evolution.xml.h:64
 msgid "_Work Offline"
 msgstr "╔╙╔у╔И╔╓╔С╨Н╤х(_W)"
 
+#: ui/my-evolution.xml.h:1
+#, fuzzy
+msgid "Change the settings for My Evolution"
+msgstr "╓Ё╓н╔у╔╘╔К╔ю╓нюъдЙ╓Рйя╧╧╓╥╓ч╓╧"
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "╔А║╪╔КюъдЙ(_M)..."
+
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "╔╒╔и╔Л╔╧╔╚║╪╔и"
@@ -9392,9 +11606,12 @@ msgstr "╔А╔ц╔╩║╪╔╦"
 msgid "With Category"
 msgstr "╔╚╔ф╔╢╔Й"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "╩цдЙ"
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%Yг╞ %m╥Н %dфЭ %A"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
@@ -9468,13 +11685,6 @@ msgstr "╡Я╣д╫╙н╩╩Ч╢ж(_e):"
 msgid "All Attendees"
 msgstr "╓╧╓ы╓ф╓ниу╓╜е╨╓╓"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%Yг╞ %m╥Н %dфЭ %A"
-
 #: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "╦╫╨ъ╓ни╫╪╗(_C)"
@@ -9485,53 +11695,129 @@ msgstr "и╫╪╗╓РдЙ╣а"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:422
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
-msgid "%B %Y"
-msgstr "%Y %B"
-
-#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "╨ё"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "╨ёфЭ"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "╩Ч╢ж╓о╔у╔╘║╪╔ч╔ц╔х╓кфЧ╓Л╓й╓╠╓Л╓п╓й╓Й╓ч╓╩╓С: %s"
 
+#: widgets/misc/e-charset-picker.c:59
+#, fuzzy
+msgid "Baltic"
+msgstr "╢Пкэ"
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "╫╣"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "╓╢╓ъх╒"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "╫ХмЩ╓о╪╨гт╓╥╓ч╓╥╓©"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "╔к╔Е║╪╔╧"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "л╓цн╓н╔╗╔И║╪: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+#, fuzzy
+msgid "Enter the character set to use"
+msgstr "╔г╔у╔╘╔К╔х╓н╔╜╔Ц╔И╔╞╔©╔╩╔ц╔х: "
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "╓╫╓нб╬"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "╔Ё╔С╔©╔╞╔х╔╗╔г╔ё╔©"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "╦║╨В╓Рйщб╦"
 
-#: widgets/misc/e-filter-bar.c:239
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "╬Е╣И╦║╨В"
 
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "йлл╬╓гйщб╦..."
-
-#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "╓╧╓ы╓фи╫╪╗"
 
-#: widgets/misc/e-filter-bar.h:96 widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "йт╫╦..."
-
-#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "╬э╨ы..."
 
@@ -9543,6 +11829,10 @@ msgstr "╬ПйС"
 msgid "Warning"
 msgstr "╥ы╧П"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "╔╗╔И║╪"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "╪алД"
@@ -9579,3 +11869,541 @@ msgstr "init_corba(): GNOME ╓Р╫И╢Э╡╫╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 #: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo ╓Р╫И╢Э╡╫╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
+
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "╔©╔╧╔╞╓нюъдЙ..."
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "╔©╔╧╔╞╓нюъдЙ..."
+
+#~ msgid "???"
+#~ msgstr "???"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "╔Ё╔С╔©╔╞╔х(_o)..."
+
+#~ msgid "_Company:"
+#~ msgstr "╡Я╪р(_C):"
+
+#~ msgid "Find..."
+#~ msgstr "╦║╨В..."
+
+#~ msgid "Open calendar"
+#~ msgstr "╔╚╔Л╔С╔ю╓РЁ╚╓╞"
+
+#~ msgid "Save calendar"
+#~ msgstr "╔╚╔Л╔С╔ю╓Рйщб╦"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>╔╚╔Л╔С╔ю╓Р╔М║╪╔ицФ╓к╔╗╔И║╪:<br>╔А╔╫╔ц╔и╓о╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С"
+
+#~ msgid "Settings..."
+#~ msgstr "юъдЙ..."
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "╩ьдЙ╩Ч╢ж╦Е╓к╔╒╔И║╪╔Ю╓╛╔©╔╓╔Ю╔╒╔╕╔х"
+
+#~ msgid "Colors"
+#~ msgstr "╔╚╔И║╪"
+
+#~ msgid "Enable snoozing for"
+#~ msgstr "╔╒╔И║╪╔ЮдД╩ъ╓Рм╜╦З"
+
+#~ msgid "Highlight"
+#~ msgstr "╤╞д╢"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "╨ёфЭ╓╛╢Э╦б╓н╔╒╔╓╔ф╔Ю:"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "╓ч╓ю╢Э╦б╓г╓о╓й╓╓╔╒╔╓╔ф╔Ю"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "╓ч╓ю╢Э╦б╓г╓о╓й╓╓╔╒╔╓╔ф╔Ю:"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "╢Э╦б╓Р╡А╓╝╓©╔╒╔╓╔ф╔Ю:"
+
+#~ msgid "TaskPad"
+#~ msgstr "╔©╔╧╔╞╔я╔ц╔и"
+
+#~ msgid "Time Until Due"
+#~ msgstr "╢Э╦б╓ч╓г╓н╩Ч╢ж"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "╩КЁп╔╒╔И║╪╔Ю"
+
+#~ msgid "Work week"
+#~ msgstr "╫╣╢жо╚ф╞╩Ч╢ж"
+
+#~ msgid "Percent complete"
+#~ msgstr "╔я║╪╔╩╔С╔х╢╟н╩"
+
+#~ msgid "Edit this task"
+#~ msgstr "╓Ё╓н╔©╔╧╔╞╓Рйт╫╦╓╥╓ч╓╧"
+
+#~ msgid "Go to Today"
+#~ msgstr "╨ёфЭ╓ь╟эф╟"
+
+#~ msgid "Delete all Occurrences"
+#~ msgstr "╓╧╓ы╓ф╓н╫пмХ╩Ж╓Р╨О╫Э"
+
+#~ msgid "Component successfully updated."
+#~ msgstr "╔Ё╔С╔щ║╪╔м╔С╔х╓ою╣╓╥╓╞╧╧©╥╓╣╓Л╓ч╓╥╓©"
+
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "╔╚╔Л╔С╔ю╔у╔║╔╓╔К╓Р╔М║╪╔и╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©!\n"
+
+#~ msgid "I couldn't read your calendar file!\n"
+#~ msgstr "╔╚╔Л╔С╔ю╔у╔║╔╓╔К╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©!\n"
+
+#~ msgid "This is a reply from someone who was uninvited!"
+#~ msgstr "╓Ё╓Л╓о╬╥╓╚╓╤╓Кц╞╓╚╓╚╓И╓нйж╩Ж╓г╓╧!"
+
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "йщб╦╓╥╓©╔╚╔Л╔С╔ю╓Р╧╧©╥╫пмХ╓ч╓╩╓С╓г╓╥╓©"
+
+#~ msgid "I couldn't delete the calendar component!\n"
+#~ msgstr "╔╚╔Л╔С╔ю╔Ё╔С╔щ║╪╔м╔С╔х╓Р╨О╫Э╫пмХ╓ч╓╩╓С╓г╓╥╓©!\n"
+
+#~ msgid "Component successfully deleted."
+#~ msgstr "╔Ё╔С╔щ║╪╔м╔С╔х╓ою╣╓╥╓╞╨О╫Э╓╣╓Л╓ч╓╥╓©"
+
+#~ msgid "I don't recognize this type of calendar component."
+#~ msgstr "╓Ё╓н╔╚╔Л╔С╔ю╔Ё╔С╔щ║╪╔м╔С╔х╓н╪Ойл╓ог╖╪╠╓╥╓ч╓╩╓С"
+
+#~ msgid "Add to Calendar"
+#~ msgstr "╔╚╔Л╔С╔ю╓нди╡ц"
+
+#~ msgid " Tentative "
+#~ msgstr " ╩цдЙ "
+
+#~ msgid "Update Calendar"
+#~ msgstr "╔╚╔Л╔С╔ю╓Р╧╧©╥"
+
+#~ msgid "Attendee address"
+#~ msgstr "╫пюй╪т╓н╫╩╫Й"
+
+#~ msgid "Attendees: "
+#~ msgstr "╫пюй╪т: "
+
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr ""
+#~ "╔╜╔Ц╔С╔╩╔К\n"
+#~ "бг╧Г╓╩"
+
+#~ msgid "Organizer: "
+#~ msgstr "╪Г╨е╪т:"
+
+#~ msgid ""
+#~ "Publish\n"
+#~ "Event"
+#~ msgstr ""
+#~ "х╞и╫\n"
+#~ "╔╓╔ы╔С╔х"
+
+#~ msgid "Summary contains"
+#~ msgstr "╔╣╔ч╔Й╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
+
+#~ msgid "Comment contains"
+#~ msgstr "╔Ё╔А╔С╔х╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
+
+#~ msgid "Has category"
+#~ msgstr "╪║╓н╔╚╔ф╔╢╔Й╓Р╩Щ╓д"
+
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "%s ╓н╔М╔ц╔╞╔у╔║╔╓╔К╓Р╔ф╔╧╔х╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "IMAP ╔у╔╘╔К╔ю╓РаЖ╨╨цФ"
+
+#~ msgid "Inline attachment"
+#~ msgstr "╔╓╔С╔И╔╓╔С╓ге╨иу"
+
+#~ msgid "Send as:"
+#~ msgstr "аВ©╝юХ:"
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "╫Пл╬╔у╔║╔╓╔К %s ╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©:\n"
+#~ "%s"
+
+#~ msgid "That file does not exist."
+#~ msgstr "╓╫╓н╔у╔║╔╓╔К╓об╦╨ъ╓╥╓ч╓╩╓С"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "╓╫╓Л╓одл╬О╓н╔у╔║╔╓╔К╓г╓о╓╒╓Й╓ч╓╩╓С"
+
+#~ msgid "That file exists but is not readable."
+#~ msgstr "╓╫╓н╔у╔║╔╓╔К╓об╦╨ъ╓╥╓ч╓╧╓╛║╓фи╓ъ╪Х╓Й╡дг╫╓г╓о╓╒╓Й╓ч╓╩╓С"
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "╓╫╓н╔у╔║╔╓╔К╓о╔╒╔╞╔╩╔╧╡дг╫╓н╓Х╓╕╓к╦╚╓╗╓ч╓╧╓╛║╓open(2) ╓о╪╨гт╓╥╓ч╓╥╓©"
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "╔у╔║╔╓╔К╓о╓х╓ф╓БбГ╓╜╓╓ (100K ╟й╬Е) ╓г╓╧\n"
+#~ "кэеЖ╓к╓╫╓Л╓РачфЧ╓╧╓К╓Ё╓х╓Рк╬╓ъ╓ч╓╧╓╚?"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "HTML ╔у╔║╔╓╔К╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error reading data:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "╔г║╪╔©╠с╓ъ╧Ч╓ъцФ╓к╔╗╔И║╪:\n"
+#~ "%s"
+
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "╔у╔║╔╓╔К╓о╔╣║╪╔с╔╧╓н╬Л╫Й╓Р╩Щ╓ц╓ф╓╓╓ч╓╩╓С\n"
+
+#~ msgid "Select a service"
+#~ msgstr "╔╣║╪╔с╔╧╓Ра╙бР"
+
+#~ msgid ""
+#~ "You can select a different HTML page for the background of the Executive "
+#~ "Summary.\n"
+#~ "\n"
+#~ "Just leave it blank for the default"
+#~ msgstr ""
+#~ "╪б╧т╔╣╔ч╔Й║╪╓нгь╥йкХ╓кйл║╧╓нHTML╔з║╪╔╦╓Ра╙бР╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╧\n"
+#~ "\n"
+#~ "╔г╔у╔╘╔К╔х╓о╤УгР╓г╓╧"
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "╔г╔у╔╘╔К╔х╓нGNOME╔╒╔в╔Й╔╠║╪╔╥╔Г╔С╓г %s ╓РЁ╚╓╞"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "╔г╔у╔╘╔К╔х╓нGNOME╔╕╔╖╔ж╔ж╔И╔╕╔╤╓г %s ╓РЁ╚╓╞"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "%s ╓╚╓И╔А║╪╔К╓РаВ©╝"
+
+#~ msgid "Run %s"
+#~ msgstr "%s ╓Р╪б╧т"
+
+#~ msgid "Close %s"
+#~ msgstr "%s ╓Рйд╓╦╓К"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "╨╦╓ь %s ╓Р╟эф╟"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "╠╕╓ь %s ╓Р╟эф╟"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "а╟╓ннС╓нцФ╓ь %s ╓Р╟эф╟"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "╪║╓ннС╓нцФ╓ь %s ╓Р╟эф╟"
+
+#~ msgid "Configure %s"
+#~ msgstr "%s ╓нюъдЙ"
+
+#~ msgid "page"
+#~ msgstr "╔з║╪╔╦"
+
+#~ msgid "Appearance"
+#~ msgstr "Ё╟╢я"
+
+#~ msgid "Background:"
+#~ msgstr "гь╥й:"
+
+#~ msgid ""
+#~ "Executive summary component could not initialize Bonobo.\n"
+#~ "If there was a warning message about the RootPOA, it probably means\n"
+#~ "you compiled Bonobo against GOAD instead of OAF."
+#~ msgstr ""
+#~ "╪б╧т╔╣╔ч╔Й║╪╔Ё╔С╔щ║╪╔м╔С╔х╓о Bonobo ╓Р╫И╢Э╡╫╫пмХ╓ч╓╩╓С╓г╓╥╓©\n"
+#~ "╓Б╓╥ RootPOA ╓к╓д╓╓╓ф╓н╥ы╧П╔А╔ц╔╩║╪╔╦╓╛╓╒╓К╓й╓И║╓╓©╓ж╓С OAF ╓нбЕ╓О╓Й╓к\n"
+#~ "GOAD ╓Р╩х╓ц╓ф╔Ё╔С╔я╔╓╔К╓╥╓©╓Ё╓х╓Р╟улё╓╥╓ч╓╧"
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "RDF ╔╣╔ч╔Й╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
+
+#~ msgid "RDF Summary"
+#~ msgstr "RDF ╔╣╔ч╔Й"
+
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "╔ф╔╧╔х Bonobo ╔Ё╔С╔щ║╪╔м╔С╔х╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
+
+#~ msgid "Factory for the test component."
+#~ msgstr "╔ф╔╧╔х╔Ё╔С╔щ║╪╔м╔С╔х╓н╓©╓А╓н╔у╔║╔╞╔х╔Й"
+
+#~ msgid "Test bonobo service"
+#~ msgstr "╔ф╔╧╔х Bonobo ╔╣║╪╔с╔╧"
+
+#~ msgid "Test service"
+#~ msgstr "╔ф╔╧╔х╔╣║╪╔с╔╧"
+
+#~ msgid "Update automatically"
+#~ msgstr "╪╚ф╟е╙╓к╧╧©╥"
+
+#~ msgid "Forward to Address"
+#~ msgstr "╔╒╔и╔Л╔╧╓ье╬аВ"
+
+#~ msgid "Elm Aliases"
+#~ msgstr "Elm ╔╗╔╓╔Й╔╒╔╧"
+
+#~ msgid "Addressbooks"
+#~ msgstr "╔╒╔и╔Л╔╧д╒"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "╔у╔╘╔К╔ю \"%s\" ╓Р \"%s\" ╥а╪╟╓ьйя╧╧╓╥╓ч╓╧"
+
+#~ msgid "Reconfiguring folder"
+#~ msgstr "╔у╔╘╔К╔ю╓н╨ф╧╫ю╝цФ"
+
+#~ msgid "Closing current folder"
+#~ msgstr "╦╫╨ъ╓н╔у╔╘╔К╔ю╓Р╔╞╔М║╪╔╨цФ"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "╦е╓╓╔у╔╘╔К╔ю╓Р╔Й╔м║╪╔Ю╓╥╓ф╔╙║╪╔в╔СцФ"
+
+#~ msgid "Creating new folder"
+#~ msgstr "©╥╣╛╔у╔╘╔К╔ю╓Р╨Ню╝цФ"
+
+#~ msgid "Copying messages"
+#~ msgstr "╔А╔ц╔╩║╪╔╦╓Р╔Ё╔т║╪цФ"
+
+#~ msgid "Evolution progress"
+#~ msgstr "Evolution ©й╧т"
+
+#~ msgid "Moving folder %s to %s"
+#~ msgstr "%s ╓╚╓И %s ╓ь╔у╔╘╔К╔ю╓Р╟эф╟цФ"
+
+#~ msgid "Copying folder %s to %s"
+#~ msgstr "%s ╓╚╓И %s ╓ь╔у╔╘╔К╔ю╓Р╔Ё╔т║╪цФ"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "╔А╔ц╔╩║╪╔╦хж╧Ф %d / %d (uid \"%s\") ╓Р╪ХфюцФ"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "╔А╔ц╔╩║╪╔╦ %d / %d (uid \"%s\") ╓Рйщб╦цФ"
+
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "╔я╔╓╔в╬Е╓кит╢╟а╢╓й╔А╔ц╔╩║╪╔╦╓╛╫Я╓╚╓Л╓ч╓╥╓©!"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (╔А╔ц╔╩║╪╔╦╓Ре╬аВ)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Fwd: (╥Ол╬╓й╓╥)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "╔А╔ц╔╩║╪╔╦╓Ре╬аВ╓╥╓ч╓╥╓© (╥Ол╬╓й╓╥)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+
+#~ msgid "Reply to the sender of this message"
+#~ msgstr "╔А╔ц╔╩║╪╔╦╓наВ©╝╪т╓ьйж©╝╓╥╓ч╓╧"
+
+#~ msgid "Reply to all recipients of this message"
+#~ msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓н╪У©╝╪та╢╟В╓ьйж©╝╓╥╓ч╓╧"
+
+#~ msgid "Delete this message"
+#~ msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓Р╨О╫Э╓╥╓ч╓╧"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Evolution ╓н╔у╔║╔╓╔К╓ою╣╓╥╓╞╔╓╔С╔╧╔х║╪╔К╓╣╓Л╓ч╓╥╓©"
+
+#~ msgid "Activate"
+#~ msgstr "╔╒╔╞╔ф╔ё╔ж"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "╓Ё╓н╔╥╔Г║╪╔х╔╚╔ц╔х╓Р╔╒╔╞╔ф╔ё╔ж╓к╓╥╓ч╓╧"
+
+#~ msgid "Select everything"
+#~ msgstr "╓╧╓ы╓ф╓н╓Б╓н╓Ра╙бР╓╥╓ч╓╧"
+
+#~ msgid "View All"
+#~ msgstr "╓╧╓ы╓фи╫╪╗"
+
+#~ msgid "5 Days"
+#~ msgstr "5 фЭ"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "©╥╣╛╔╚╔Л╔С╔ю╓Р╨Ню╝╓╥╓ч╓╧"
+
+#~ msgid "Day"
+#~ msgstr "фЭ"
+
+#~ msgid "New _Event"
+#~ msgstr "©╥╣╛╔╓╔ы╔С╔х(_E)"
+
+#~ msgid "Open Calendar"
+#~ msgstr "╔╚╔Л╔С╔ю╓РЁ╚╓╞"
+
+#~ msgid "Prev"
+#~ msgstr "а╟"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "йл╓н╓Б╓н╓х╓╥╓ф╔╚╔Л╔С╔ю╓Рйщб╦╓╥╓ч╓╧"
+
+#~ msgid "Week"
+#~ msgstr "╫╣"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "╔╚╔Л╔С╔ю╓РЁ╚╓╞(_O)"
+
+#~ msgid "About this application"
+#~ msgstr "╓Ё╓н╔╒╔в╔Й╔╠║╪╔╥╔Г╔С╓к╓д╓╓╓ф"
+
+#~ msgid "About..."
+#~ msgstr "╬ПйС..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "ф╟╨Н(_n)"
+
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "╔╒╔и╔Л╔╧д╒(_B)... (FIXME)"
+
+#~ msgid "C_lear"
+#~ msgstr "╔╞╔Й╔╒(_l)"
+
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "л╬а╟╓н╔а╔╖╔ц╔╞ (_k) (FIXME)"
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "╔у╔╘╔К╔ю╓ь╔Ё╔т║╪(_y)... (FIXME)"
+
+#~ msgid "Dump XML"
+#~ msgstr "XML╓н╔ю╔С╔в"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "UI XML ╓н╣╜╫р╓Р╔ю╔С╔в╓╥╓ч╓╧"
+
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "╔у╔╘╔К╔ю╓н╨г╫И╓н╔╒╔╓╔ф╔Ю(_r) (FIXME)"
+
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "е╬аВ(_w) (FIXME)"
+
+#~ msgid "Go to the next item"
+#~ msgstr "╪║╓н╔╒╔╓╔ф╔Ю╓ь╟эф╟╓╥╓ч╓╧"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "а╟╓н╔╒╔╓╔ф╔Ю╓ь╟эф╟╓╥╓ч╓╧"
+
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "л╓╢╟н╩╔©╔╧╔╞(_c) (FIXME)"
+
+#~ msgid "N_ext"
+#~ msgstr "╪║(_e)"
+
+#~ msgid "Pre_vious"
+#~ msgstr "а╟(_v)"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "╔в╔Й╔С╔©╓нюъдЙ(_e)..."
+
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "╔©╔╧╔╞мв╣А(_R) (FIXME)"
+
+#~ msgid "_About..."
+#~ msgstr "╬ПйС(_A)..."
+
+#~ msgid "_Item (FIXME)"
+#~ msgstr "╔╒╔╓╔ф╔Ю(_I) (FIXME)"
+
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "╔у╔╘╔К╔ю╓н╨г╦Е╓н╔╒╔╓╔ф╔Ю(_L) (FIXME)"
+
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "╔А╔ц╔╩║╪╔╦╓Р╔А║╪╔К(_M) (FIXME)"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "╔у╔╘╔К╔ю╓ь╟эф╟(_M)... (FIXME)"
+
+#~ msgid "_Note (FIXME)"
+#~ msgstr "╔н║╪╔х(_N) (FIXME)"
+
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "л╓фи╔╒╔╓╔ф╔Ю(_U) (FIXME)"
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "╢Шфи╓х╓╥╓ф╔ч║╪╔╞(_k)"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "л╓фи╓х╓╥╓ф╔ч║╪╔╞(_n)"
+
+#~ msgid "Print message to the printer"
+#~ msgstr "╔А╔ц╔╩║╪╔╦╓Р╔в╔Й╔С╔©╓ь╟У╨Ч╓╥╓ч╓╧"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "╟╦л╬╓Р╫Я╓╜╢╧╓╗╓К (FIXME: ╪баУ╓╥╓ф╓╞╓ю╓╣╓╓)"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "╔у╔╘╔К╔ю╓ьйщб╦... (FIXME)"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "╔ф╔╜╔╧╔х╔у╔║╔╓╔К╓начфЧ(_I)... (FIXME)"
+
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "╔©╔╧╔╞╓нЁДеЖ╓ф(_n) (FIXME)"
+
+#~ msgid "Find"
+#~ msgstr "╦║╨В"
+
+#~ msgid "Meeting Re_quest (FIXME)"
+#~ msgstr "бг╧Г╓╩мв╣А(_q) (FIXME)"
+
+#~ msgid "Redo"
+#~ msgstr "╓Д╓Йд╬╓╥"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "л╓╢╟н╩╓нф╟╨Н╓Р╓Д╓Йд╬╓╥╓ч╓╧"
+
+#~ msgid "Replace"
+#~ msgstr "цж╢╧"
+
+#~ msgid "Replace a string"
+#~ msgstr "й╦╩З╓Рцж╢╧╓╥╓ч╓╧"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "а╢╟В╓ьйж©╝(_l) (FIXME)"
+
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "аВ©╝╔╧╔ф║╪╔©╔╧╔Л╔щ║╪╔х(_e) (FIXME)"
+
+#~ msgid "S_kip Occurrence (FIXME)"
+#~ msgstr "╫пмХ╩Ж╓Р╔╧╔╜╔ц╔в(_k) (FIXME)"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "ф╠╓╦й╦╩ЗнС╓г╨ф╦║╨В╓Р╧т╓╓╓ч╓╧"
+
+#~ msgid "Search for a string"
+#~ msgstr "й╦╩ЗнС╓г╦║╨В╓╥╓ч╓╧"
+
+#~ msgid "Undo"
+#~ msgstr "╦╣╓клА╓╧"
+
+#~ msgid "Undo the last action"
+#~ msgstr "╨г╦Е╓нф╟╨Н╓Р╦╣╓клА╓╥╓ч╓╧"
+
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "╢╟н╩╓Р╔ч║╪╔╞ (_M) (FIXME)"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "йж©╝(_R) (FIXME)"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Evolution ╔п║╪╔╥╔Г║╪╔х╔╚╔ц╔х(_s)"
diff --git a/po/ko.po b/po/ko.po
index 115a7e4390..1926174eff 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.9\n"
-"POT-Creation-Date: 2001-03-23 01:31+0900\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-03-23 02:12+0900\n"
 "Last-Translator: ChiDeok, Hwang <hwang@mizi.co.kr>\n"
 "Language-Team: korean <ko@li.org>\n"
@@ -16,11 +16,21 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3255
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import VCard files into Evolution."
+msgstr "GnomeCard фдюою╩ Evolutionю╦╥н ╟║а╝©и╢о╢ы"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports VCard files into Evolution."
+msgstr "GnomeCard фдюою╩ Evolutionю╦╥н ╟║а╝©и╢о╢ы"
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "д╚╣Е: "
 
-#: addressbook/backend/ebook/e-card.c:3257
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -28,37 +38,37 @@ msgstr ""
 "\n"
 "юл╦╖: "
 
-#: addressbook/backend/ebook/e-card.c:3258
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3259
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3260
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3261
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3276
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -66,7 +76,7 @@ msgstr ""
 "\n"
 "╩Щюо: "
 
-#: addressbook/backend/ebook/e-card.c:3287
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -74,25 +84,25 @@ msgstr ""
 "\n"
 "аж╪р:"
 
-#: addressbook/backend/ebook/e-card.c:3289
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3290
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3291
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3292
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -100,7 +110,7 @@ msgstr ""
 "\n"
 "  ╫ц/╣╣:          "
 
-#: addressbook/backend/ebook/e-card.c:3293
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -108,7 +118,7 @@ msgstr ""
 "\n"
 "  аЖ©╙:        "
 
-#: addressbook/backend/ebook/e-card.c:3294
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -116,7 +126,7 @@ msgstr ""
 "\n"
 "  ©ЛфМ ╧Ьхё:   "
 
-#: addressbook/backend/ebook/e-card.c:3295
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -124,13 +134,13 @@ msgstr ""
 "\n"
 "  ╠╧╟║:        "
 
-#: addressbook/backend/ebook/e-card.c:3308
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3320
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -138,7 +148,7 @@ msgstr ""
 "\n"
 "юЭх╜╧Ьхё:\n"
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -146,7 +156,7 @@ msgstr ""
 "\n"
 "юЭх╜╧Ьхё:"
 
-#: addressbook/backend/ebook/e-card.c:3347
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -154,7 +164,7 @@ msgstr ""
 "\n"
 "юЭюз©ЛфМ:\n"
 
-#: addressbook/backend/ebook/e-card.c:3350
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -162,13 +172,13 @@ msgstr ""
 "\n"
 "юЭюз©ЛфМ:"
 
-#: addressbook/backend/ebook/e-card.c:3369
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3375
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -176,7 +186,7 @@ msgstr ""
 "\n"
 "╫ц╟ё╢К: "
 
-#: addressbook/backend/ebook/e-card.c:3383
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -184,7 +194,7 @@ msgstr ""
 "\n"
 "аЖ╦╝юШ ю╖д║: "
 
-#: addressbook/backend/ebook/e-card.c:3387
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -192,7 +202,7 @@ msgstr ""
 "\n"
 "аВюЕ аВгт: "
 
-#: addressbook/backend/ebook/e-card.c:3399
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -200,7 +210,7 @@ msgstr ""
 "\n"
 "╠Б╟Э: "
 
-#: addressbook/backend/ebook/e-card.c:3400
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -208,31 +218,31 @@ msgstr ""
 "\n"
 "  юл╦╖:  "
 
-#: addressbook/backend/ebook/e-card.c:3401
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3402
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3403
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3404
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3408
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -240,7 +250,7 @@ msgstr ""
 "\n"
 "╦Я╥о: "
 
-#: addressbook/backend/ebook/e-card.c:3409
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -258,13 +268,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3422
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3425
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -272,23 +282,24 @@ msgstr ""
 "\n"
 "╟Ь©К е╟: "
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
+#: addressbook/backend/ebook/e-card.c:4037
+msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "GnomeCard фдюою╩ Evolutionю╦╥н ╟║а╝©и╢о╢ы"
+#: addressbook/backend/ebook/e-card.c:4045
+#, c-format
+msgid "VCard for %s"
+msgstr ""
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:39
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:68 calendar/gui/main.c:54
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+#: addressbook/backend/ebook/load-pine-addressbook.c:22
+#: addressbook/backend/ebook/test-client-list.c:23
+#: addressbook/backend/ebook/test-client.c:33
+#: addressbook/conduit/address-conduit.c:1092
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo╦╕ цй╠Бх╜ гр╪Ж ╬Ь╫ю╢о╢ы"
 
@@ -300,726 +311,861 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:651
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "wombat ╪╜╧Ж╦╕ ╫цюшгр ╪Ж╟║ ╬Ь╫ю╢о╢ы"
 
-#: addressbook/conduit/address-conduit.c:652
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:655
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "wombatю╩ ╫цюшгр╪Ж ╬Ь╫ю╢о╢ы"
 
-#: addressbook/conduit/address-conduit.c:684
 #: addressbook/conduit/address-conduit.c:687
+#: addressbook/conduit/address-conduit.c:690
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Evolution аж╪р╥о minicard ╨╦╠Б"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "©╛╤ТцЁ╦╕ цЁ╦╝го╢б Evolution ддфВЁмф╝"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#, fuzzy
+msgid "Factory for the Addressbook's address popup"
+msgstr "аж╪р╥о"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr "аж╪р╥о"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "LDAP ╪╜╧Ж"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "фдюо"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "╬к╪Ж╬Ь╢б аж╪р╥о гЭ╫д"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "╨Я╧п╧Ьхё"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "юл ╨Я╧п╧Ьхё ╠Б╬О"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "хё╫╨ф╝:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "╥Гф╝ DN:"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "фВф╝:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "╟к╩Ж ╧Эю╖:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "юнаУ:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "╟Ф╥н:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "╟Ф╥н╟║ а╦юГгоаЖ ╬йю╦╦И ╦╦╣Л╢о╢ы."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "аж╪р╥о фМаЩ"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "аж╪р╥о цъ╟║"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "юл╦╖:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "╪Ё╦М:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr ""
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
-msgid "Add"
-msgstr "цъ╟║"
+msgid "Addressbook Sources"
+msgstr "аж╪р╥о ╪р╫╨"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "╩Ха╕"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "юл╦╖"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "цъ╟║(_A)"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "╪Жа╓(_E)"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "╢ы╦╔ ©╛╤ТцЁ"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "аж╪р╥ою╩ ©╜╪Ж╟║ ╬Ь╫ю╢о╢ы"
+
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "╦Я╥о"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "фЗ╢У е╫╩Ж╠Б╟║ г╔╫цгр URI"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "юл╦чюо"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "юл╦чюо 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "юл╦чюо 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "фдюою╩ ╟М╦ё╪╪©Д"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "╩У╥н©Н ©╛╤ТцЁ╦╕ ╦╦╣Г╢ы"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "аж╪р╥о фМаЩ"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "©╛╤ТцЁ а╓╨╦ фМаЩ"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "©╛╤ТцЁ©║ цъ╟║"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "юЭюз©ЛфМ аж╪р:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr ""
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr ""
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Evolution аж╪р╥о юл╦╖ ╪╠ец юнемфДюл╫╨"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr "аж╪р╥о юл╦╖ ╪╠ец юнемфДюл╫╨╦╕ ю╖гя фяеД╦╝"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "а╕╟е"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "юЭ╨н а╕╟е"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "юл╦чюо ╨╦Ё╩╠Б"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "╢ы╦╔ ©╛╤ТцЁ"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "╧ч╢б╩Г╤В ╦Я╥о"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "╪╠ецгя юл╦╖"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "юл╦╖ю╩ ╪╠ецгр ╟В:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "╦Я╥о:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "╟к╩Ж(_S)"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "╠БЁДюо(_v):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "аВюЕ(_u)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "аВюЕ фя╫╨(_F)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "©╛╤ТцЁ(_C)..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "╦Я╥о(_t)..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "©╛╤ТцЁ фМаЩ╠Б"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "юз╪╪хВ"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "фдюо╥н юЗюЕ:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "юо╧щ а╓╨╦"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "╩У юЭх╜ гЭеб"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "ЁКф╝(_t):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "а╤аВ:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "юЭх╜ гЭеб"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1271
-msgid "Primary Email"
-msgstr "юл╦чюо"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "HTMLгЭ╫д фМаЖ ╩Г©К(_H)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "х╗фДюлаЖ аж╪р:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:82
-msgid "_Add"
-msgstr "цъ╟║(_A)"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "аж╪р(_A)..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "а╤╪Ж юл╦╖(_A):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "╩Щюо(_B):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "аВюЕ(_B)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "х╦╩Г(_C):"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "©╛╤ТцЁ(_C)..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:83 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:59 ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "╩Ха╕(_D)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "╨н╪╜(_D):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "юЭц╪ юл╦╖(_F)..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "аЩ(_H)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "аВгт(_J):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "╦е╢оюЗ юл╦╖(_M):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "хч╢КюЭх╜(_M)"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "╨╟╦М(_N):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "╩Г╧╚╫г(_O):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "аВ╬В(_P):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "╧Х©Люз(_S):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "юл╟мю╨ юЭюз©ЛфМ аж╪рют╢о╢ы(_T)"
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "©╛╤ТцЁ╦╕ ╩Ха╕гр╠Н©Д?"
 
-#: addressbook/contact-editor/e-contact-editor.c:590
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1229
-#: addressbook/gui/widgets/e-addressbook-view.c:628
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "а╤╪Ж"
 
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1297
-#: addressbook/gui/widgets/e-addressbook-view.c:608
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "аВюЕ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
-#: addressbook/gui/widgets/e-addressbook-view.c:615
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "аВюЕ 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1232
-#: addressbook/gui/widgets/e-addressbook-view.c:613
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "аВюЕ фя╫╨"
 
-#: addressbook/contact-editor/e-contact-editor.c:1233
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1234
-#: addressbook/gui/widgets/e-addressbook-view.c:612
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "юз╣©бВ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "х╦╩Г"
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
-#: addressbook/contact-editor/e-contact-editor.c:1298
-#: addressbook/gui/widgets/e-addressbook-view.c:609
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "аЩ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1237
-#: addressbook/gui/widgets/e-addressbook-view.c:616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "аЩ 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1238
-#: addressbook/gui/widgets/e-addressbook-view.c:614
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "аЩ фя╫╨"
 
-#: addressbook/contact-editor/e-contact-editor.c:1239
-#: addressbook/gui/widgets/e-addressbook-view.c:617
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1240
-#: addressbook/gui/widgets/e-addressbook-view.c:611
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "хч╢КюЭх╜"
 
-#: addressbook/contact-editor/e-contact-editor.c:1241
-#: addressbook/contact-editor/e-contact-editor.c:1299
-#: addressbook/gui/widgets/e-addressbook-view.c:618
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:48
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "╠Бе╦"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "╠Бе╦ фя╫╨"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/gui/widgets/e-addressbook-view.c:619
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "╩ъ╩ъ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
-#: addressbook/gui/widgets/e-addressbook-view.c:607
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
-#: addressbook/gui/widgets/e-addressbook-view.c:620
-msgid "Email 2"
-msgstr "юл╦чюо 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1273
-#: addressbook/gui/widgets/e-addressbook-view.c:621
-msgid "Email 3"
-msgstr "юл╦чюо 3"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:215
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "©╛╤ТцЁ Quick цъ╟║"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:217
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "а╓╫д юл╦╖ фМаЩ"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:254
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "а╓╫д юл╦╖"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "юл╦чюо"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "аж╪р _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "дЁЁ╙╢ы"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "аж╪р х╝юн"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "╠╧╟║(_y):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "ги╤У╣Е"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "╧л╠╧"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "аж╪р(_A):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "╫ц(_C):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "юЭц╪ юл╦╖ х╝юн"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "╪╨(_F):"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "юл╦╖(_L):"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "а╕╦Я(_T):"
 
-#: addressbook/gui/component/addressbook.c:237
-msgid "As _Minicards"
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "хё╫╨ф╝:"
 
-#: addressbook/gui/component/addressbook.c:243
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "╠╦©Ы"
 
-#: addressbook/gui/component/addressbook.c:413
-#, c-format
-msgid "Enter password for %s"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:441
-msgid "Unable to open addressbook"
-msgstr "аж╪р╥ою╩ ©╜╪Ж╟║ ╬Ь╫ю╢о╢ы"
-
-#: addressbook/gui/component/addressbook.c:446
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:569
-msgid "Show All"
-msgstr "╦П╣н ╨╦╠Б"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
+msgstr "а╕╟е"
 
-#: addressbook/gui/component/addressbook.c:571
-msgid "Advanced..."
-msgstr "╟М╠ч..."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "©╛╤ТцЁ фМаЩ╠Б"
 
-#: addressbook/gui/component/addressbook.c:601
-msgid "Any field contains"
-msgstr ""
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "©╛╤ТцЁ фМаЩ╠Б"
 
-#: addressbook/gui/component/addressbook.c:602
-msgid "Name contains"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:603
-msgid "Email contains"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:746
-msgid "The URI that the Folder Browser will display"
-msgstr "фЗ╢У е╫╩Ж╠Б╟║ г╔╫цгр URI"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#, fuzzy
+msgid "New Contact:"
+msgstr "╩У ©╛╤ТцЁ"
 
-#: addressbook/gui/component/addressbook-storage.c:95
-msgid "Other Contacts"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#, fuzzy
+msgid "Original Contact:"
 msgstr "╢ы╦╔ ©╛╤ТцЁ"
 
-#: addressbook/gui/component/addressbook-config.c:143
-msgid "LDAP Server"
-msgstr "LDAP ╪╜╧Ж"
-
-#: addressbook/gui/component/addressbook-config.c:145
-msgid "File"
-msgstr "фдюо"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "Unknown addressbook type"
-msgstr "╬к╪Ж╬Ь╢б аж╪р╥о гЭ╫д"
-
-#: addressbook/gui/component/addressbook-config.c:158
-msgid "None (anonymous mode)"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-provider.c:75
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-provider.c:69
-msgid "Password"
-msgstr "╨Я╧п╧Ьхё"
-
-#: addressbook/gui/component/addressbook-config.c:162
-msgid "SASL"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:165
-msgid "Unknown auth type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:174
-msgid "Base"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "One"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:178
-msgid "Subtree"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Unknown scope type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:348
-msgid "Bind DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "FIXME Bind DN Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:351
-msgid "Remember this password"
-msgstr "юл ╨Я╧п╧Ьхё ╠Б╬О"
-
-#: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:30
-msgid "Host:"
-msgstr "хё╫╨ф╝:"
-
-#: addressbook/gui/component/addressbook-config.c:402
-msgid "FIXME Host help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "Port:"
-msgstr "фВф╝:"
-
-#: addressbook/gui/component/addressbook-config.c:405
-msgid "FIXME Port help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Root DN:"
-msgstr "╥Гф╝ DN:"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Root DN help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:430
-msgid "Search Scope:"
-msgstr "╟к╩Ж ╧Эю╖:"
-
-#: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:9
-msgid "Authentication:"
-msgstr "юнаУ:"
-
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:51
-msgid "Path:"
-msgstr "╟Ф╥н:"
-
-#: addressbook/gui/component/addressbook-config.c:503
-msgid "FIXME Path Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "Create path if it doesn't exist."
-msgstr "╟Ф╥н╟║ а╦юГгоаЖ ╬йю╦╦И ╦╦╣Л╢о╢ы."
-
-#: addressbook/gui/component/addressbook-config.c:642
-msgid "Edit Addressbook"
-msgstr "аж╪р╥о фМаЩ"
-
-#: addressbook/gui/component/addressbook-config.c:644
-msgid "Add Addressbook"
-msgstr "аж╪р╥о цъ╟║"
-
-#: addressbook/gui/component/addressbook-config.c:660
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:43
-msgid "Name:"
-msgstr "юл╦╖:"
-
-#: addressbook/gui/component/addressbook-config.c:667
-msgid "FIXME Name help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:669
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "╪Ё╦М:"
-
-#: addressbook/gui/component/addressbook-config.c:670
-msgid "FIXME Description help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "аж╪р╥о ╪р╫╨"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/folder-browser.c:574
-#: mail/mail-config.glade.h:21 mail/mail-view.c:150
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "╩Ха╕"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "фМаЩ"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:605
-msgid "Name"
-msgstr "юл╦╖"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:366
-msgid "Disable Queries"
-msgstr ""
-
-#: addressbook/gui/component/e-address-widget.c:366
-msgid "Enable Queries (Dangerous!)"
-msgstr ""
-
-#: addressbook/gui/component/e-address-widget.c:389
-#: addressbook/gui/component/select-names/e-select-names-popup.c:200
-msgid "Edit Contact Info"
-msgstr "©╛╤ТцЁ а╓╨╦ фМаЩ"
-
-#: addressbook/gui/component/e-address-widget.c:425
-#: addressbook/gui/component/select-names/e-select-names-popup.c:259
-msgid "Add to Contacts"
-msgstr "©╛╤ТцЁ©║ цъ╟║"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for displaying an address."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution аж╪р╥о minicard ╨╦╠Б"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution component for handling contacts."
-msgstr "©╛╤ТцЁ╦╕ цЁ╦╝го╢б Evolution ддфВЁмф╝"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+msgid "Changed Contact:"
+msgstr "╢ы╦╔ ©╛╤ТцЁ"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Factory for the Addressbook Minicard control"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook's address displayer"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Evolution addressbook component."
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the sample Addressbook control"
-msgstr "аж╪р╥о"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Evolution аж╪р╥о юл╦╖ ╪╠ец юнемфДюл╫╨"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "аж╪р╥о юл╦╖ ╪╠ец юнемфДюл╫╨╦╕ ю╖гя фяеД╦╝"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:121
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "а╕╟е"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:136
-msgid "Remove All"
-msgstr "юЭ╨н а╕╟е"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "цё╠Б..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "╧ч╢б╩Г╤В ╦Я╥о"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "╪╠ецгя юл╦╖"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "юл╦╖ю╩ ╪╠ецгр ╟В:"
-
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
+#: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "╟к╩Ж"
 
@@ -1131,72 +1277,268 @@ msgstr ""
 msgid "z"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
-#: addressbook/gui/widgets/e-minicard.c:450
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "VCard╥н юЗюЕ"
 
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
+msgid "Send contact to other"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
+#, fuzzy
+msgid "Send message to contact"
+msgstr "Ё╙аъ©║ ╦ч╪╪аЖ╦╕ ╨╦Ёю╢о╢ы"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
 #: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
+msgid "Print"
+msgstr "юн╪Б"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
+#, fuzzy
+msgid "Print Envelope"
+msgstr "╨юеУ юн╪Б(_v)..."
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "╩Ха╕"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "%sю╩(╦╕) юп╢баъ ©ю╥Ы ╧ъ╩Щ"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+msgid "Success"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "╬к ╪Ж╬Ь╢б ©║╥╞"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "©юга╤Сюн©║╪╜ юш╬В"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "гЦ╟║╠г ╟е╨н"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "фдюоюл ╧ъ╟ъ╣гаЖ ╬й╬р╫ю╢о╢ы"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "юш╣©юл аЖ©Ь╣гаЖ ╬йю╫"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "цК╪р╣й"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "ютцБ╥б ©ю╥Ы"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "%sю╩(╦╕) юп╢баъ ©ю╥Ы ╧ъ╩Щ"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "%sю╩(╦╕) юп╢баъ ©ю╥Ы ╧ъ╩Щ"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "%sю╩(╦╕) юп╢баъ ©ю╥Ы ╧ъ╩Щ"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "%sю╩(╦╕) юп╢баъ ©ю╥Ы ╧ъ╩Щ"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr ""
+"юз╥Аю╩ юп╢баъ ©ю╥Ы ╧ъ╩Щ:\n"
+"%s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* ©╛╤ТцЁ©║ цъ╟║го╠Б *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:606
+#: addressbook/gui/widgets/e-addressbook-view.c:702
+#, fuzzy
+msgid "File As"
+msgstr "фдюо╥н юЗюЕ:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "юл╦чюо"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:610
+#: addressbook/gui/widgets/e-addressbook-view.c:705
+#, fuzzy
+msgid "Primary Phone"
+msgstr "юл╦чюо"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:706
+#, fuzzy
+msgid "Assistant Phone"
+msgstr "а╤╪Ж"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:707
+#, fuzzy
+msgid "Business Phone"
+msgstr "аВюЕ 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:708
+msgid "Callback Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:709
+#, fuzzy
+msgid "Company Phone"
+msgstr "х╦╩Г"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:710
+#, fuzzy
+msgid "Home Phone"
+msgstr "аЩ 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "а╤аВ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:622
+#: addressbook/gui/widgets/e-addressbook-view.c:712
+#, fuzzy
+msgid "Business Address"
+msgstr "аВюЕ 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:713
+#, fuzzy
+msgid "Home Address"
+msgstr "аж╪р х╝юн"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:714
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "хч╢КюЭх╜"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:715
+msgid "Car Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#, fuzzy
+msgid "Business Phone 2"
+msgstr "аВюЕ 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, fuzzy
+msgid "Home Phone 2"
+msgstr "аЩ 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:721
+#, fuzzy
+msgid "Other Phone"
+msgstr "╢ы╦╔ ©╛╤ТцЁ"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:726
+msgid "TTY"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:727
+#, fuzzy
+msgid "Other Address"
+msgstr "аж╪р х╝юн"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "ю╔ ╩Гюлф╝"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:623
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "╨н╪╜"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "╩Г╧╚╫г"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:625
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "а╕╦Я"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:626
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "аВ╬В"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:627
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:629
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "╨╟╦М"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:630
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "╧Х©Люз"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:631
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "ЁКф╝"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:632
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:633
-msgid "Click here to add a contact"
-msgstr "©╛╤ТцЁ©║ цъ╟║го╠Б"
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "©о╥А"
 
-#: addressbook/gui/widgets/e-minicard-control.c:280
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "╢ч╥б ╨р╥╞©ю╠Б..."
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "аж╪р╥о©║ юЗюЕ"
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1205,7 +1547,7 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr "д╚╣Е: "
 
@@ -1234,7 +1576,8 @@ msgid "Dimensions:"
 msgstr "е╘╠Б:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "╠ш╡ц..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1294,7 +1637,6 @@ msgid "Margins"
 msgstr "©╘╧И"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "©╜ ╪Ж:"
 
@@ -1375,142 +1717,313 @@ msgid "Width:"
 msgstr "фЬ:"
 
 #: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr ""
+#, fuzzy
+msgid "_Font..."
+msgstr "╠ш╡ц..."
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:258
-msgid "File not found"
-msgstr "фдюоюл ╧ъ╟ъ╣гаЖ ╬й╬р╫ю╢о╢ы"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr "╬к╤В ╠Б╢и"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr "╬к╤В ╠Б╢ию╩ ю╖гя фяеД╦╝"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "%A %b %d %Y %H:%M©║ ╬Ю╪с ╫ц╟ё ╬к╦╡"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "%A %b %d %Y %H:%M©║ ╬Ю╪с ╫ц╟ё ╬к╦╡"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "%A %b %d %Y %H:%M©║ ╬Ю╪с ╫ц╟ё ╬к╦╡"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "%A %b %d %Y %H:%M©║ ╬Ю╪с ╫ц╟ё ╬к╦╡"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "%A %b %d %Y %H:%M©║ ╬Ю╪с ╫ц╟ё ╬к╦╡"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "%A %b %d %Y %H:%M©║ ╬Ю╪с ╫ц╟ё ╬к╦╡"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "%A %b %d %Y %H:%M©║ ╬Ю╪с ╫ц╟ё ╬к╦╡"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "Evolutionюг а╓╨╦ ╨╦╠Б"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "%A %b %d %Y %H:%M©║ ╬к╤В"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "╢щ╠Б"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+msgid "Snoo_ze"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "╬Ю╪сю╩ ╪Жа╓го╠Б"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+msgid "No description available."
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "╬Ю╪сю╩ ╬к╥ааы ╫ц╟ё"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr ""
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "х╝юн"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
+#, c-format
+msgid ""
+"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+"know."
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+msgid "Could not initialize GNOME"
+msgstr "╠вЁПю╩ цй╠Бх╜ гр╪Ж ╬Ь╫ю╢о╢ы"
+
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Bonobo╦╕ цй╠Бх╜ гр╪Ж ╬Ь╫ю╢о╢ы"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
+msgid "Could not create the alarm notify service factory"
+msgstr "╬к╤В ╠Б╢и фяеД╦╝╦╕ ╦╦╣И╪Ж╟║ ╬Ь╫ю╢о╢ы"
 
-#: calendar/gui/calendar-commands.c:282
-msgid "Open calendar"
-msgstr "╢ч╥б ©╜╠Б"
+#: calendar/gui/calendar-commands.c:402
+msgid "%A %d %B %Y"
+msgstr ""
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:324
-msgid "Save calendar"
-msgstr "╢ч╥б юЗюЕ"
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+msgid "%a %d %b %Y"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:478
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:901
-#: calendar/gui/e-calendar-table.c:329
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
-#: calendar/gui/event-editor.c:1617
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "╨о"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "Ё╡"
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "╣©"
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "╪╜"
 
-#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:351 mail/message-list.c:626
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "ЁТюл"
 
-#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
-#: calendar/gui/calendar-model.c:1596
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:625
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "╨╦еК"
 
-#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:624
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Ё╥╟т"
 
-#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "еУ╦М"
 
-#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "╨реУ╦М"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "╫цюш ╬хгт"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "аЬгЮаъ"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "©о╥А╣й"
 
-#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "цК╪р╣й"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:277
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:800 e-util/e-time-utils.c:286
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:805
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1518,161 +2031,317 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:885
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
-#: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:328
-#: calendar/gui/e-calendar-table.c:403 mail/mail-account-editor.c:770
-#: mail/mail-account-editor.c:772 mail/mail-account-editor.c:863
-#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
-#: mail/mail-config.glade.h:45 shell/e-shell-view.c:1120
-#: widgets/misc/e-cell-date-edit.c:231 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:973
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1013
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1054
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1067
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "а╓юг╬х╣й"
 
-#: calendar/gui/calendar-model.c:1108
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1598
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "╧щ╨╧╣й"
 
-#: calendar/gui/calendar-model.c:1600
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "©╧╬Ю╣й"
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "©╧"
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "╬ф╢о©ю"
 
-#: calendar/gui/calendar-summary.c:196
-msgid "%A, %e %B %Y"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "д╚╣Е: "
+
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+msgid "Work Week View"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
-msgid "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "аж"
+
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "╢ч"
+
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "╢ч╥бюл г╔╫цгр URI"
+
+#: calendar/gui/dialogs/alarm-options.c:354
+msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:437
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>╢ч╥б╦╕ юп╢баъ ©ю╥Ы</b>"
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "╧ч╢б╩Г╤В ╦Я╥о"
 
-#: calendar/gui/calendar-summary.c:449
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>╢ч╥б╦╕ юп╢б аъ ©ю╥Ы:<br>аЖ©Ь╣гаЖ╬й╢б ╧Ф╧Щ"
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "╨╦╠Б ©и╪г"
 
-#: calendar/gui/calendar-summary.c:616
-msgid "Display"
-msgstr "г╔╫ц"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:621
-msgid "Show appointments"
-msgstr "╬Ю╪с ╨╦╠Б"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:629
-msgid "Show tasks"
-msgstr "╬В╧╚"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "╢ч╥б ╨р╥╞╣Июл╠Б"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "╢ч╥бюл г╔╫цгр URI"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "╦ч╫цаЖ╣Ию╩ %s╥н юл╣©"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "╬Ю╪сю╩ ╬к╥ааы ╫ц╟ё"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "╪р╦╝ ©╛аж"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
 msgstr ""
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "х╝юн"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "га╥н╠в╥╔ю╩ ╠╦╣©гу╢о╢ы"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr "╬к╤В ╠Б╢и"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
-msgstr "╬к╤В ╠Б╢ию╩ ю╖гя фяеД╦╝"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "Ё╞"
 
-#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
-msgid "Could not initialize GNOME"
-msgstr "╠вЁПю╩ цй╠Бх╜ гр╪Ж ╬Ь╫ю╢о╢ы"
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "╟╩╫е аж╠Б"
 
-#: calendar/gui/alarm-notify/notify-main.c:73
-msgid "Could not create the alarm notify service factory"
-msgstr "╬к╤В ╠Б╢и фяеД╦╝╦╕ ╦╦╣И╪Ж╟║ ╬Ь╫ю╢о╢ы"
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "╫ц"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "%A %b %d %Y %H:%M©║ ╬к╤В"
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "╨п"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "%A %b %d %Y %H:%M©║ ╬Ю╪с ╫ц╟ё ╬к╦╡"
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr " %d Ё╞╬©"
+
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr "го╥Г╬©"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr " %d аж╬©"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr " гяаж╬©"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr " %d ╫ц╟ё╬©"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr " гя╫ц╟ё╬©"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr " %d ╨п╦╤╢ы"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr "юо╨п╦╤╢ы"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr " %d цй╦╤╢ы"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr " 1 цй╦╤╢ы"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr "╪р╦╝ ©╛аж"
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "╦П╣Г ╦ч╫цаЖ гЛ╢У ╨╦юл╠Б"
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an email"
+msgstr "юл╦чюо ╨╦Ё╩╠Б"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr "га╥н╠в╥╔ю╩ ╠╦╣©гу╢о╢ы"
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr "╬Ю╪с╫цюшюЭ"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr "╬Ю╪с ╫цюшхд"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr "╬Ю╪с Ё║Ё╙╠БюЭ"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr "╬Ю╪с Ё║Ё╜ хд"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+msgid "Basics"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "╢щ╠Б"
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "Ё╞б╔:"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "╬Ю╪сю╩ ╪Жа╓го╠Б"
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "©Д╬Ю"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "╪Ёа╓(_O)"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
 msgstr ""
 
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr "╬Ю╪с Ё║"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+msgid "minute(s)"
+msgstr "╨п"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
+msgstr "╬Ю╪сюг ╫цюш"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
 msgstr ""
@@ -1702,36 +2371,36 @@ msgid "60 minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
+msgid "Beep when alarm windows appear."
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr ""
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
+msgid "Calendar"
+msgstr "╢ч╥б"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
-msgstr ""
+msgid "Calendar Preferences"
+msgstr "╢ч╥б ╪Ёа╓"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
-msgid "Calendar"
-msgstr "╢ч╥б"
+msgid "Color for overdue tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
-msgstr "╢ч╥б ╪Ёа╓"
+msgid "Color for tasks due today"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "╩Ж╩С"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+msgid "Compress weekends in month view"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+msgid "Date Navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1739,1015 +2408,1153 @@ msgid "Defaults"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "╨╦╠Б ©и╪г"
+#: mail/mail-config.glade.h:30
+msgid "Display"
+msgstr "г╔╫ц"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:161
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "го╥Гюг Ё║:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "юоажюоюг ц╧б╟Ё╞:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "╠щ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "╠щ©Дюо"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+msgid "Mon"
+msgstr "©Ы"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "╟╜а╤"
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
+msgstr "©Ы©Дюо"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
+msgid "Notification Options"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
+msgid "Overdue tasks"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr ""
+msgid "Remind me of all appointments"
+msgstr "╦П╣Г ╬Ю╪сю╩ ╩С╠Б╫це╟╠Б"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Mon"
-msgstr "©Ы"
+msgid "Sat"
+msgstr "еД"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
-msgid "Monday"
-msgstr "©Ы©Дюо"
+#: calendar/gui/dialogs/recurrence-page.c:970
+msgid "Saturday"
+msgstr "еД©Дюо"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr ""
+#, fuzzy
+msgid "Show appointment end times in week and month views"
+msgstr "╬Ю╪с Ё║╫ц╟ё ╨╦╠Б"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
+msgid "Show week numbers"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:52
-msgid "Pick a color"
+msgid "Start of day:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:164
-msgid "Priority"
-msgstr "©Л╪╠╪Ью╖"
+msgid "Sun"
+msgstr "юо"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "Remind me of all appointments"
-msgstr "╦П╣Г ╬Ю╪сю╩ ╩С╠Б╫це╟╠Б"
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
+msgstr "юо©Дюо"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr ""
+#, fuzzy
+msgid "Task List"
+msgstr "юш╬В"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "Sat"
-msgstr "еД"
+msgid "Tasks due today"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
-msgid "Saturday"
-msgstr "еД©Дюо"
+msgid "Thu"
+msgstr "╦Я"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "╨╦╠Б"
+#: calendar/gui/dialogs/recurrence-page.c:968
+msgid "Thursday"
+msgstr "╦Я©Дюо"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
-msgstr "╬Ю╪с Ё║╫ц╟ё ╨╦╠Б"
+#, fuzzy
+msgid "Time"
+msgstr "а╕╦Я"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show week numbers"
+msgid "Time divisions:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "Start of day:"
+msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "Sun"
-msgstr "юо"
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"╫ц╟ё╢К: "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
-msgid "Sunday"
-msgstr "юо©Дюо"
+msgid "Tue"
+msgstr "х╜"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "юш╬Вфп╣Е"
+#: calendar/gui/dialogs/recurrence-page.c:966
+msgid "Tuesday"
+msgstr "х╜©Дюо"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Thu"
-msgstr "╦Я"
+msgid "Wed"
+msgstr "╪Ж"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
-msgid "Thursday"
-msgstr "╦Я©Дюо"
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
+msgstr "╪Ж©Дюо"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr ""
+#, fuzzy
+msgid "Work Week"
+msgstr "аж"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-msgid "Time divisions:"
+msgid "minutes before they occur."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time format:"
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-msgid "Tue"
-msgstr "х╜"
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "а╓╦╩╥н юл ╟Ха╓ю╩ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н?"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
-msgid "Tuesday"
-msgstr "х╜©Дюо"
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "а╓╦╩╥н юш╬В `%s'╦╕ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "а╓╦╩╥н ©╘гЮюоа╓ `%s'ю╩ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Wed"
-msgstr "╪Ж"
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
-msgid "Wednesday"
-msgstr "╪Ж©Дюо"
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "minutes before they occur."
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:86
-msgid "seconds."
-msgstr "цй."
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:68
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "©о╥А╣й"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "©о╥А╣й"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+msgid "Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "╬Ю╪сю╩ ╪Жа╓гя╢ы"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "╬Ю╪с - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "©╘гЮ юоа╓ - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "╢ы╦╔ юл╦╖ю╦╥н юЗюЕ..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "а╓╦╩╥н ╬Ю╪с `%s'ю╩ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:87
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "а╓╦╩╥н юл а╕╦Я╬Ь╢б ╬Ю╪сю╩ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н"
 
-#: calendar/gui/dialogs/delete-comp.c:77
+#: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "а╓╦╩╥н юш╬В `%s'╦╕ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н"
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "а╓╦╩╥н юл а╕╦Я╬Ь╢б юш╬Вю╩ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н"
 
-#: calendar/gui/dialogs/delete-comp.c:86
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "а╓╦╩╥н ©╘гЮюоа╓ `%s'ю╩ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н"
 
-#: calendar/gui/dialogs/delete-comp.c:89
+#: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "а╓╦╩╥н юл а╕╦Я╬Ь╢б ©╘гЮюоа╓ю╩ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "╨╞╟Ф╣х╟мю╩ юЗюЕ го╠Ф ©Ьго╫й╢о╠Н?"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "а╓╦╩╥н ╬Ю╪с `%s'ю╩ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% ©о╥А(_p):"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "а╓╦╩╥н юш╬В `%s'╦╕ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:157
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Classification"
-msgstr "╨п╥Ы"
+#: calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "а╓╦╩╥н ©╘гЮюоа╓ `%s'ю╩ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "Date &amp; Time"
-msgstr ""
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "фдюою╩ ╟М╦ё╪╪©Д"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "©о╥А╣х Ё╞б╔:"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "╪╫╪г:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "Pri_vate"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
 msgstr ""
+"\n"
+"╫ц╟ё╢К: "
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "аЬгЮаъ"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Pu_blic"
-msgstr "╟Ь©К е╟(_b)"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "╫цюш Ё╞б╔(_r):"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Su_mmary:"
-msgstr "©Д╬Ю(_u):"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "юш╬В"
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
+msgstr "╬Ю╪с"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Confidential"
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "©╛╤ТцЁ(_C)..."
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "╧лфц цК╪р"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "©Л╪╠╪Ью╖(_P):"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "╩Себ(_S):"
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
+msgid "Classification"
+msgstr "╨п╥Ы"
 
-#: calendar/gui/dialogs/task-editor.c:689
-msgid "Edit Task"
-msgstr "юш╬В фМаЩ"
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
+#, fuzzy
+msgid "Date & Time"
+msgstr "╨╦Ё╫ Ё╞б╔"
 
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
-msgid "No summary"
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
+msgid "Pri_vate"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
-#, c-format
-msgid "Appointment - %s"
-msgstr "╬Ю╪с - %s"
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
+msgid "Pu_blic"
+msgstr "╟Ь©К е╟(_b)"
 
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
-#, c-format
-msgid "Task - %s"
-msgstr ""
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
+msgid "Su_mmary:"
+msgstr "©Д╬Ю(_u):"
 
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
-#, c-format
-msgid "Journal entry - %s"
-msgstr "©╘гЮ юоа╓ - %s"
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
+msgid "_Confidential"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:156
-msgid "Categories"
-msgstr "╦Я╥о"
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "Ё║╦╤д║╢б ╫ц╟ё(_E):"
 
-#: calendar/gui/e-calendar-table.c:158
-msgid "Completion Date"
-msgstr "©о╥А Ё╞б╔"
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "╫цюш ╫ц╟ё(_S):"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "End Date"
-msgstr "╦╤аЖ╦╥ Ё╞"
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "Start Date"
-msgstr "╫цюшгя Ё╞"
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "╠в╥Л юл╦╖:"
 
-#: calendar/gui/e-calendar-table.c:162
-msgid "Geographical Position"
-msgstr "аЖ╦╝гпюШ ю╖д║"
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "╠чаЖ╧Ф╧Щ:"
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Percent complete"
-msgstr "фш╪╬ф╝ ©о╥А"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:165
-msgid "Summary"
-msgstr "©Д╬Ю"
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr "акюЕ"
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Transparency"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr "гй бЭ╪╝юз"
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "URL"
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "Alarms"
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Click here to add a task"
-msgstr "юш╬В╦Я╥о©║ цъ╟║го╠Б"
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "╣©юш а╕╟е"
 
-#: calendar/gui/e-calendar-table.c:373
-#, c-format
-msgid "0%"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr "╫бюн"
 
-#: calendar/gui/e-calendar-table.c:374
-#, c-format
-msgid "10%"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr "╧щ╢К"
 
-#: calendar/gui/e-calendar-table.c:375
-#, c-format
-msgid "20%"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "юАа╓юШ"
 
-#: calendar/gui/e-calendar-table.c:376
-#, c-format
-msgid "30%"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "╩Ха╕╣й"
 
-#: calendar/gui/e-calendar-table.c:377
-#, c-format
-msgid "40%"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "аЬгЮаъ"
 
-#: calendar/gui/e-calendar-table.c:378
-#, c-format
-msgid "50%"
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:379
-#, c-format
-msgid "60%"
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:380
-#, c-format
-msgid "70%"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "гй бЭ╪╝юз"
 
-#: calendar/gui/e-calendar-table.c:381
-#, c-format
-msgid "80%"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "гй бЭ╪╝юз"
 
-#: calendar/gui/e-calendar-table.c:382
-#, c-format
-msgid "90%"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "гй бЭ╪╝юз"
 
-#: calendar/gui/e-calendar-table.c:383
-#, c-format
-msgid "100%"
+#: calendar/gui/dialogs/meeting-page.c:891
+msgid "Sent By:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:550
-msgid "Mark Complete"
-msgstr "©о╥А г╔╫ц"
-
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark the task complete"
-msgstr "юш╬Вюл ©о╥А╣г╬Зю╫ю╩ г╔╫ц"
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "╩Ха╕..."
 
-#: calendar/gui/e-calendar-table.c:556
-msgid "Edit this task..."
-msgstr "юл юоа╓ю╩ ╪Жа╓..."
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
+msgstr "бЭ╪╝юз"
 
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit the task"
-msgstr "юоа╓ фМаЩ"
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
+msgstr "©о╥А Ё╞б╔"
 
-#: calendar/gui/e-calendar-table.c:559
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
-msgstr "юл юоа╓╦╕ ╩Ха╕гу╢о╢ы"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "╩Ха╕╣й"
 
-#: calendar/gui/e-calendar-table.c:560
-msgid "Delete the task"
-msgstr "юл юоа╓╦╕ ╩Ха╕гу╢о╢ы"
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "╩Ха╕╣й"
 
-#: calendar/gui/e-day-view-time-item.c:516
-#, c-format
-msgid "%02i minute divisions"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+msgid "Language"
 msgstr ""
 
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1281
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%A %d %B"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "╠╦©Ы"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1295
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
 msgstr ""
 
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:344
-msgid "%d %b"
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
 msgstr ""
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:563 calendar/gui/e-week-view.c:297
-#: calendar/gui/print.c:613
-msgid "am"
-msgstr "©ююЭ"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:566 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:612
-msgid "pm"
-msgstr "©юхд"
-
-#: calendar/gui/e-day-view.c:3027 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
-msgstr "╩У ╬Ю╪с"
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "╩Себ"
 
-#: calendar/gui/e-day-view.c:3029 calendar/gui/e-week-view.c:3237
-msgid "New All Day Event"
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3242
-msgid "Go to Today"
-msgstr "©ю╢ц╥н юл╣©"
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "а╤аВ:"
 
-#: calendar/gui/e-day-view.c:3036 calendar/gui/e-week-view.c:3244
-msgid "Go to Date..."
-msgstr "Ё╞б╔╥н юл╣©..."
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "а╤аВ:"
 
-#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3250
-#: mail/folder-browser.c:543 ui/evolution-calendar.xml.h:19
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "©╜╠Б"
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "╢ы╦╔ юл╣Ию╩ цй╢К(_I)..."
 
-#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3252
-msgid "Delete this Appointment"
-msgstr "юл ╬Ю╪сю╩ ╩Ха╕гу╢о╢ы"
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "а╤аВ:"
 
-#: calendar/gui/e-day-view.c:3047 calendar/gui/e-week-view.c:3254
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3056 calendar/gui/e-week-view.c:3267
-msgid "Make this Occurrence Movable"
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3058 calendar/gui/e-week-view.c:3269
-msgid "Delete this Occurrence"
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3060
-msgid "Delete all Occurrences"
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:153
-msgid "I couldn't update your calendar file!\n"
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
-msgid "Component successfully updated."
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:165
-msgid "There was an error loading the calendar file."
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:189
-msgid "I couldn't open your calendar file!\n"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
-msgid "I couldn't load your calendar file!\n"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:462
-msgid "I couldn't read your calendar file!\n"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "©╧©э"
 
-#: calendar/gui/e-itip-control.c:475
-msgid "This is a reply from someone who was uninvited!"
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:491
-msgid "I couldn't update your calendar store."
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
+msgstr "╧л╦╝╨╦╠Б"
 
-#: calendar/gui/e-itip-control.c:532
-msgid "I couldn't delete the calendar component!\n"
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:542
-msgid "Component successfully deleted."
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:686
-msgid "I don't recognize this type of calendar component."
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "╪Жа╓"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:772
-msgid "Add to Calendar"
-msgstr "╢ч╥б©║ цъ╟║"
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:806
-msgid "Accept"
-msgstr "╫бюн"
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "╟Ё©Ы"
 
-#: calendar/gui/e-itip-control.c:807
-msgid "Decline"
-msgstr "╧щ╢К"
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "юАа╓юШ"
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "аж"
 
-#: calendar/gui/e-itip-control.c:852
-msgid "Update Calendar"
-msgstr "╢ч╥б ╟╩╫е"
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
+msgstr "ЁБ"
 
-#: calendar/gui/e-itip-control.c:875
-msgid "Cancel Meeting"
-msgstr "╧лфц цК╪р"
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr "╨╞╟Ф╣х╟мю╩ юЗюЕ го╠Ф ©Ьго╫й╢о╠Н?"
 
-#: calendar/gui/e-itip-control.glade.h:2
-#, no-c-format
-msgid "%P %%"
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:3
-msgid "--to--"
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:4
-msgid "Calendar Message"
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:598
-msgid "Date:"
-msgstr "Ё╞б╔:"
-
-#: calendar/gui/e-itip-control.glade.h:8
-msgid "Loading calendar..."
-msgstr "╢ч╥б ╨р╥╞©ю╠Б..."
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "©о╥А╣х Ё╞б╔:"
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "а╤аВ:"
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "╩Ха╕╣й"
 
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:43
-msgid "Sender"
-msgstr "╨╦Ё╫юл"
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "╩Ха╕╣й"
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "©Д╬Ю"
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "(юл╦╖ ╬Ью╫)"
 
-#: calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
-msgstr ""
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "юш╬В"
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "бЭ╪╝юз"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% ©о╥А(_p):"
 
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "бЭ╪╝юз аж╪р"
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
+msgstr "аЬгЮаъ"
 
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "бЭ╪╝юз:"
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "╫цюш Ё╞б╔(_r):"
 
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr "акюЕ"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "х╦юг ╫цюш:"
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
+msgstr "©Л╪╠╪Ью╖(_P):"
 
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr ""
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
+msgstr "╩Себ(_S):"
 
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
+#: calendar/gui/e-calendar-table.c:351
+#, c-format
+msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "╠Бх╧юз:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
+#: calendar/gui/e-calendar-table.c:352
+#, c-format
+msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
+#: calendar/gui/e-calendar-table.c:353
+#, c-format
+msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
+#: calendar/gui/e-calendar-table.c:354
+#, c-format
+msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Required Participant"
-msgstr "гй бЭ╪╝юз"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid "Role"
+#: calendar/gui/e-calendar-table.c:355
+#, c-format
+msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:22
-msgid ""
-"Schedule\n"
-"Time"
+#: calendar/gui/e-calendar-table.c:356
+#, c-format
+msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:48
-#: mail/message-list.c:1014
-msgid "Status"
-msgstr "╩Себ"
-
-#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
-#: calendar/gui/e-tasks.c:501
-msgid "All"
-msgstr "╦П╣н"
-
-#: calendar/gui/e-tasks.c:154
-msgid "Category:"
-msgstr "╦Я╥о:"
-
-#: calendar/gui/e-tasks.c:297
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
-msgid "Could not load the tasks in `%s'"
+msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:309
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
-msgid "The method required to load `%s' is not supported"
+msgid "70%"
 msgstr ""
 
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
+#: calendar/gui/e-calendar-table.c:359
+#, c-format
+msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3235 calendar/gui/e-week-view.c:3258
-msgid "New Appointment..."
-msgstr "╩У ╬Ю╪с..."
-
-#: calendar/gui/e-week-view.c:3271
-msgid "Delete All Occurrences"
+#: calendar/gui/e-calendar-table.c:360
+#, c-format
+msgid "90%"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
+#: calendar/gui/e-calendar-table.c:361
+#, c-format
+msgid "100%"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "╬Ю╪с"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "╬Ю╪с ╠Б╨╩"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+#, fuzzy
+msgid "_Open"
+msgstr "©╜╠Б"
 
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "юз╦ё╠Б(_u)"
 
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "╨╧╩Г(_C)"
 
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "©╧©э"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "╨ыюл╠Б(_P)"
 
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "╪Жа╓"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "©о╥А г╔╫ц"
 
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
+msgstr "юл юоа╓╦╕ ╩Ха╕гу╢о╢ы"
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1577
-msgid "Play a sound"
-msgstr "╪р╦╝ ©╛аж"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
+msgstr "©о╥А г╔╫ц"
 
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "╧л╦╝╨╦╠Б"
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
+msgstr "юл юоа╓╦╕ ╩Ха╕гу╢о╢ы"
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "юш╬В╦Я╥о©║ цъ╟║го╠Б"
 
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr ""
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% ©о╥А(_p):"
 
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1586
-msgid "Run a program"
-msgstr "га╥н╠в╥╔ю╩ ╠╦╣©гу╢о╢ы"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1583
-msgid "Send an email"
-msgstr "юл╦чюо ╨╦Ё╩╠Б"
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "╦Я╥о"
 
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "╪Ёа╓..."
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+#, fuzzy
+msgid "Complete"
+msgstr "©о╥А╣й"
 
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1580
-msgid "Show a dialog"
-msgstr "╢ыюл╬С╥н╠Б ╨╦╠Б"
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "©о╥А Ё╞б╔"
 
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "Ё║╦╤д║╢б ╫ц╟ё(_E):"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "╫цюш ╫ц╟ё(_S):"
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "╦╤аЖ╦╥ Ё╞"
 
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "╫цюш Ё╞б╔(_S):"
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "аЖ╦╝гпюШ ю╖д║"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
-msgid "after"
-msgstr ""
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "©Л╪╠╪Ью╖"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
-msgid "before"
-msgstr ""
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "╫цюшгя Ё╞"
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr ""
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "©Д╬Ю"
 
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "╬Ю╪с Ё║"
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "юш╬В"
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
+msgid "%A %d %B"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
+#: calendar/gui/e-week-view-main-item.c:348
+msgid "%d %b"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "minute(s)"
-msgstr "╨п"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "©ююЭ"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "month(s)"
-msgstr "╟Ё©Ы"
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "©юхд"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "start of appointment"
-msgstr "╬Ю╪сюг ╫цюш"
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
+msgstr "╩У ╬Ю╪с"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr "аж"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "©ю╢ц╥н юл╣©(_T)"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "ЁБ"
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
+msgstr "Ё╞б╔╥н юл╣©..."
 
-#: calendar/gui/event-editor.c:371
-msgid "Edit Appointment"
-msgstr "╬Ю╪сю╩ ╪Жа╓гя╢ы"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
+msgstr "юл ╬Ю╪сю╩ ╩Ха╕гу╢о╢ы"
 
-#: calendar/gui/event-editor.c:449
-msgid "on"
-msgstr ""
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
+msgstr "гЖюГ фдюою╩ юЗюЕ"
 
-#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
-msgid "day"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
+msgstr "юл ╦ч╪╪аЖ╦╕ ╩Ха╕гу╢о╢ы"
+
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:601
-msgid "on the"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/event-editor.c:608
-msgid "th"
+#: calendar/gui/e-itip-control.c:697
+#, fuzzy
+msgid "This is a meeting request."
+msgstr "юл╟мю╨ юЭюз©ЛфМ аж╪рют╢о╢ы(_T)"
+
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
 msgstr ""
 
-#: calendar/gui/event-editor.c:754
-msgid "occurrences"
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
 msgstr ""
 
-#: calendar/gui/event-editor.c:871
-msgid "This appointment contains recurrences that Evolution cannot edit."
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1532
-#, c-format
-msgid " %d days"
-msgstr " %d Ё╞╬©"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1534
-msgid " 1 day"
-msgstr "го╥Г╬©"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+#, fuzzy
+msgid "The message is not understandable."
+msgstr "юл ╦ч╫цаЖ╢б гЖюГ ╨╦©╘аы ╪Ж╟║ ╬Ь╫ю╢о╢ы"
 
-#: calendar/gui/event-editor.c:1537
-#, c-format
-msgid " %d weeks"
-msgstr " %d аж╬©"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1539
-msgid " 1 week"
-msgstr " гяаж╬©"
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1542
-#, c-format
-msgid " %d hours"
-msgstr " %d ╫ц╟ё╬©"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1544
-msgid " 1 hour"
-msgstr " гя╫ц╟ё╬©"
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1547
-#, c-format
-msgid " %d minutes"
-msgstr " %d ╨п╦╤╢ы"
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1549
-msgid " 1 minute"
-msgstr "юо╨п╦╤╢ы"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1552
-#, c-format
-msgid " %d seconds"
-msgstr " %d цй╦╤╢ы"
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1554
-msgid " 1 second"
-msgstr " 1 цй╦╤╢ы"
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1601
-msgid " before start of appointment"
-msgstr "╬Ю╪с╫цюшюЭ"
+#: calendar/gui/e-itip-control.c:834
+msgid "The message does not appear to be properly formed"
+msgstr ""
 
-#: calendar/gui/event-editor.c:1603
-msgid " after start of appointment"
-msgstr "╬Ю╪с ╫цюшхд"
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1611
-msgid " before end of appointment"
-msgstr "╬Ю╪с Ё║Ё╙╠БюЭ"
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
 
-#: calendar/gui/event-editor.c:1613
-msgid " after end of appointment"
-msgstr "╬Ю╪с Ё║Ё╜ хд"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr ""
 
-#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
-#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
-msgid "%a %b %d %Y"
+#: calendar/gui/e-itip-control.c:1015
+msgid "I couldn't remove the item from your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+#: calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
+#: calendar/gui/e-itip-control.glade.h:4
+msgid "Calendar Message"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
+#: calendar/gui/e-itip-control.glade.h:5
+msgid "Date:"
+msgstr "Ё╞б╔:"
+
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "╢ч╥б ╨р╥╞╣Июл╠Б"
+
+#: calendar/gui/e-itip-control.glade.h:8
+msgid "Loading calendar..."
+msgstr "╢ч╥б ╨р╥╞©ю╠Б..."
+
+#: calendar/gui/e-itip-control.glade.h:10
+#, fuzzy
+msgid "Server Message:"
+msgstr "╢ы╦╔юл╦╖ю╦╥н ╦ч╪╪аЖ юЗюЕ..."
+
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
+#: calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
+msgid "All"
+msgstr "╦П╣н"
+
+#: calendar/gui/e-tasks.c:252
+msgid "Category:"
+msgstr "╦Я╥о:"
+
+#: calendar/gui/e-tasks.c:403
+#, c-format
+msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
+#: calendar/gui/e-tasks.c:415
+#, c-format
+msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
+msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:695
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "╩У ╬Ю╪с..."
+
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s'©║юж╢б фЗ╢У╦╕ ©╜╪Ж╟║ ╬Ь╫ю╢о╢ы"
 
-#: calendar/gui/gnome-cal.c:706
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -2773,236 +3580,253 @@ msgid "Go To Date"
 msgstr ""
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "©ю╢ц╥н юл╣©"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "юо©Ы"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "╩О©Ы"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "©ю©Ы"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "╫ц©Ы"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "╠╦©Ы"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "©ю╢ц╥н юл╣©"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr ""
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr ""
 
-#: calendar/gui/print.c:944
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "юш╬В"
 
 #. Day
-#: calendar/gui/print.c:1074
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1089
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1846
 #, c-format
-msgid "Current week (%s - %s)"
+msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1108
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1115
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1152
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1334
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:29
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "юн╪Б ╧л╦╝╨╦╠Б"
 
-#: calendar/gui/tasks-control.c:105
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "юл гв╦Яю╩ юн╪Б"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "юн╪Б ╪Ёа╓"
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "г╔╫цгр юш╬В фЗ╢Уюг URI URI"
 
@@ -3034,33 +3858,129 @@ msgid ""
 "calendar folder will be migrated to the tasks folder."
 msgstr ""
 
-#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
+#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
 msgid "SMTWTFS"
 msgstr ""
 
-#: camel/camel-filter-driver.c:848
+#: camel/camel-cipher-context.c:171
+#, fuzzy
+msgid "Signing is not supported by this cipher"
+msgstr "юл юЗюЕ╦ец╪©║ аЖа╓╣х гЭ╫дюл аЖ©Ь╣гаЖ ╬й╫ю╢о╢ы"
+
+#: camel/camel-cipher-context.c:211
+#, fuzzy
+msgid "Clearsigning is not supported by this cipher"
+msgstr "юл юЗюЕ╦ец╪©║ аЖа╓╣х гЭ╫дюл аЖ©Ь╣гаЖ ╬й╫ю╢о╢ы"
+
+#: camel/camel-cipher-context.c:251
+#, fuzzy
+msgid "Verifying is not supported by this cipher"
+msgstr "юл юЗюЕ╦ец╪©║ аЖа╓╣х гЭ╫дюл аЖ©Ь╣гаЖ ╬й╫ю╢о╢ы"
+
+#: camel/camel-cipher-context.c:294
+#, fuzzy
+msgid "Encryption is not supported by this cipher"
+msgstr "юл юЗюЕ╦ец╪©║ аЖа╓╣х гЭ╫дюл аЖ©Ь╣гаЖ ╬й╫ю╢о╢ы"
+
+#: camel/camel-cipher-context.c:336
+#, fuzzy
+msgid "Decryption is not supported by this cipher"
+msgstr "юл юЗюЕ╦ец╪©║ аЖа╓╣х гЭ╫дюл аЖ©Ь╣гаЖ ╬й╫ю╢о╢ы"
+
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
+#, fuzzy
+msgid "Syncing folders"
+msgstr "фЗ╢У ╣©╠Бх╜"
+
+#: camel/camel-filter-driver.c:644
+#, fuzzy
+msgid "Unable to open spool folder"
+msgstr "аж╪р╥ою╩ ©╜╪Ж╟║ ╬Ь╫ю╢о╢ы"
+
+#: camel/camel-filter-driver.c:653
+#, fuzzy
+msgid "Unable to process spool folder"
+msgstr "аж╪р╥ою╩ ©╜╪Ж╟║ ╬Ь╫ю╢о╢ы"
+
+#: camel/camel-filter-driver.c:667
+#, fuzzy
+msgid "Getting message %d (%d%%)"
+msgstr "╦ч╪╪аЖ %s╦╕ ╟║а╝©ю╠Б"
+
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, fuzzy, c-format
+msgid "Failed on message %d"
+msgstr "юЭ╢ч╣х ╦ч╫цаЖ - %s"
+
+#: camel/camel-filter-driver.c:672
+#, fuzzy
+msgid "Cannot open message"
+msgstr ""
+"╦ч╪╪аЖ╦╕ ╬Рю╩╪Ж ╬Ью╫: %s\n"
+"  %s"
+
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
+#, fuzzy
+msgid "Syncing folder"
+msgstr "фЗ╢У ╣©╠Бх╜"
+
+#: camel/camel-filter-driver.c:766
+#, fuzzy, c-format
+msgid "Getting message %d of %d"
+msgstr "%2$dаъ %1$d╦ч╫цаЖ юЗюЕ (uid \"%3$s\")"
+
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
+#, fuzzy, c-format
+msgid "Failed at message %d of %d"
+msgstr "%2$dаъ %1$d╦ч╫цаЖ юЗюЕ (uid \"%3$s\")"
+
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "гйем ╨п╪╝аъ ©ю╥Ы: %s: %s"
 
-#: camel/camel-filter-driver.c:853
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "гйем ╫ггЮаъ ©ю╥Ы: %s: %s"
 
-#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "гйем цё╠Б ╫ггЮаъ ©ю╥Ы: %s: %s"
 
-#: camel/camel-folder-search.c:323
+#: camel/camel-folder-search.c:328
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:338
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -3069,282 +3989,378 @@ msgstr ""
 "цё╠Б╦╕ ╪ЖгЮ╣╣аъ ©ю╥Ы: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
+#: camel/camel-folder-search.c:485 camel/camel-folder-search.c:513
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:554
+#: camel/camel-folder-search.c:559
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
+#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
+#: camel/camel-lock-client.c:110
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:123
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "`%s'©К юА╠щфдюою╩ ╩Щ╪╨гр ╪Ж ╬Ь╫ю╢о╢ы: %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "`%s'©К юА╠щфдюою╩ ╩Щ╪╨гр ╪Ж ╬Ь╫ю╢о╢ы: %s"
 
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:199
+#: camel/camel-lock.c:201
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:253
+#: camel/camel-lock.c:255
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:99
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:146
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:156
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:197
+#: camel/camel-movemail.c:159
 #, c-format
-msgid "Could not test lock file for %s: %s"
+msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:243
+#: camel/camel-movemail.c:189
+#, c-format
+msgid "Could not create pipe: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:201
+#, c-format
+msgid "Could not fork: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:239
+#, c-format
+msgid "Movemail program failed: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:240
+msgid "(Unknown error)"
+msgstr "(╬к╪Ж╬Ь╢б ©ю╥Ы)"
+
+#: camel/camel-movemail.c:263
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "╦чюофдюою╩ юп╢баъ ©ю╥Ы ╧ъ╩Щ: %s"
 
-#: camel/camel-movemail.c:254
+#: camel/camel-movemail.c:274
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "╦чюо юс╫цфдюою╩ ╬╡╢баъ ©ю╥Ы╧ъ╩Щ: %s"
 
-#: camel/camel-movemail.c:272
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#, fuzzy, c-format
+msgid "Error copying mail temp file: %s"
+msgstr "╦чюо юс╫цфдюою╩ ╬╡╢баъ ©ю╥Ы╧ъ╩Щ: %s"
+
+#: camel/camel-pgp-context.c:193
 #, c-format
-msgid "Failed to store mail in temp file %s: %s"
+msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: camel/camel-movemail.c:304
+#: camel/camel-pgp-context.c:196
 #, c-format
-msgid "Could not create pipe: %s"
+msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-movemail.c:316
+#: camel/camel-pgp-context.c:518
+msgid "No plaintext to sign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
+msgid "No password provided."
+msgstr "╬охё╦╕ аЖа╓гоаЖ╬й╬р╫ю╢о╢ы."
+
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
-msgid "Could not fork: %s"
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr ""
+
+#: camel/camel-pgp-context.c:693
+msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-movemail.c:354
+#: camel/camel-pgp-context.c:886
+msgid "No plaintext to verify."
+msgstr ""
+
+#: camel/camel-pgp-context.c:903
 #, c-format
-msgid "Movemail program failed: %s"
+msgid "Couldn't create temp file: %s"
+msgstr "юс╫ц фдюою╩ ╦╦╣И╪Ж ╬Ью╫: %s"
+
+#: camel/camel-pgp-context.c:1063
+msgid "No plaintext to encrypt."
 msgstr ""
 
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
-msgstr "(╬к╪Ж╬Ь╢б ©ю╥Ы)"
+#: camel/camel-pgp-context.c:1089
+msgid "No recipients specified"
+msgstr "╪Ж╫еюз╟║ аЖа╓╣гаЖ╬йю╫"
 
-#: camel/camel-provider.c:137
+#: camel/camel-pgp-context.c:1280
+msgid "No ciphertext to decrypt."
+msgstr ""
+
+#: camel/camel-provider.c:131
+#, c-format
+msgid "Could not load %s: Module loading not supported on this system."
+msgstr ""
+
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:145
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:170
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s ╢╨╫╨ ╪╜╧Ж %s"
 
-#: camel/camel-remote-store.c:174
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:221
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr "©╛╟Аюл цК╪р╣й"
 
-#: camel/camel-remote-store.c:224
-#: camel/providers/smtp/camel-smtp-transport.c:243
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:225
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr "(╦П╦ё╢б хё╫╨ф╝)"
 
-#: camel/camel-remote-store.c:306 camel/camel-remote-store.c:368
-#: camel/camel-remote-store.c:439
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "юш╬В цК╪р"
 
-#: camel/camel-remote-store.c:445
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr ""
 
-#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
+#: camel/camel-sasl-anonymous.c:33
+msgid "Anonymous"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:35
+msgid "This option will connect to the server using an anonymous login."
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
 msgstr "юнаУ ╫гфп."
 
-#: camel/camel-sasl-anonymous.c:106
+#: camel/camel-sasl-anonymous.c:119
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-sasl-anonymous.c:118
+#: camel/camel-sasl-anonymous.c:131
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-sasl-anonymous.c:130
+#: camel/camel-sasl-anonymous.c:143
 #, c-format
 msgid ""
 "Invalid trace information:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:11
+#: camel/camel-sasl-cram-md5.c:35
 msgid "CRAM-MD5"
 msgstr ""
 
-#: camel/camel-sasl-cram-md5.c:34
+#: camel/camel-sasl-cram-md5.c:37
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:19
+#: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:39
+#: camel/camel-sasl-digest-md5.c:45
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:761
+#: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:770
+#: camel/camel-sasl-digest-md5.c:819
 msgid "Server challenge invalid\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:776
+#: camel/camel-sasl-digest-md5.c:825
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:798
+#: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:816
+#: camel/camel-sasl-digest-md5.c:865
 msgid "Server response contained incomplete authorization data\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:826
+#: camel/camel-sasl-digest-md5.c:875
 msgid "Server response does not match\n"
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:38
+#: camel/camel-sasl-kerberos4.c:40
 msgid "Kerberos 4"
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-kerberos4.c:42
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:158
+#: camel/camel-sasl-kerberos4.c:161
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:215
-#: camel/providers/imap/camel-imap-store.c:418
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/camel-sasl-plain.c:29
-msgid "PLAIN"
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
 msgstr ""
 
-#: camel/camel-sasl-plain.c:31
-msgid ""
-"This option will connect to the server using a the PLAIN SASL mechanism if "
-"the server supports it."
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
+msgid "This option will connect to the server using a simple password."
 msgstr ""
 
-#: camel/camel-search-private.c:105
+#: camel/camel-sasl-login.c:127
+#, fuzzy
+msgid "Unknown authentication state."
+msgstr "юнаУ ╫гфп."
+
+#: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:139
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:155
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:478
+#: camel/camel-service.c:548
+#, c-format
+msgid "Resolving: %s"
+msgstr ""
+
+#: camel/camel-service.c:575
 #, c-format
-msgid "No such host %s."
+msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:481
+#: camel/camel-service.c:600
 #, c-format
-msgid "Temporarily unable to look up hostname %s."
+msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-session.c:54
+#: camel/camel-service.c:602
+#, c-format
+msgid "Host lookup failed: %s: unknown reason"
+msgstr ""
+
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:320
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:415
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3353,121 +4369,231 @@ msgstr ""
 "%s ╣П╥╨еД╦╝╦╕ ╩Щ╪╨гр ╪Ж╟║ ╬Ь╫ю╢о╢ы:\n"
 "%s"
 
-#. Fill in the new fields
-#: camel/camel-store.c:382 mail/mail-ops.c:941 mail/mail-ops.c:948
-#: mail/mail-ops.c:966 mail/mail-ops.c:967
-msgid "Trash"
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr ""
+
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
 msgstr ""
 
-#: camel/camel-url.c:77
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "╠в фдюою╨ а╦юГгоаЖ╬й╫ю╢о╢ы"
+
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "╠в фдюою╨ а╦юГгоаЖ╬й╫ю╢о╢ы"
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr ""
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
+#, fuzzy
+msgid "Failed to decode message."
+msgstr "╦ч╪╪аЖ©║ фдюою╩ ц╥╨нгу╢о╢ы"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
-msgid "URL string `%s' contains no protocol"
+msgid ""
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
 
-#: camel/camel-url.c:92
+#. construct our user prompt
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "URL `%s'юл а╕╢К╥н╣х га╥неДдщю╩ ╟║аЖ╟М южаЖ╬й╫ю╢о╢ы"
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
 
-#: camel/camel-url.c:152
+#: camel/camel-tcp-stream-ssl.c:348
 #, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "URL `%s'©║юж╢б фВф╝ ╧Ьхё╟║ ╪Щюз╟║ ╬ф╢у╢о╢ы"
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
 
-#: camel/camel-vee-folder.c:962
+#: camel/camel-url.c:289
+#, fuzzy, c-format
+msgid "Could not parse URL `%s'"
+msgstr "╣╔юле╦╦╕ ╬╣ ╪Ж╟║ ╬Ь╫ю╢о╢ы: %s"
+
+#: camel/camel-vee-folder.c:452
+#, fuzzy, c-format
+msgid "No such message %s in %s"
+msgstr "╠в╥╠ ╦ч╪╪аЖ ╬Ью╫: %s"
+
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "╠в╥╠ ╦ч╪╪аЖ ╬Ью╫: %s"
 
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/camel-vtrash-folder.c:109
+#, fuzzy
+msgid "You cannot copy messages from this trash folder."
+msgstr ""
+"╦ч╪╪аЖ╦╕ ╬Рю╩╪Ж ╬Ью╫: %2$s фЗ╢У©║╪╜ %1$s\n"
+"  %3$s"
+
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP server╥н╨нем ©╧╩Сд║╦Ьгя ╢Д╨╞: %s"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ╦М╥июл ╫гфп: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
-msgid "Unknown error"
-msgstr "╬к ╪Ж╬Ь╢б ©║╥╞"
-
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "╪╜╧Жюг ╢Д╨╞юл Ёй╧╚ юобО Ё║Ё╣╫ю╢о╢ы."
 
-#: camel/providers/imap/camel-imap-command.c:433
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ╪╜╧Жюг ╢Д╨╞©║ %s а╓╨╦╟║ ╢Ц╟эюжаЖ╬й╫ю╢о╢ы"
 
-#: camel/providers/imap/camel-imap-command.c:469
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP ╪╜╧Ж╥н╨нем ©╧╟ъд║╦Ьгя OK╢Д╨╞юл ©х: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:176
+#: camel/providers/imap/camel-imap-folder.c:192
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:345
-msgid "Scanning IMAP folder"
-msgstr "IMAP фЗ╢У╦╕ ╩ЛфЛ╨╬╢о╢ы"
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
+msgstr ""
+
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "╦ч╫цаЖ╣Ию╩ юЗюЕ"
 
-#: camel/providers/imap/camel-imap-folder.c:946
-#: camel/providers/imap/camel-imap-folder.c:1143
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "юл ╦ч╫цаЖ╢б гЖюГ ╨╦©╘аы ╪Ж╟║ ╬Ь╫ю╢о╢ы"
 
-#: camel/providers/imap/camel-imap-folder.c:976
-#: camel/providers/imap/camel-imap-folder.c:1177
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "╦ч╫цаЖ╣Ию╩ юЗюЕ"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:40
-msgid "IMAPv4"
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, fuzzy, c-format
+msgid "Could not open cache directory: %s"
 msgstr ""
+"%s ╣П╥╨еД╦╝╦╕ ╩Щ╪╨гр ╪Ж╟║ ╬Ь╫ю╢о╢ы:\n"
+"%s"
 
-#: camel/providers/imap/camel-imap-provider.c:42
-msgid "For reading and storing mail on IMAP servers."
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
+#, fuzzy
+msgid "Checking for new mail"
+msgstr "╩У фМаЖ╦╕ юш╪╨гу╢о╢ы"
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Check for new messages in all folders"
+msgstr "╦ч╪╪аЖ╦╕ ╩У фЗ╢У╥н ╨╧╩Ггу╢о╢ы"
+
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
+msgid "Folders"
+msgstr "фЗ╢У"
+
+#: camel/providers/imap/camel-imap-provider.c:50
+msgid "Show only subscribed folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:58
-msgid "Secure IMAPv4"
+#: camel/providers/imap/camel-imap-provider.c:52
+msgid "Override server-supplied folder namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:60
-msgid "For reading and storing mail on IMAP servers over an SSL connection."
+#: camel/providers/imap/camel-imap-provider.c:54
+#, fuzzy
+msgid "Namespace"
+msgstr "╧ы╡ы╠Б"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:77
+#: camel/providers/imap/camel-imap-provider.c:63
+msgid "IMAPv4"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:65
+msgid "For reading and storing mail on IMAP servers."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:441
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:451
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s е╦ют юнаУю╩ аЖ©Ь ╬хгт"
 
-#: camel/providers/imap/camel-imap-store.c:476
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:491
-#: camel/providers/smtp/camel-smtp-transport.c:374
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:519
-#: camel/providers/smtp/camel-smtp-transport.c:382
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3475,93 +4601,106 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:871
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
-msgid "Could not create directory %s: %s"
-msgstr ""
+msgid "No such folder %s"
+msgstr "%s╟╟ю╨ фЗ╢У╟║ ╬Ью╫"
 
-#: camel/providers/imap/camel-imap-store.c:1328
-msgid "You must be working online to complete this operation"
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:36
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:37
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:46
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:47
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:56
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:57
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:128
+#: camel/providers/local/camel-local-provider.c:70
+msgid "Unix mbox spool-format mail files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:71
+msgid "For storing local mail in standard Unix spool directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:135
+#: camel/providers/local/camel-local-store.c:134
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:159
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "фЗ╢У╦╕ ╬Рю╩╪Ж ╬Ь╫ю╢о╢ы: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:173
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:184
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr "╥ндц ╦чюо фдюо %s"
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:282
+#: camel/providers/local/camel-local-store.c:279
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
+msgid "Unable to add message to summary: unknown reason"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "╦чюофЗ╢У©║ ╦ч╪╪аЖ╦╕ ╣║╨ыюо╪Ж ╬Ь╫ю╢о╢ы: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3570,34 +4709,35 @@ msgstr ""
 "╦ч╪╪аЖ╦╕ ╬Рю╩╪Ж ╬Ью╫: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "╠в╥╠ ╦ч╪╪аЖ ╬Ью╫"
 
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:94
-#: camel/providers/local/camel-mh-store.c:88
+#: camel/providers/local/camel-maildir-store.c:103
+#: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:98
-#: camel/providers/local/camel-mbox-store.c:99
-#: camel/providers/local/camel-mh-store.c:95
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "фЗ╢У `%s'╢б а╦юГгоаЖ ╬й╫ю╢о╢ы."
 
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:101
+#: camel/providers/local/camel-maildir-store.c:114
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -3606,35 +4746,58 @@ msgstr ""
 "фЗ╢У `%s'╦╕ ╦╦╣И╪Ж ╬Ью╫:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:120
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:149
-#: camel/providers/local/camel-maildir-store.c:186
-#: camel/providers/local/camel-mh-store.c:125
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
+#: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:150
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:201
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"фЗ╢У `%s'╦╕ ╦╦╣И╪Ж ╬Ью╫:\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
+#, fuzzy, c-format
+msgid "Cannot open maildir directory path: %s: %s"
+msgstr "╦чюофЗ╢У©║ ╦ч╪╪аЖ╦╕ ╣║╨ыюо╪Ж ╬Ь╫ю╢о╢ы: %s: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
+#, fuzzy, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "фЗ╢У╦╕ ╬Рю╩╪Ж ╬Ь╫ю╢о╢ы: %s: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:257
+#: camel/providers/local/camel-mbox-folder.c:259
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3643,196 +4806,275 @@ msgstr ""
 "╦ч╪╪аЖ╦╕ ╬Рю╩╪Ж ╬Ью╫: %2$s фЗ╢У©║╪╜ %1$s\n"
 "  %3$s"
 
-#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:92
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/local/camel-mbox-store.c:144
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:136
-#: camel/providers/local/camel-mbox-store.c:159
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:151
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:240
+#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "фЗ╢У╦╕ ©Д╬Ю"
 
-#: camel/providers/local/camel-mbox-summary.c:245
+#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:287
+#: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:362
+#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1327
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "фЗ╢У ╣©╠Бх╜"
 
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:507
+#: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:515
+#: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:737
-#: camel/providers/local/camel-mbox-summary.c:745
+#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:557
+#: camel/providers/local/camel-mbox-summary.c:746
+#: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:591
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:608
+#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:626
-#: camel/providers/local/camel-mbox-summary.c:795
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "юс╫ц фЗ╢У╦╕ ╢щю╩╪Ж ╬Ью╫: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:646
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:870
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-store.c:108
+#: camel/providers/local/camel-mh-store.c:110
 #, c-format
 msgid "`%s' is not a directory."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:41
+#: camel/providers/local/camel-mh-summary.c:218
+#, fuzzy, c-format
+msgid "Cannot open MH directory path: %s: %s"
+msgstr ""
+"%s ╣П╥╨еД╦╝╦╕\n"
+"╩Щ╪╨гр ╪Ж╟║ ╬Ь╫ю╢о╢ы©║╥╞: %s"
+
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "╦чюофЗ╢У©║ ╦ч╪╪аЖ╦╕ ╣║╨ыюо╪Ж ╬Ь╫ю╢о╢ы: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "фЗ╢У `%s'╢б а╦юГгоаЖ ╬й╫ю╢о╢ы."
+
+#: camel/providers/local/camel-spool-store.c:176
+msgid "Spool stores do not have an inbox"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "╥ндц ╦чюо фдюо %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "юс╫ц фЗ╢У╦╕ ╢щю╩╪Ж ╬Ью╫: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "юс╫ц фЗ╢У╦╕ ╢щю╩╪Ж ╬Ью╫: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:62
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:68
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:77
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "╦ч╪╪аЖ %s╦╕ цёю╩╪Ж ╬Ью╫."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "╪╜╧Ж©║╪╜ ╠в╥Л╦Я╥ою╩ ╬Рю╩╪Ж ╬Ью╫."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:38
+#: camel/providers/nntp/camel-nntp-provider.c:42
 msgid "USENET news"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:44
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:226
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:288
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:295
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
@@ -3841,542 +5083,638 @@ msgstr ""
 msgid "Retrieving POP summary"
 msgstr "POP ©Д╬Юю╩ ╟║а╝©х"
 
-#: camel/providers/pop3/camel-pop3-folder.c:192
+#: camel/providers/pop3/camel-pop3-folder.c:155
+#, fuzzy, c-format
+msgid "Could not check POP server for new messages: %s"
+msgstr "╦ч╪╪аЖ╦╕ ╨╦Ё╬╪Ж ╬Ью╫: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:199
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:286
+#: camel/providers/pop3/camel-pop3-folder.c:292
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:290
+#: camel/providers/pop3/camel-pop3-folder.c:296
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "POP ╦ч╪╪аЖ %d╦╕ ╟║а╝©х"
 
-#: camel/providers/pop3/camel-pop3-folder.c:308
+#: camel/providers/pop3/camel-pop3-folder.c:303
+#, fuzzy, c-format
+msgid "Could not fetch message: %s"
+msgstr "╦ч╪╪аЖ╦╕ ╨╦Ё╬╪Ж ╬Ью╫: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:320
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:34
+#: camel/providers/pop3/camel-pop3-provider.c:37
+#, fuzzy
+msgid "Message storage"
+msgstr "╦ч╪╪аЖ ╦с╦╝╦╩"
+
+#: camel/providers/pop3/camel-pop3-provider.c:39
+#, fuzzy
+msgid "Leave messages on server"
+msgstr "╪╜╧Ж©║ ╦чюо Ё╡╠Б╠Б"
+
+#: camel/providers/pop3/camel-pop3-provider.c:41
+#, fuzzy, c-format
+msgid "Delete after %s day(s)"
+msgstr "юл юоа╓╦╕ ╩Ха╕гу╢о╢ы"
+
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:36
+#: camel/providers/pop3/camel-pop3-provider.c:50
 msgid ""
 "For connecting to POP servers. The POP protocol can also be used to retrieve "
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:52
-msgid "Secure POP"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:54
-msgid ""
-"For connecting to POP servers over an SSL connection. The POP protocol can "
-"also be used to retrieve mail from certain web mail providers and "
-"proprietary email systems."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:71
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:81
+#: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:93
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:181
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "KPOP ╪╜╧Ж©║╪╜ юнаУгр╪Ж ╬Ью╫: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:298
+#: camel/providers/pop3/camel-pop3-store.c:215
+#, fuzzy, c-format
+msgid "Could not connect to server: %s"
+msgstr "KPOP ╪╜╧Ж©║╪╜ юнаУгр╪Ж ╬Ью╫: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:337
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:356
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:359
-#: camel/providers/pop3/camel-pop3-store.c:396
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:386
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:394
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:503
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:64
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: camel/providers/sendmail/camel-sendmail-provider.c:39
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#: camel/providers/sendmail/camel-sendmail-transport.c:107
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#: camel/providers/sendmail/camel-sendmail-transport.c:124
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#: camel/providers/sendmail/camel-sendmail-transport.c:150
 #, c-format
 msgid "Could not send message: %s"
 msgstr "╦ч╪╪аЖ╦╕ ╨╦Ё╬╪Ж ╬Ью╫: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#: camel/providers/sendmail/camel-sendmail-transport.c:163
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#: camel/providers/sendmail/camel-sendmail-transport.c:170
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#: camel/providers/sendmail/camel-sendmail-transport.c:175
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:192
+#: camel/providers/sendmail/camel-sendmail-transport.c:194
 msgid "Could not find 'From' address in message"
 msgstr "╦ч╪╪аЖ©║╪╜ ╨╦Ё╫ ╩Г╤Вю╩ ╬к╬фЁ╬╪Ж╟║ ╬Ью╫"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:245
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:249
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmailю╩ еКгя ╦чюо юЭ╢ч"
 
-#: camel/providers/smtp/camel-smtp-provider.c:35 mail/mail-config.glade.h:58
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37
+#: camel/providers/smtp/camel-smtp-provider.c:40
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:52
-msgid "Secure SMTP"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-provider.c:54
-msgid ""
-"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
-"connection.\n"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:146
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:148
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:150
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:152
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:154
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:156
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "╣╣©Р╦╩"
 
-#: camel/providers/smtp/camel-smtp-transport.c:158
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:160
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:162
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:164
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:166
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:168
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "юнаУюл гй©Дгт"
 
-#: camel/providers/smtp/camel-smtp-transport.c:287
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:359
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s"
+msgstr "%s е╦ют юнаУю╩ аЖ©Ь ╬хгт"
+
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:494
+#: camel/providers/smtp/camel-smtp-transport.c:420
+#, fuzzy, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr "KPOP ╪╜╧Ж©║╪╜ юнаУгр╪Ж ╬Ью╫: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ╪╜╧Ж %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:521
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:542
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "╦ч╪╪аЖ╦╕ ╨╦Ё©"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:636
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:655
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:690
-#: camel/providers/smtp/camel-smtp-transport.c:702
+#: camel/providers/smtp/camel-smtp-transport.c:744
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "юнаУ:"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:760
+#: camel/providers/smtp/camel-smtp-transport.c:782
+msgid "AUTH request failed."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:785
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:804
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:829
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:848
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:898
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:913
-#: camel/providers/smtp/camel-smtp-transport.c:931
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:950
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:974
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:993
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1016
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:87
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 ╧ыюлф╝"
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u ╧ыюлф╝"
 
-#: composer/e-msg-composer-attachment-bar.c:96
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:100
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "ц╥╨н"
 
-#: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "фдюою╩ ц╥╨нгу╢о╢ы"
-
-#: composer/e-msg-composer-attachment-bar.c:461
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "ц╥╨нфдюо ╦Я╥о©║╪╜ ╪╠ецгя гв╦Яю╩ а╕╟егу╢о╢ы"
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "ц╥╨нфдюо цъ╟║..."
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "╦ч╪╪аЖ©║ фдюою╩ ц╥╨нгу╢о╢ы"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1014
-msgid "Attachment"
-msgstr "ц╥╨н"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "ц╥╨н ╪с╪╨"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "фдюо юл╦╖:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "ц╥╨н"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "MIME гЭ╫д:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "аж╪р╥о"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:696
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "╨╦Ё╫ ╩Г╤В:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:698
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "х╦╫е аж╪р:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:618
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "а╕╦Я:"
 
-#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:700
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "╧ч╢б ╩Г╤В:"
 
-#: composer/e-msg-composer-hdrs.c:377
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "╦ч╪╪аЖ╦╕ ╧чю╩ ╩Г╤Вю╩ ют╥бго╪╪©Д"
 
-#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:702
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "бЭа╤:"
 
-#: composer/e-msg-composer-hdrs.c:381
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "╦ч╪╪аЖюг ╩Г╨╩ю╩ ╧чю╩ ╩Г╤Вюг аж╪р╦╕ ют╥бго╪╪©Д"
 
-#: composer/e-msg-composer-hdrs.c:384
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "╪Шю╨ бЭа╤:"
 
-#: composer/e-msg-composer-hdrs.c:385
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr "бЭа╤ ╦Я╥о©║╢б ╬ЬаЖ╦╦ ╦ч╪╪аЖюг ╩Г╨╩ю╩ ╧чю╩ ╩Г╤В╣Июг аж╪р╦╕ ют╥бго╪╪©Д"
 
-#: composer/e-msg-composer.c:518
-#, c-format
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "фдюою╩ ц╥╨нгу╢о╢ы"
+
+#: composer/e-msg-composer.c:670
+#, fuzzy, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
 "%s"
 msgstr ""
 "╪╜╦М фдюо %sю╩ ©╜ ╪Ж╟║ ╬Ь╫ю╢о╢ы:\n"
 "%s"
 
-#: composer/e-msg-composer.c:706
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr "фдюою╩ юп╢баъ ©ю╥Ы ╧ъ╩Щ: %s"
+
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "╢ы╦╔ юл╦╖ю╦╥н юЗюЕ..."
 
-#: composer/e-msg-composer.c:717
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "╟Ф╟М"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "фдюо юЗюЕаъ ©ю╥Ы ╧ъ╩Щ: %s"
 
-#: composer/e-msg-composer.c:737
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "фдюою╩ юп╢баъ ©ю╥Ы ╧ъ╩Щ: %s"
 
-#: composer/e-msg-composer.c:818 shell/e-shell-view-menu.c:193
-msgid "Evolution"
+#: composer/e-msg-composer.c:997
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "фдюо юЗюЕаъ ©ю╥Ы ╧ъ╩Щ: %s"
+
+#: composer/e-msg-composer.c:1055
+msgid "Unable to retrieve message from editor"
+msgstr ""
+
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"цБ╥бфдюою╩ ╩Щ╪╨гр ╪Ж╟║ ╬Ь╫ю╢о╢ы: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
 msgstr ""
+"цБ╥бфдюою╩ ╩Щ╪╨гр ╪Ж╟║ ╬Ь╫ю╢о╢ы: %s\n"
+" %s"
 
-#: composer/e-msg-composer.c:824
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"%s╥н ╦ч╫цаЖ юЗюЕаъ ©ю╥Ы ╧ъ╩Щ:\n"
+" %s"
+
+#: composer/e-msg-composer.c:1173
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4386,47 +5724,29 @@ msgstr ""
 "\n"
 "╨╞╟Ф╣х Ё╩©Кю╩ юЗюЕго╫ц╟з╫ю╢о╠Н?"
 
-#: composer/e-msg-composer.c:849
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr ""
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "фдюо ©╜╠Б"
 
-#: composer/e-msg-composer.c:975
-msgid "That file does not exist."
-msgstr "╠в фдюою╨ а╦юГгоаЖ╬й╫ю╢о╢ы"
-
-#: composer/e-msg-composer.c:985
-msgid "That is not a regular file."
-msgstr "©Д╟еюл ╨╦еК фдюоюл ╬ф╢оЁв©Д."
-
-#: composer/e-msg-composer.c:995
-msgid "That file exists but is not readable."
-msgstr "фдюоюл юж╠Б╢бгя╣╔ юпю╩ ╪Ж╟║ ╬ЬЁв©Д."
-
-#: composer/e-msg-composer.c:1005
-msgid "That file appeared accesible but open(2) failed."
-msgstr "фдюоюл юпю╩╪Ж юж╢б ╟е╟╟╠Б╢бгя╣╔ ©╜ ╪Ж╟║ ╬Ь╫ю╢о╢ы."
-
-#: composer/e-msg-composer.c:1027
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"фдюоюл ╬фаж е╘Ёв©Д(100k╣╣ Ёяю╫).\n"
-"╩Пютго╟М ╫мю╦╫е╟е ╦бЁ╙©Д?"
-
-#: composer/e-msg-composer.c:1048
-msgid "An error occurred while reading the file."
-msgstr "фдюою╩ юп╢б ╣╣аъ ©║╥╞ ╧ъ╩Щ"
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "еь╫╨ф╝ фдюо ╩Пют"
 
-#: composer/e-msg-composer.c:1354 composer/e-msg-composer.c:1686
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "╦чюо ╦ч╪╪аЖ╦╕ юш╪╨гу╢о╢ы"
 
-#: composer/e-msg-composer.c:1770
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "╦ч╫цаЖ юш╪╨ ц╒ю╩ ╦╦╣И ╪Ж╟║ ╬Ь╫ю╢о╢ы"
 
-#: composer/evolution-composer.c:352
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -4434,314 +5754,155 @@ msgstr ""
 "╬фаВ ╫е╩С а╓╨╦╟║ ют╥бюл ╣г╬НюжаЖ ╬й╬р╠Б╤╖╧╝©║\n"
 "╦ч╫цаЖ юш╪╨ц╒ю╩ ╦╦╣И ╪Ж╟║ ╬Ь╫ю╢о╢ы."
 
-#: composer/evolution-composer.c:367
+#: composer/evolution-composer.c:374
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolution юш╪╨╠Б╟║ цй╠Бх╜╣гаЖ ╬й╬р╫ю╢о╢ы."
 
+#: data/evolution.desktop.in.h:2
+#, fuzzy
+msgid "The Evolution groupware suite"
+msgstr "Evolution ╫╘."
+
+#: data/evolution.keys.in.h:1
+#, fuzzy
+msgid "address card"
+msgstr "аж╪р _2:"
+
+#: data/evolution.keys.in.h:2
+#, fuzzy
+msgid "calendar information"
+msgstr "╩Г©Кюз а╓╨╦"
+
 #. strptime format for a date.
-#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
-msgid "%I:%M:%S %p%n"
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+msgid "%I:%M:%S %p"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
-msgid "%H:%M:%S%n"
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+msgid "%H:%M:%S"
 msgstr ""
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:93 e-util/e-time-utils.c:204
-msgid "%I:%M %p%n"
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:96 e-util/e-time-utils.c:207
-msgid "%H:%M%n"
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr ""
+
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%Y/%m/%d"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%Y/%m/%d"
+
+#: e-util/e-time-utils.c:242
+#, c-format
+msgid "%x"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:268
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
+#: e-util/e-time-utils.c:298
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
 msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:273
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %Y/%m/%d %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:282
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %Y/%m/%d %I:%M %p"
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:311 widgets/misc/e-dateedit.c:1248
-#: widgets/misc/e-dateedit.c:1307 widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr ""
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:314
-msgid "%H:%M:%S"
-msgstr ""
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:319 widgets/misc/e-dateedit.c:1251
-#: widgets/misc/e-dateedit.c:1310 widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr ""
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:322
-msgid "%I:%M:%S %p"
-msgstr ""
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr ""
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr ""
-
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "╠Б╨╩ ╠вЁП га╥н╠в╥╔ю╦╥н %sю╩ ©╜╠Б"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "╠Б╨╩ ╠вЁП ╨Й╤С©Ла╝╥н %s╦╕ ©╜╠Б"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "%s╥н юл╦чюо ╨╦Ё╩╠Б"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "╨Д╦╕ %s╥н ╨╞╟Ф"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "%s ╫ггЮ"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "%s ╢щ╠Б"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "%sю╩(╦╕) ©чбйю╦╥н юл╣©"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "%sю╩(╦╕) юлюЭ аы╥н юл╣©"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "%sю╩(╦╕) ╢ыю╫ аы╥н юл╣©"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "%s ╪Ёа╓"
-
-#: executive-summary/component/e-summary.c:918
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"HTML фдюою╩ ©╜ ╪Ж╟║ ╬Ь╫ю╢о╢ы:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:932
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"юз╥Аю╩ юп╢баъ ©ю╥Ы ╧ъ╩Щ:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:950
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr ""
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr ""
-
-#: executive-summary/component/main.c:60
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "RDF ©Д╬Ю"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:509
-#: executive-summary/test-service/rdf-summary.c:546
-#: executive-summary/test-service/rdf-summary.c:591
-#: widgets/misc/e-messagebox.c:155
-msgid "Error"
-msgstr "©║╥╞"
-
-#: executive-summary/test-service/rdf-summary.c:765
-msgid "Update automatically"
-msgstr "юз╣©ю╦╥н ╟╩╫е"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update now"
-msgstr "аЖ╠щ ╟╩╫е"
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update every "
-msgstr "╟╩╫е аж╠Б"
-
-#: executive-summary/test-service/rdf-summary.c:793
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "╨п"
-
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "©╛╣╣"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "©╛╣╣"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "╢ч"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "╢ч"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "аж"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "аж"
 
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr "Ё╞"
-
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "╫ц"
 
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr "╫ц"
-
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "╨п"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "цй"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "цй"
 
-#: filter/filter-datespec.c:183
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "гЛ. Ё╞б╔ ╪╠ецгь╬ъ го╢б╟и юью╦╪лар:-)"
 
-#: filter/filter-datespec.c:185
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "ба. ╟М╦╔ Ё╞б╔╟║ юШгугоаЖ╬йЁв©Д."
 
-#: filter/filter-datespec.c:259
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
 
-#: filter/filter-datespec.c:282
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:322
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -4749,49 +5910,53 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "гЖюГ ╫ц╟╒"
 
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:358
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr ""
 
 #. The label
-#: filter/filter-datespec.c:416
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "гЖюГ"
 
-#: filter/filter-datespec.c:690
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<Ё╞б╔╦╕ ╪╠ецгр╥а╦И ©╘╠Ф ╢╘╦ё╪╪©Д>"
 
-#: filter/filter-editor.c:126 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:6
 msgid "Filter Rules"
 msgstr "╟е╦ё╟Ё ╠тд╒"
 
 #. and now for the action area
-#: filter/filter-filter.c:424
+#: filter/filter-filter.c:452
 msgid "Then"
 msgstr "╣©юш ╪╠ец"
 
-#: filter/filter-filter.c:437
+#: filter/filter-filter.c:466
 msgid "Add action"
 msgstr "╣©юш цъ╟║"
 
-#: filter/filter-filter.c:443
-msgid "Remove action"
-msgstr "╣©юш а╕╟е"
-
-#: filter/filter-folder.c:143
+#: filter/filter-folder.c:147
 msgid ""
 "Oops, you forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -4799,19 +5964,20 @@ msgstr ""
 "ба, фЗ╢У ╟М╦ё╢б ╟мю╩ юью╦╪лЁв©Д.\n"
 "╣з╥н ╣╧╬ф╟║ ╦чюою╩ ╧Х╢чгр фЗ╢У╦╕ аЖа╓го╪╪©Д."
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "фЗ╢У ╪╠ец"
 
-#: filter/filter-folder.c:243
+#: filter/filter-folder.c:250
 msgid "Enter folder URI"
 msgstr "фЗ╢У URI╦╕ аЖа╓го╪╪©Д"
 
-#: filter/filter-folder.c:289
+#: filter/filter-folder.c:296
 msgid "<click here to select a folder>"
 msgstr "<фЗ╢У╦╕ ╟М╦╕╥а╦И ©╘╠Ф ╢╘╦ё╪╪©Д>"
 
-#: filter/filter-input.c:189
+#: filter/filter-input.c:193
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -4820,41 +5986,58 @@ msgstr ""
 "а╓╠т╫д '%s'©║╪╜ ©║╥╞:\n"
 "%s"
 
-#: filter/filter-part.c:467
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr "ев╫╨ф╝"
 
-#: filter/filter-rule.c:598
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr "╠тд╒ юл╦╖: "
 
-#: filter/filter-rule.c:602
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr "а╕╦Я╬Ью╫"
 
-#: filter/filter-rule.c:618
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "а╤╟г ╪╠ец"
 
-#: filter/filter-rule.c:635
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "╣©юш ╪╠ец"
 
-#: filter/filter-rule.c:639
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "╦П╣Г а╤╟гюл ╢ы цФа╥╣и ╤╖"
 
-#: filter/filter-rule.c:644
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "╬Н╤╡ а╤╟гюл╤С╣╣ цФа╥╣и ╤╖"
 
-#: filter/filter-rule.c:655
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "а╤╟г цъ╟║"
 
-#: filter/filter-rule.c:661
-msgid "Remove criterion"
-msgstr "а╤╟г ╩Ха╕"
+#: filter/filter-rule.c:771
+#, fuzzy
+msgid "incoming"
+msgstr "╣И╬Н©ю╢б╟е"
+
+#: filter/filter-rule.c:771
+#, fuzzy
+msgid "outgoing"
+msgstr "Ё╙╟║╢б╟е"
+
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "цъ╟║"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "фМаЩ"
 
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
@@ -4872,7 +6055,7 @@ msgstr "╣И╬Н©ю╢б╟е"
 msgid "Outgoing"
 msgstr "Ё╙╟║╢б╟е"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "╟║╩С фЗ╢У"
 
@@ -4897,8 +6080,9 @@ msgid "with all local folders"
 msgstr ""
 
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
-msgstr ""
+#, fuzzy
+msgid "Assign Color"
+msgstr "©╧╬Ю╣й"
 
 #: filter/libfilter-i18n.h:4
 msgid "Assign Score"
@@ -4973,275 +6157,427 @@ msgid "Expression"
 msgstr "г╔гЖ"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "юЭ╢чгр аж╪р"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "аъ©Д"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "╦ч╪╪аЖ ╦с╦╝╦╩"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "╦ч╪╪аЖ╦╕ ╧ч╬р╫ю╢о╢ы"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "╦ч╪╪аЖ╦╕ ╨╦Ёб╫ю╢о╢ы"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "фЗ╢У╥н юл╣©"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "юпю╫"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "╧ч╢б ╩Г╤В"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "х╦╫е"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1014
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
+msgid "Sender"
+msgstr "╨╦Ё╫юл"
+
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "╩Себ ╪Ёа╓"
 
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "е╘╠Б"
+
 #: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "Source Account"
+msgstr "╟Ха╓"
+
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50 mail/message-list.c:1015
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "а╕╦Я"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "was before"
 msgstr ""
 
-#: filter/score-editor.c:126
+#: filter/rule-editor.c:147
+msgid "Rules"
+msgstr ""
+
+#: filter/rule-editor.c:240
+#, fuzzy
+msgid "Add Rule"
+msgstr "╟е╦ё╟т ╠тд╒ю╩ цъ╟║"
+
+#: filter/rule-editor.c:299
+#, fuzzy
+msgid "Edit Rule"
+msgstr "а╓╫д юл╦╖ фМаЩ"
+
+#: filter/score-editor.c:130
 msgid "Score Rules"
 msgstr ""
 
-#: mail/component-factory.c:319
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
+msgstr "╟║а╝©ю╠Б"
+
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+msgid "Mail"
+msgstr "фМаЖ"
+
+#: importers/elm-importer.c:498
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: importers/elm-importer.c:527
+#, fuzzy
+msgid "Elm mail"
+msgstr "юл╦чюо"
+
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "аж╪р╥о цъ╟║"
+
+#: importers/evolution-gnomecard-importer.c:253
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "╪Ёа╓..."
+
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: importers/pine-importer.c:691
+#, fuzzy
+msgid "Pine mail"
+msgstr "юл╦чюо"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr "Evolution ╦чюо юш╪╨╠Б."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "╦чюо ╪Ёа╓"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "╪Ёа╓(_P)..."
+
+#: mail/component-factory.c:337
+msgid "Change this folder's properties"
+msgstr ""
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:392
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-factory.c:244
+#: mail/folder-browser-ui.c:254
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\"©║╢Кгя ╪Ёа╓"
 
-#: mail/folder-browser-factory.c:246 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
+#: mail/folder-browser-ui.c:256
 msgid "Properties"
 msgstr "╪Ёа╓"
 
-#: mail/folder-browser.c:219
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "юс╫ц ╣П╥╨еД╦╝╦╕ ╦╦╣И ╪Ж╟║ ╬Ь╫ю╢о╢ы: %s"
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "╟║╩С фЗ╢У╥н цё╠Б╦╕ юЗюЕ"
 
-#: mail/folder-browser.c:510
-msgid "VFolder on Subject"
-msgstr ""
+#: mail/folder-browser.c:1238
+msgid "VFolder on _Subject"
+msgstr "а╕╦Я©║╣Ш╦╔ ╟║╩СфЗ╢У(_S)"
 
-#: mail/folder-browser.c:513
-msgid "VFolder on Sender"
-msgstr ""
+#: mail/folder-browser.c:1241
+msgid "VFolder on Se_nder"
+msgstr "╧ъ╪шюз©║╣Ш╦╔ ╟║╩СфЗ╢У(_n)"
 
-#: mail/folder-browser.c:516
-msgid "VFolder on Recipients"
-msgstr ""
+#: mail/folder-browser.c:1244
+msgid "VFolder on _Recipients"
+msgstr "╪Ж╫еюз©║╣Ш╦╔ ╟║╩СфЗ╢У(_R)"
 
-#: mail/folder-browser.c:519 mail/folder-browser.c:710
-msgid "VFolder on Mailing List"
-msgstr ""
+#: mail/folder-browser.c:1247
+#, fuzzy
+msgid "VFolder on Mailing _List"
+msgstr "╦чюо╦╣ ╦╝╫╨ф╝©║╢Кгя гйем"
 
-#: mail/folder-browser.c:525
-msgid "Filter on Subject"
-msgstr ""
+#: mail/folder-browser.c:1253
+#, fuzzy
+msgid "Filter on Sub_ject"
+msgstr "а╕╦Я©║╢Кгя ╟е╦ё╟т(_S)"
 
-#: mail/folder-browser.c:528
-msgid "Filter on Sender"
-msgstr ""
+#: mail/folder-browser.c:1256
+#, fuzzy
+msgid "Filter on Sen_der"
+msgstr "╧ъ╪шюн©║╢Кгя ╟е╦ё╟т(_n)"
 
-#: mail/folder-browser.c:531
-msgid "Filter on Recipients"
-msgstr ""
+#: mail/folder-browser.c:1259
+#, fuzzy
+msgid "Filter on Re_cipients"
+msgstr "╪Ж╫еюн©║╢Кгя ╟е╦ё╟т(_R)"
 
-#: mail/folder-browser.c:534 mail/folder-browser.c:709
-msgid "Filter on Mailing List"
+#: mail/folder-browser.c:1262
+#, fuzzy
+msgid "Filter on _Mailing List"
 msgstr "╦чюо╦╣ ╦╝╫╨ф╝©║╢Кгя гйем"
 
-#: mail/folder-browser.c:545
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "╢ы╫ц ╨╦Ё©"
 
-#: mail/folder-browser.c:547
-msgid "Save As..."
-msgstr "╢ы╦╔ юл╦╖ю╦╥н юЗюЕ..."
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
+msgid "_Save As..."
+msgstr "╢ы╦╔юл╦╖ю╦╥н юЗюЕ(_S)..."
 
-#: mail/folder-browser.c:549 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:28 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "юн╪Б"
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+msgid "_Print"
+msgstr "юн╪Б(_P)"
 
-#: mail/folder-browser.c:554
-msgid "Reply to Sender"
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#, fuzzy
+msgid "_Reply to Sender"
 msgstr "╨╦Ё╫ ╩Г╤В©║╟т х╦╫е"
 
-#: mail/folder-browser.c:556 mail/mail-view.c:141 ui/evolution-mail.xml.h:35
-msgid "Reply to All"
-msgstr "юЭц╪ х╦╫е"
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "юЭц╪ х╦╫е(_A)"
 
-#: mail/folder-browser.c:558 mail/mail-view.c:144 ui/evolution-mail.xml.h:14
-msgid "Forward"
-msgstr "юЭ╢ч"
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+msgid "Reply to _All"
+msgstr "юЭц╪ х╦╫е(_A)"
 
-#: mail/folder-browser.c:560
-msgid "Forward inline"
-msgstr ""
+#: mail/folder-browser.c:1288
+msgid "_Forward"
+msgstr "юЭ╢ч(_F)"
+
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+msgid "Mar_k as Read"
+msgstr "юпю╨ ╟мю╦╥н г╔╫ц(_k)"
 
-#: mail/folder-browser.c:563
-msgid "Mark as Read"
-msgstr "юпю╨ ╟мю╦╥н г╔╫ц"
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+msgid "Mark as U_nread"
+msgstr "юпаЖ ╬йю╨ ╟мю╦╥н г╔╫ц(_n)"
+
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "аъ©Д"
 
-#: mail/folder-browser.c:565
-msgid "Mark as Unread"
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
 msgstr "юпаЖ ╬йю╨ ╟мю╦╥н г╔╫ц"
 
-#: mail/folder-browser.c:570
-msgid "Move to Folder..."
-msgstr "фЗ╢У╥н юл╣©..."
+#: mail/folder-browser.c:1302
+msgid "_Move to Folder..."
+msgstr "фЗ╢У╥н юл╣©(_M)..."
 
-#: mail/folder-browser.c:572
-msgid "Copy to Folder..."
-msgstr "фЗ╢У╥н ╨╧╩Г..."
+#: mail/folder-browser.c:1304
+msgid "_Copy to Folder..."
+msgstr "фЗ╢У╥н ╨╧╩Г(_C)..."
 
-#: mail/folder-browser.c:576
-msgid "Undelete"
-msgstr "╣г╩Л╦╡"
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+msgid "_Undelete"
+msgstr "╣г╩Л╦╡(_U)"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:586
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "аж╪р╥о цъ╟║"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "╟е╦ё╟Ё юШ©К"
 
-#: mail/folder-browser.c:590
-msgid "Create Rule From Message"
+#: mail/folder-browser.c:1322
+#, fuzzy
+msgid "Create Ru_le From Message"
+msgstr "╦ч╫цаЖ╥н╨нем ╟е╦ё╟т ╩Щ╪╨(_C)"
+
+#: mail/folder-browser.c:1479
+msgid "Filter on Mailing List"
+msgstr "╦чюо╦╣ ╦╝╫╨ф╝©║╢Кгя гйем"
+
+#: mail/folder-browser.c:1480
+msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:712
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:713
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Evolution ╦чюо юш╪╨╠Б."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr ""
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import mbox into Evolution"
+msgstr "Evolutionю╦╥н фдюою╩ ╟║а╝©ю╫г╥а╦И \"╟║а╝©ю╠Б\"╦╕ ╢╘╦ё╪╪©Д."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr ""
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports mbox files into Evolution"
+msgstr "GnomeCard фдюою╩ Evolutionю╦╥н ╟║а╝©и╢о╢ы"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+msgid "Factory to import Outlook Express 4 mails into Evolution"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr ""
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports Outlook Express 4 files into Evolution"
+msgstr "GnomeCard фдюою╩ Evolutionю╦╥н ╟║а╝©и╢о╢ы"
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -5274,63 +6610,97 @@ msgstr ""
 msgid "mh"
 msgstr ""
 
-#: mail/mail-accounts.c:116
-msgid " (default)"
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+msgid "You have not filled in all of the required information."
 msgstr ""
 
-#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
-msgid "Are you sure you want to delete this account?"
-msgstr "а╓╦╩╥н юл ╟Ха╓ю╩ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н?"
-
-#: mail/mail-accounts.c:334 mail/mail-accounts.c:338
-msgid "Are you sure you want to delete this news account?"
-msgstr "а╓╦╩╥н юл ╩У ╟Ха╓ю╩ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н?"
+#. give our dialog an OK button and title
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Evolution ╪Ёд║"
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:452
-msgid "Evolution Account Manager"
+#: mail/mail-account-editor.c:156
+msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-editor.c:301
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "╪╜╦М:"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
 msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
 msgstr ""
+"юл ╦ч╫цаЖ╢б ╨╦Ё╩аЖаЖ╬й╬р╫ю╢о╢ы.\n"
+"\n"
+"╨╞╟Ф╣х Ё╩©Кю╩ юЗюЕго╫ц╟з╫ю╢о╠Н?"
 
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:720
-msgid "Evolution Account Editor"
+#: mail/mail-accounts.c:135
+msgid " (default)"
+msgstr ""
+
+#: mail/mail-accounts.c:174
+msgid "Disable"
 msgstr ""
 
-#: mail/mail-account-editor.c:741
-msgid "Unspecified"
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+msgid "Enable"
 msgstr ""
 
-#: mail/mail-autofilter.c:71
+#: mail/mail-accounts.c:264
+msgid "Are you sure you want to delete this account?"
+msgstr "а╓╦╩╥н юл ╟Ха╓ю╩ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н?"
+
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "╣г╩Л╦╡"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "╠Б╨╩ ╟Ха╓ю╦╥н го╠Б"
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+msgid "Are you sure you want to delete this news account?"
+msgstr "а╓╦╩╥н юл ╩У ╟Ха╓ю╩ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н?"
+
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
+msgid "Evolution Account Manager"
+msgstr ""
+
+#: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:214
+#: mail/mail-autofilter.c:213
 #, c-format
 msgid "Subject is %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:230
+#: mail/mail-autofilter.c:229
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:285
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
 msgid "Add Filter Rule"
 msgstr "╟е╦ё╟т ╠тд╒ю╩ цъ╟║"
 
-#: mail/mail-callbacks.c:85
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5338,135 +6708,228 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:138
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:150
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:227
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:296
-msgid "You must configure an account before you can send this email."
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:318
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:583
+#: mail/mail-callbacks.c:410
+msgid "You must configure an account before you can send this email."
+msgstr ""
+
+#: mail/mail-callbacks.c:653
 #, c-format
-msgid "On %s, %s wrote:\n"
+msgid "On %s, %s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:765
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "юЭ╢ч╣х ╦ч╫цаЖ:\n"
 
-#: mail/mail-callbacks.c:868
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:870
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1011
+#: mail/mail-callbacks.c:1374
+#, fuzzy, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr "а╓╦╩╥н юш╬В `%s'╦╕ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н"
+
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1048
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1081 mail/mail-display.c:83
-msgid "Overwrite file?"
-msgstr ""
+#: mail/mail-callbacks.c:1442
+#, fuzzy, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "а╓╦╩╥н юш╬В `%s'╦╕ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н"
 
-#: mail/mail-callbacks.c:1085 mail/mail-display.c:87
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
+#: mail/mail-callbacks.c:1463
+#, fuzzy
+msgid "No Message Selected"
+msgstr "╦ч╪╪аЖ╦╕ ╧ч╬р╫ю╢о╢ы"
 
-#: mail/mail-callbacks.c:1129
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "╢ы╦╔юл╦╖ю╦╥н ╦ч╪╪аЖ юЗюЕ..."
 
-#: mail/mail-callbacks.c:1131
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "╢ы╦╔юл╦╖ю╦╥н ╦ч╪╪аЖ юЗюЕ..."
 
-#: mail/mail-callbacks.c:1245
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1294
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "фМаЖ ╟е╦ё╟Ё(_F)..."
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "╦ч╪╪аЖ юн╪Б"
 
-#: mail/mail-callbacks.c:1341
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "╦ч╪╪аЖ юн╪Баъ ╫гфп"
 
+#: mail/mail-callbacks.c:1966
+#, fuzzy, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr "а╓╦╩╥н юл ╩У ╟Ха╓ю╩ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н?"
+
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+
+#. set window title
+#: mail/mail-config-druid.c:466
+msgid "Evolution Account Wizard"
+msgstr "Evolution ╟Ха╓ ╦╤╧Щ╩Г"
+
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
+msgstr ""
+
 #: mail/mail-config.glade.h:1
+msgid " Check for supported types "
+msgstr ""
+
+#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr "╩Ж╩С"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
+msgid "(SSL is not supported in this build of evolution)"
+msgstr ""
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "╟Ха╓"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "╟Ха╓ а╓╨╦"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "╟Ха╓ ╟Э╦╝"
 
-#: mail/mail-config.glade.h:6
-msgid "Advanced"
-msgstr "╟М╠ч"
-
 #: mail/mail-config.glade.h:7
+#, fuzzy
+msgid "Accounts"
+msgstr "╟Ха╓"
+
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "ц╥╨н"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "юнаУ:"
 
-#: mail/mail-config.glade.h:8
-msgid "Authentication Type:"
+#: mail/mail-config.glade.h:14
+#, fuzzy
+msgid "Authentication Type: "
 msgstr "юнаУ а╬╥Ы:"
 
-#: mail/mail-config.glade.h:10
-msgid "Automatically check mail every"
+#: mail/mail-config.glade.h:15
+msgid "Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
-msgid "Check settings"
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "фМаЖ юш╪╨"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -5476,390 +6939,554 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "©о╥А"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:32
+#, fuzzy
+msgid "Drafts"
+msgstr "цй╟М"
+
+#: mail/mail-config.glade.h:33
+#, fuzzy
+msgid "Drafts folder:"
+msgstr "╩У фЗ╢У╦╕ ╩Щ╪╨"
+
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "фМаЩ"
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "юЭюз©ЛфМ аж╪р:"
 
-#: mail/mail-config.glade.h:25
-msgid "Email address:"
-msgstr "юЭюз©ЛфМ аж╪р:"
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
 
-#: mail/mail-config.glade.h:26
-msgid "Evolution Mail Configuration"
-msgstr "╦чюо ╪Ёа╓"
+#: mail/mail-config.glade.h:39
+msgid "Enabled"
+msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "юЭц╪юл╦╖:"
 
-#: mail/mail-config.glade.h:29
-msgid "Highlight citations with "
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:31
-msgid "Hostname:"
-msgstr "хё╫╨ф╝:"
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "╪╜╦М:"
 
-#: mail/mail-config.glade.h:32
-msgid "IMAP"
+#: mail/mail-config.glade.h:43
+msgid "Highlight citations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:45
+msgid "IMAPv4 "
+msgstr ""
+
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
-msgid "Include this account when receiving mail"
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:35
-msgid "Keep mail on server"
-msgstr "╪╜╧Ж©║ ╦чюо Ё╡╠Б╠Б"
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Inline"
+msgstr "╧щ╢К"
 
-#: mail/mail-config.glade.h:36
-msgid "Kerberos"
+#: mail/mail-config.glade.h:49
+msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:37
-msgid "Mail"
-msgstr "фМаЖ"
-
-#: mail/mail-config.glade.h:38
-msgid "Mail Account"
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "╦чюо ╪Ёа╓"
 
-#: mail/mail-config.glade.h:40
-msgid "Mail Configuration Druid"
-msgstr "╦чюо ╪Ёа╓ Druid"
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "╦чюо╧з╫╨ гЭ╫д"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "╠Б╨╩ ╟Ха╓ю╦╥н го╠Б"
 
-#: mail/mail-config.glade.h:42
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
+msgstr "╦ч╪╪аЖ ╦с╦╝╦╩"
+
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "LDAP ╪╜╧Ж"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "╢╨╫╨"
 
-#: mail/mail-config.glade.h:46
-msgid "Optional"
-msgstr ""
+#: mail/mail-config.glade.h:62
+#, fuzzy
+msgid "Optional Information"
+msgstr "а╓╨╦ ╬Ью╫"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "а╤аВ:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "PGP ╟Ф╥н"
 
-#: mail/mail-config.glade.h:50
-msgid "Password:"
-msgstr "╨Я╧п╧Ьхё:"
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr ""
 
-#: mail/mail-config.glade.h:53
-msgid "Plain Text"
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr ""
+
+#: mail/mail-config.glade.h:74
+msgid "Qmail maildir "
+msgstr ""
+
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "юн©К(_Q)"
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "фМаЖ╦╕ ╧чю╫"
 
-#: mail/mail-config.glade.h:55
-msgid "Remember my password"
-msgstr "юл ╨Я╧п╧Ьхё ╠Б╬О"
+#: mail/mail-config.glade.h:77
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "фМаЖ╦╕ ╧чю╫"
 
-#: mail/mail-config.glade.h:56
-msgid "Reply address:"
-msgstr "х╦╫е аж╪р:"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Receiving Options"
+msgstr "╧ч╬рю╫"
 
-#: mail/mail-config.glade.h:57
-msgid "Required"
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
-msgid "Save password"
-msgstr "╬охё юЗюЕ"
+#: mail/mail-config.glade.h:81
+#, fuzzy
+msgid "Required Information"
+msgstr "╩Г©Кюз а╓╨╦"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
+
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Security"
+msgstr "╨╦╬х(_S)"
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "PGP га╥н╠в╥╔ фдюою╩ ╪╠ец"
 
-#: mail/mail-config.glade.h:61
-msgid "Select signature file"
-msgstr "╪╜╦М фдюою╩ ╟М╦ё╪╪©Д"
-
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "╠Б╨╩ю╦╥н фМаЖ╦╕ HTMLгЭ╫дю╦╥н ╨╦Ё©"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "фМаЖ╦╕ ╨╦Ё©"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:88
+#, fuzzy
+msgid "Sending Mail"
+msgstr "фМаЖ╦╕ ╨╦Ё©"
+
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#, fuzzy
+msgid "Sent"
+msgstr "╨╦Ё©"
+
+#: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "Sent and Draft Messages"
+msgstr "╦ч╪╪аЖ╣Ию╩ ╢ы╫ц ╨╦Ё╩╠Б(_R)"
+
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Sent messages folder:"
+msgstr "╦ч╪╪аЖ╦╕ фЗ╢У╥н юЗюЕ"
+
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "╪╜╧Ж ╪Ёа╓"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "╪╜╧Ж а╬╥Ы: "
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "╪╜╧Ж╟║ юнаУю╩ ©Д╠╦гу╢о╢ы"
 
-#: mail/mail-config.glade.h:68
-msgid "Server type:"
-msgstr "╪╜╧Ж а╬╥Ы::"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "╪╜╦М фдюо:"
 
-#: mail/mail-config.glade.h:70
-msgid "Signature:"
-msgstr "╪╜╦М:"
-
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:97
 msgid "Source"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "а╓╨╦ ╬Ью╫"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:73
-msgid "Transport"
-msgstr ""
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Special Folders"
+msgstr "╟║╩С фЗ╢У"
 
-#: mail/mail-config.glade.h:74
-msgid "Transport Authentication"
+#: mail/mail-config.glade.h:101
+msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:75
-msgid "Type"
+#: mail/mail-config.glade.h:103
+msgid "Use secure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr "юл ╪╜╧Ж╦╕ ╟║╦ёеЁ юл╦╖ю╩ аЖа╓го╪╪©Д.╟║╥и \"аВюЕ\"юлЁ╙ ╤г╢б \"аЩ\"."
-
-#: mail/mail-config.glade.h:77
-msgid "User Information"
-msgstr "╩Г©Кюз а╓╨╦"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "╩Г©Кюзюл╦╖:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:84 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
-msgid "_Edit"
-msgstr "╪Жа╓(_E)"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
+msgstr ""
 
-#: mail/mail-config.glade.h:85
-msgid "minutes."
-msgstr "╨п"
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
+msgstr ""
 
-#: mail/mail-config-druid.c:421
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr "цй."
+
+#: mail/mail-crypto.c:60
+msgid "Could not create a PGP signature context."
 msgstr ""
 
-#: mail/mail-config-druid.c:515
-msgid "Namespace:"
+#: mail/mail-crypto.c:86
+msgid "Could not create a PGP verification context."
 msgstr ""
 
-#: mail/mail-config-druid.c:708
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr "╦ч╫цаЖ юш╪╨ ц╒ю╩ ╦╦╣И ╪Ж╟║ ╬Ь╫ю╢о╢ы"
+
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
 msgstr ""
+"%s ╣П╥╨еД╦╝╦╕ ╩Щ╪╨гр ╪Ж╟║ ╬Ь╫ю╢о╢ы:\n"
+"%s"
 
-#. set window title
-#: mail/mail-config-druid.c:1215
-msgid "Evolution Account Wizard"
-msgstr "Evolution ╟Ха╓ ╦╤╧Щ╩Г"
+#: mail/mail-crypto.c:177
+msgid "Could not create a S/MIME signature context."
+msgstr ""
+
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
+msgstr ""
+
+#: mail/mail-crypto.c:240
+msgid "Could not create a S/MIME encryption context."
+msgstr ""
+
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "╦ч╫цаЖ юш╪╨ ц╒ю╩ ╦╦╣И ╪Ж╟║ ╬Ь╫ю╢о╢ы"
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr "╦ч╫цаЖ юш╪╨ ц╒ю╩ ╦╦╣И ╪Ж╟║ ╬Ь╫ю╢о╢ы"
 
-#: mail/mail-display.c:189
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "ц╥╨нфдюо юЗюЕ"
 
-#: mail/mail-display.c:229
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "юс╫ц ╣П╥╨еД╦╝╦╕ ╦╦╣И ╪Ж╟║ ╬Ь╫ю╢о╢ы: %s"
-
-#: mail/mail-display.c:290
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "╣П╫╨е╘╥н юЗюЕ..."
 
-#: mail/mail-display.c:292
+#: mail/mail-display.c:340
+msgid "View Inline"
+msgstr ""
+
+#: mail/mail-display.c:342
 #, c-format
 msgid "Open in %s..."
 msgstr "%s©║╪╜ ©╜╠Б..."
 
-#: mail/mail-display.c:294
-msgid "View Inline"
+#: mail/mail-display.c:399
+#, c-format
+msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:323
+#: mail/mail-display.c:403
+msgid "Hide"
+msgstr "╪Ш╠Х"
+
+#: mail/mail-display.c:424
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:346
+#: mail/mail-display.c:1048
+msgid "Loading message content"
+msgstr "╦ч╫цаЖ Ё╩©Кю╩ юп╬Н╣Е╦╡"
+
+#: mail/mail-display.c:1404
+msgid "Open Link in Browser"
+msgstr ""
+
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "╪╠ецгя╟м ╨╧╩Г"
+
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
+msgstr "фЗ╢У╥н юЗюЕ(_f)... (╟Мд╔©╧а╓)"
+
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "╢ы╦╔ юл╦╖ю╦╥н юЗюЕ..."
+
+#: mail/mail-folder-cache.c:170
 #, c-format
-msgid "View Inline (via %s)"
+msgid "%d new"
 msgstr ""
 
-#: mail/mail-display.c:350
-msgid "Hide"
-msgstr "╪Ш╠Х"
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr " %d цй╦╤╢ы"
 
-#: mail/mail-format.c:506
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s ц╥╨н"
 
-#: mail/mail-format.c:723
-msgid "Loading message content"
-msgstr "╦ч╫цаЖ Ё╩©Кю╩ юп╬Н╣Е╦╡"
+#: mail/mail-format.c:662
+msgid "Could not parse MIME message. Displaying as source."
+msgstr ""
+
+#: mail/mail-format.c:746
+msgid "Date"
+msgstr "Ё╞б╔"
 
-#: mail/mail-format.c:1012
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "юЭюз©ЛфМ аж╪р:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr "╨╦Ё╫юл"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "х╦╫е аж╪р:"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "╧ч╢б╩Г╤В"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "бЭа╤:"
+
+#: mail/mail-format.c:1291
+#, fuzzy
+msgid "No GPG/PGP program configured."
+msgstr "GPG/PGP га╥н╠в╥╔юл ╬Ь╫ю╢о╢ы."
+
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "╬охёх╜╣х ╦ч╫цаЖ╢б ╨╦юлаЖ╬йю╫"
 
-#: mail/mail-format.c:1018
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "╬охёх╜╣х ╦ч╪╪аЖ"
 
-#: mail/mail-format.c:1019
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1088 mail/mail-format.c:1475
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1096 mail/mail-format.c:1483
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1696
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1708
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1712
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1746
+#: mail/mail-format.c:2094
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr ""
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1751
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:335
-#, c-format
-msgid "No such folder %s"
-msgstr "%s╟╟ю╨ фЗ╢У╟║ ╬Ью╫"
-
-#: mail/mail-local.c:508
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "`%s'ю╩(╦╕) ©╜╠Б"
 
-#: mail/mail-local.c:786
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" фЗ╢У╦╕ \"%s\" фВ╦Дю╦╥н ╧ы╡ы╠Б"
 
-#: mail/mail-local.c:790
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "\"%s\" фЗ╢У╦╕ \"%s\" фВ╦Дю╦╥н ╧ы╡ы╠Б"
-
-#: mail/mail-local.c:814
-msgid "Reconfiguring folder"
-msgstr "фЗ╢У юГ╪Ёа╓"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:843
-msgid "Closing current folder"
-msgstr "гЖюГ фЗ╢У ╢щ╢баъ"
-
-#: mail/mail-local.c:875
-msgid "Renaming old folder and opening"
-msgstr "©╧юЭ фЗ╢У╦╕ ╢ы╦╔ юл╦╖ю╦╥н ╧ы╡ы╬Н╪╜ ©╜╠Б"
-
-#: mail/mail-local.c:893
-msgid "Creating new folder"
-msgstr "╩У фЗ╢У╦╕ ╩Щ╪╨"
-
-#: mail/mail-local.c:907
-msgid "Copying messages"
-msgstr "╦ч╪╪аЖ ╨╧╩Г"
-
-#: mail/mail-local.c:928
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:967
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-mt.c:181
+#: mail/mail-local.c:1000
+msgid "You cannot change the format of a non-local folder."
+msgstr ""
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "%s ╪Ёа╓"
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:183
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -5868,96 +7495,105 @@ msgstr ""
 "юш╬В ╪ЖгЮаъ ©║╥╞╟║ ╧ъ╩Щгъ╫ю╢о╢ы:\n"
 "%s"
 
-#: mail/mail-mt.c:506 mail/mail-mt.c:535 mail/mail-mt.c:882
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr ""
 
-#: mail/mail-mt.c:670 mail/session.c:91
-msgid "Do you accept?"
-msgstr "╧ч╬ф╣Июл╟з╫ю╢о╠Н?"
-
-#: mail/mail-mt.c:864
-msgid "Evolution progress"
-msgstr ""
-
-#: mail/mail-ops.c:518
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" ╨╦Ё╩╢б аъ"
 
-#: mail/mail-ops.c:520
-msgid "Sending message"
+#: mail/mail-ops.c:698
+#, fuzzy, c-format
+msgid "Sending message %d of %d"
 msgstr "╦ч╪╪аЖ╦╕ ╨╦Ё©"
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:717
+#, fuzzy, c-format
+msgid "Failed on message %d of %d"
+msgstr "%2$dаъ %1$d╦ч╫цаЖ юЗюЕ (uid \"%3$s\")"
+
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+msgid "Complete."
+msgstr "©о╥А╣й"
+
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "╦ч╪╪аЖ╦╕ фЗ╢У╥н юЗюЕ"
 
-#: mail/mail-ops.c:824
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "╦ч╫цаЖ╣Ию╩ %s╥н юл╣©"
 
-#: mail/mail-ops.c:824
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "╦ч╫цаЖ╣Ию╩ %s╥н ╨╧╩Г"
 
-#: mail/mail-ops.c:841
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "юл╣©аъ"
 
-#: mail/mail-ops.c:844
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "╨╧╩Гаъ"
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:1016
 #, c-format
-msgid "%s message %d of %d (uid \"%s\")"
+msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:926
-#, c-format
-msgid "Scanning folders in \"%s\""
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
 msgstr ""
 
-#: mail/mail-ops.c:1084
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "юЭ╢ч╣х ╦ч╫цаЖ"
 
-#: mail/mail-ops.c:1125 mail/mail-ops.c:1263
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s фЗ╢У╦╕ ©╜╠Б"
 
-#: mail/mail-ops.c:1192
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1379
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "%s фЗ╢У╦╕ ©╜╠Б"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "фЗ╢У юГ╪Ёа╓"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "фЗ╢У ╨Я©Л╠Б"
 
-#: mail/mail-ops.c:1428
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "╦ч╪╪аЖ %s╦╕ ╟║а╝©ю╠Б"
 
-#: mail/mail-ops.c:1495
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "╦ч╪╪аЖ╣Ию╩ ╟║а╝©ю╠Б"
 
-#: mail/mail-ops.c:1505
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1579
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "╦ч╫цаЖ╣Ию╩ юЗюЕ"
 
-#: mail/mail-ops.c:1658
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -5966,12 +7602,7 @@ msgstr ""
 "цБ╥бфдюою╩ ╩Щ╪╨гр ╪Ж╟║ ╬Ь╫ю╢о╢ы: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1671
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "%2$dаъ %1$d╦ч╫цаЖ юЗюЕ (uid \"%3$s\")"
-
-#: mail/mail-ops.c:1685
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5980,11 +7611,11 @@ msgstr ""
 "%s╥н ╦ч╫цаЖ юЗюЕаъ ©ю╥Ы ╧ъ╩Щ:\n"
 " %s"
 
-#: mail/mail-ops.c:1759
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "ц╥╨н юЗюЕ"
 
-#: mail/mail-ops.c:1774
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -5993,409 +7624,1671 @@ msgstr ""
 "цБ╥б фдюою╩ ╦╦╣И╪Ж ╬Ью╫: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1802
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "╣╔юле╦╦╕ ╬╣ ╪Ж╟║ ╬Ь╫ю╢о╢ы: %s"
 
-#: mail/mail-search-dialogue.c:107
-msgid "_Search"
-msgstr "╟к╩Ж(_S)"
+#: mail/mail-ops.c:2101
+#, c-format
+msgid "Disconnecting from %s"
+msgstr ""
+
+#: mail/mail-search.c:138
+#, fuzzy
+msgid "(Untitled Message)"
+msgstr "(а╕╦Я╬Ью╫)"
+
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "╦ч╪╪аЖ юн╪Б"
 
-#: mail/mail-send-recv.c:136
-msgid "Cancelling ..."
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "╦ч╪╪аЖ"
+
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "╦ч╪╪аЖ╦╕ ╨╦Ё©"
+
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-search.c:315
+#, fuzzy
+msgid "Search Forward"
+msgstr "юЭ╢ч"
+
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
+msgstr "цё╠Б"
+
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "╟Ф╥н:"
+
+#: mail/mail-send-recv.c:141
+#, fuzzy
+msgid "Cancelling..."
 msgstr "цК╪рго╢б аъ..."
 
-#: mail/mail-send-recv.c:231
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "фМаЖ аж╟М╧ч╠Б"
 
-#: mail/mail-send-recv.c:234
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "╧ч╬рю╫"
 
-#: mail/mail-send-recv.c:283
-msgid "Updating ..."
+#: mail/mail-send-recv.c:302
+#, fuzzy
+msgid "Updating..."
 msgstr "╟╩╫еаъ ..."
 
-#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
-msgid "Waiting ..."
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#, fuzzy
+msgid "Waiting..."
 msgstr "╠Б╢ы╦╝╢б аъ ..."
 
-#: mail/mail-send-recv.c:304
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "╨╦Ё╩╢б аъ"
 
-#: mail/mail-send-recv.c:469
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "цК╪р╣й."
 
-#: mail/mail-send-recv.c:473
-msgid "Complete."
-msgstr "©о╥А╣й"
-
-#: mail/mail-summary.c:111
-msgid "Incomplete message written on pipe!"
-msgstr ""
+#: mail/mail-session.c:171
+#, fuzzy
+msgid "User canceled operation."
+msgstr "╩Г©Кюз а╓╨╦"
 
-#: mail/mail-tools.c:138
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "юс╫ц mbox `%s'╦╕ ╦╦╣И╪Ж╟║ ╬Ь╫ю╢о╢ы: %s"
 
-#: mail/mail-tools.c:185
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (юЭ╢ч╣х ╦ч╫цаЖ)"
-
-#: mail/mail-tools.c:195
-msgid "Fwd: (no subject)"
-msgstr "юЭ╢ч: (а╕╦Я ╬Ью╫)"
-
-#: mail/mail-tools.c:212
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "юЭ╢ч╣х ╦ч╫цаЖ - %s"
 
-#: mail/mail-tools.c:214
-msgid "Forwarded message (no subject)"
-msgstr "юЭ╢ч╣х ╦ч╫цаЖ (а╕╦Я ╬Ью╫)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "юЭ╢ч╣х ╦ч╫цаЖ"
 
-#: mail/mail-tools.c:411
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----юЭ╢ч ╦ч╫цаЖ-----<br><b>╨╦Ё╫ ╩Г╤В:</b> %s<br><b>╧ч╢б ╩Г╤В:</b> "
-"%s<br><b>а╕╦Я:</b> %s<br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "юЭ╢ч╣х ╦ч╫цаЖ"
 
-#: mail/mail-vfolder.c:248
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "╟║╩С фЗ╢У"
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "╩У ╟║╩СфЗ╢У"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:34
-msgid "Reply"
-msgstr "х╦╫е"
-
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:38
-msgid "Reply to the sender of this message"
-msgstr "юл ╦ч╪╪аЖ╦╕ ╨╦Ё╫╩Г╤В©║╟т х╦╫ею╩ гу╢о╢ы"
-
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:37
-msgid "Reply to all recipients of this message"
-msgstr "юл ╦ч╪╪аЖ╦╕ ╧чю╨ ╦П╣Г ╩Г╤В©║╟т х╦╫ею╩ гу╢о╢ы"
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:16
-msgid "Forward this message"
-msgstr "юл ╦ч╪╪аЖ╦╕ ╢ы╦╔╩Г╤В©║╟т юЭ╢чгу╢о╢ы"
-
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:31
-msgid "Print the selected message"
-msgstr "╪╠ецгя ╦ч╪╪аЖ╦╕ юн╪Бгу╢о╢ы"
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
-msgid "Delete this message"
-msgstr "юл ╦ч╪╪аЖ╦╕ ╩Ха╕гу╢о╢ы"
-
-#: mail/message-list.c:614
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:615
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:616
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:617
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "©╘╥╞╟Ёюг ╨╦аЖ╬йю╨ ╦ч╪╪аЖ"
 
-#: mail/message-list.c:618
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:622
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:623
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:627
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:628
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:878
+#: mail/message-list.c:877
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:885
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "©ю╢ц %l:%M %p"
 
-#: mail/message-list.c:894
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "╬На╕ %l:%M %p"
 
-#: mail/message-list.c:906
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:914
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:916
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:1014
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "╦ч╫цаЖ╣Ию╩ юЗюЕ"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1015
-msgid "From"
-msgstr "╨╦Ё╫юл"
-
-#: mail/message-list.c:1015
-msgid "Date"
-msgstr "Ё╞б╔"
-
-#: mail/message-list.c:1015
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "╧ч╬рю╫"
 
-#: mail/message-list.c:1016
-msgid "To"
-msgstr "╧ч╢б╩Г╤В"
-
-#: mail/message-list.c:1016
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "е╘╠Б"
 
-#: mail/openpgp-utils.c:89
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
+msgid "Folder"
+msgstr "фЗ╢У"
+
+#: mail/subscribe-dialog.c:77
+msgid "Store"
+msgstr ""
+
+#: mail/subscribe-dialog.c:138
+msgid "Display folders starting with:"
+msgstr ""
+
+#: mail/subscribe-dialog.c:168
 #, c-format
-msgid "Please enter your %s passphrase for %s"
+msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/openpgp-utils.c:92
+#: mail/subscribe-dialog.c:271
 #, c-format
-msgid "Please enter your %s passphrase"
+msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/openpgp-utils.c:452 mail/openpgp-utils.c:558 mail/openpgp-utils.c:760
-#: mail/openpgp-utils.c:913 mail/openpgp-utils.c:1071
-msgid "No GPG/PGP program available."
-msgstr "GPG/PGP га╥н╠в╥╔юл ╬Ь╫ю╢о╢ы."
+#: mail/subscribe-dialog.c:273
+#, c-format
+msgid "Unsubscribing to folder \"%s\""
+msgstr ""
 
-#: mail/openpgp-utils.c:459 mail/openpgp-utils.c:567 mail/openpgp-utils.c:767
-#: mail/openpgp-utils.c:920
-msgid "No password provided."
-msgstr "╬охё╦╕ аЖа╓гоаЖ╬й╬р╫ю╢о╢ы."
+#. Construct the app
+#: mail/subscribe-dialog.c:878
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "╠╦╣╤ ╟Э╦╝(_S)..."
 
-#: mail/openpgp-utils.c:467 mail/openpgp-utils.c:574 mail/openpgp-utils.c:773
-#: mail/openpgp-utils.c:928 mail/openpgp-utils.c:1077
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
 msgstr ""
 
-#: mail/openpgp-utils.c:588
-msgid "No recipients specified"
-msgstr "╪Ж╫еюз╟║ аЖа╓╣гаЖ╬йю╫"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr ""
 
-#: mail/openpgp-utils.c:1088
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "юс╫ц фдюою╩ ╦╦╣И╪Ж ╬Ью╫: %s"
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr ""
 
-#: mail/subscribe-dialog.c:73 shell/e-storage-set-view.c:46
-msgid "Folder"
-msgstr "фЗ╢У"
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+#, fuzzy
+msgid "Appointments"
+msgstr "╬Ю╪с"
 
-#: mail/subscribe-dialog.c:74
-msgid "Store"
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "╬Ю╪с ╨╦╠Б"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "©ю╢ц %l:%M %p"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "©ю╢ц %l:%M %p"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "©Д╬Ю"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: mail/subscribe-dialog.c:156
-msgid "Display folders starting with:"
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
 msgstr ""
 
-#: mail/subscribe-dialog.c:186
-#, c-format
-msgid "Getting store for \"%s\""
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
 msgstr ""
 
-#: mail/subscribe-dialog.c:289
-#, c-format
-msgid "Subscribing to folder \"%s\""
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: mail/subscribe-dialog.c:291
-#, c-format
-msgid "Unsubscribing to folder \"%s\""
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "Evolution ╪Ёд║"
+
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "фЗ╢У юл╦╖:"
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>╢ч╥б╦╕ юп╢баъ ©ю╥Ы</b>"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
-msgstr "фЗ╢У а╬╥Ы:"
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "╬В╧╚"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
-msgstr "фЗ╢У ╦╦╣И ╟Вю╩ аЖа╓го╪╪©Д:"
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
 
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:157
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: shell/importer/importer.c:175 shell/importer/importer.c:202
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "╪╫╪г:"
+
+#: my-evolution/e-summary.c:145
+msgid "%A, %d %B %Y"
 msgstr ""
-"%s╦╕ ╟║а╝©ю╢б аъ\n"
-"╬фюлеш %d╦╕ ╟║а╝©х."
 
-#: shell/importer/importer.c:309
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolutionю╨..."
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "╦ч╪╪аЖ юн╪Баъ ╫гфп"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): Bonobo╦╕ цй╠Бх╜ гр ╪Ж ╬Ь╫ю╢о╢ы"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "╨Я©Р"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
 msgstr ""
-"╢ыю╫ю╩ ╟║а╝©ц ╪Жюж╢б ╣╣╠╦╟║ ╬Ь╫ю╢о╢ы\n"
-"%s"
 
-#: shell/importer/importer.c:319
-msgid "Importing"
-msgstr "╟║а╝©ю╠Б"
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
 
-#: shell/importer/importer.c:327
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
+#: my-evolution/metar.c:47
+msgid "Few clouds"
 msgstr ""
-"%sю╩ ╟║а╝©ю╠Б.\n"
-"%s╦╕ ╫цюшгу╢о╢ы"
 
-#: shell/importer/importer.c:342
-#, c-format
-msgid "Error loading %s"
-msgstr "%sю╩(╦╕) юп╢баъ ©ю╥Ы ╧ъ╩Щ"
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
 
-#: shell/importer/importer.c:357
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
 msgstr ""
-"%s╦╕ ╟║а╝©ю╢б аъ\n"
-"╬фюлеш 1ю╩ ╟║а╝©х."
 
-#: shell/importer/importer.c:428
-msgid "Automatic"
-msgstr "юз╣©"
+#: my-evolution/metar.c:63
+msgid "Variable"
+msgstr ""
 
-#: shell/importer/importer.c:478
-msgid "Filename:"
-msgstr "фдюо юл╦╖:"
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "ЁКф╝"
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
-msgid "Select a file"
-msgstr "фдюою╩ ╟М╦ё╪╪©Д"
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
 
-#: shell/importer/importer.c:493
-msgid "File type:"
-msgstr "фдюо а╬╥Ы:"
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "ЁКф╝(_t):"
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
-msgid "Import"
-msgstr "╟║а╝©ю╠Б"
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
 
-#: shell/importer/importer.c:609
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "╨ыюл╠Б"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
 msgstr ""
 
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "Evolutionю╦╥н фдюою╩ ╟║а╝©ю╫г╥а╦И \"╟║а╝©ю╠Б\"╦╕ ╢╘╦ё╪╪©Д."
+#: my-evolution/metar.c:65
+msgid "Southeast"
+msgstr ""
 
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
 msgstr ""
 
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "╢ч"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
 msgstr ""
 
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
+#: my-evolution/metar.c:66
+msgid "Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "ев╫╨ф╝"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "ЁКф╝(_t):"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "╨╦╠Б"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+msgid "Rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Drifting rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "╢ы╫ц цё╠Б"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "гЖюГ"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Moderate snow"
+msgstr "аЖ╠щ ╟╩╫е"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Drifting snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
 msgstr ""
 
-#: shell/e-setup.c:112 shell/e-setup.c:185
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "фМаЖ"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "╢ыюл╬С╥н╠Б ╨╦╠Б"
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "юл╦чюо"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "фМаЖ╦╕ ╧чю╫"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Shallow small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Showers of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+msgid "Unknown precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "╬к ╪Ж╬Ь╢б ©║╥╞"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "х╦юг ╫цюш:"
+
+#. MIST
+#: my-evolution/metar.c:109
+msgid "Mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "╪╪╥н"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Drifting mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "юл ц╒ю╩ ╢щ╫ю╢о╢ы"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+msgid "Smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "╬В╧╚"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "юл ц╒ю╩ ╢щ╫ю╢о╢ы"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "╨╦Ё©"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "╦с╦╝╦╩:"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "Ё╞"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+msgid "Dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Raging tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Thunderous tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+msgid "Add new feed"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "фЗ╢У"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "╦П╣Г бЭ╪╝юз"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "╢ы╦╔ фЗ╢У╦╕ г╔╫ц"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "╨╦╠Б ©и╪г"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "г╔╫ц"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "╠щ©Дюо"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "╪Ж©Дюо"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "╢ч"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr " гяаж╬©"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+msgid "Schedule"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "╬В╧╚"
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "Show full path for folders"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "╬В╧╚"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "юш╬В"
+
+#: my-evolution/my-evolution.glade.h:24
+msgid "Units: "
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "╠Бе╦"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "╪╠ецгя ╨н╨п ╨Я©Р"
+
+#: my-evolution/my-evolution.glade.h:27
+msgid "imperial"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "Evolution ╫╘."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "юз╪╪хВ"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "╧лфц цК╪р"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "╟║╩С фЗ╢У"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Evolution ╪Ёд║"
 
-#: shell/e-setup.c:116
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:117
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "фдюою╩ ╪Ёд║гр╥а╦И \"х╝юн\", Ё║Ё╬╥а╦И \"цК╪р\"╦╕ ╢╘╦ё╪╪©Д."
 
-#: shell/e-setup.c:157
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "а╕╢К╥н фдюо╣Ию╩ ╟╩╫егр ╪Ж╟║ ╬Ь╫ю╢о╢ы"
 
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr "Evolution фдюо╣Июл а╕╢К╥н ╪Ёд║╣г╬З╣г╬З╫ю╢о╢ы."
-
-#: shell/e-setup.c:189
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "юл╧Ьюл evolutionю╩ цЁю╫ю╦╥н ╬╡╫ц╢б ╟еаЖ©Д?"
 
-#: shell/e-setup.c:190
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "Evolution ╩Г©Кюз фдюою╩ ╢ыю╫©║ ╪Ёд║го╫г╥а╦И \"х╝юн\"ю╩ ╢╘╦ё╪╪©Д"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6405,16 +9298,14 @@ msgstr ""
 "%s ╣П╥╨еД╦╝╦╕\n"
 "╩Щ╪╨гр ╪Ж╟║ ╬Ь╫ю╢о╢ы©║╥╞: %s"
 
-#: shell/e-setup.c:224
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
-msgstr ""
-"`%s'╥н фдюою╩\n"
-"╨╧╩Ггр ╪Ж╟║ ╬Ь╫ю╢о╢ы."
+msgstr "фдюою╩ юп╢б ╣╣аъ ©║╥╞ ╧ъ╩Щ"
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6422,7 +9313,16 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:261
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6430,7 +9330,58 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:96
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "фЗ╢У╦╕ ╬Рю╩╪Ж ╬Ь╫ю╢о╢ы: %s: %s"
+
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"`%s'╥н фдюою╩\n"
+"╨╧╩Ггр ╪Ж╟║ ╬Ь╫ю╢о╢ы."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "фЗ╢У╥н ╨╧╩Г"
+
+#: shell/e-shell-folder-commands.c:313
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "фЗ╢У╥н юл╣©"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "фЗ╢У ╪╠ец"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "а╓╦╩╥н юш╬В `%s'╦╕ аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "%s фЗ╢У╦╕ ©╜╠Б"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -6439,41 +9390,139 @@ msgstr ""
 "╦М╫ц╣х фЗ╢У╦╕ ╩Щ╪╨гр ╪Ж ╬Ь╫ю╢о╢ы:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:153
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "аЖа╓го╫е фЗ╢Уюг юл╦╖юл юШюЩгоаЖ╬й╫ю╢о╢ы"
 
-#: shell/e-shell-folder-creation-dialog.c:245
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - ╩У фЗ╢У ╩Щ╪╨"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:318
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "╩У╥н©Н..."
 
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(а╕╦Я╬Ью╫)"
 
-#: shell/e-shell-view-menu.c:160
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"%s╦╕ ╟║а╝©ю╢б аъ\n"
+"╬фюлеш %d╦╕ ╟║а╝©х."
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"╢ыю╫ю╩ ╟║а╝©ц ╪Жюж╢б ╣╣╠╦╟║ ╬Ь╫ю╢о╢ы\n"
+"%s"
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr "╟║а╝©ю╠Б"
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"%sю╩ ╟║а╝©ю╠Б.\n"
+"%s╦╕ ╫цюшгу╢о╢ы"
+
+#: shell/e-shell-importer.c:383
+#, fuzzy, c-format
+msgid "Error starting %s"
+msgstr "%sю╩(╦╕) юп╢баъ ©ю╥Ы ╧ъ╩Щ"
+
+#: shell/e-shell-importer.c:402
+#, c-format
+msgid "Error loading %s"
+msgstr "%sю╩(╦╕) юп╢баъ ©ю╥Ы ╧ъ╩Щ"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"%s╦╕ ╟║а╝©ю╢б аъ\n"
+"╬фюлеш 1ю╩ ╟║а╝©х."
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr "юз╣©"
+
+#: shell/e-shell-importer.c:538
+msgid "Filename:"
+msgstr "фдюо юл╦╖:"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "фдюою╩ ╟М╦ё╪╪©Д"
+
+#: shell/e-shell-importer.c:553
+msgid "File type:"
+msgstr "фдюо а╬╥Ы:"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "фЗ╢У ╪╠ец"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "╫ц╫╨ешюг ╟Ф╥н©║ Bug buddy╦╕ цёю╩╪Ж ╬Ь╫ю╢о╢ы."
 
-#: shell/e-shell-view-menu.c:166
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy╦╕ ╫ггЮгр╪Ж ╬Ь╫ю╢о╢ы."
 
-#: shell/e-shell-view-menu.c:195
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:197
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -6483,34 +9532,71 @@ msgstr ""
 "юоа╓, ©╛╤ТцЁ ╟Э╦╝╦╕ го╢б ╠в╥Л©Ч╬Н юю©Кга╥н╠в╥╔\n"
 "╦Пю╫ ют╢о╢ы."
 
-#: shell/e-shell-view-menu.c:361
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "фЗ╢У юл╣©..."
 
-#: shell/e-shell-view.c:143
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "╩У ╢эцЮ╠в╥Лю╩ ╩Щ╪╨"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
+msgstr "©юга╤Сюн©║╪╜ юш╬В"
+
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
+msgstr "©юга╤Сюн©║╪╜ юш╬В"
+
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr "(г╔╫ц╣х фЗ╢У╟║ ╬Ью╫)"
 
-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "фЗ╢У"
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolutionю╨..."
 
-#: shell/e-shell-view.c:1125
+#: shell/e-shell-view.c:1411
 #, c-format
 msgid "%s - Evolution %s"
 msgstr ""
 
-#: shell/e-shell-view.c:1127
+#: shell/e-shell-view.c:1413
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr ""
 
-#: shell/e-shell.c:372
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "╫ц╫╨еш юЗюЕюЕд║╦╕ аЖа╓гр╪Ж ╬Ь╫ю╢о╢ы -- %s"
 
-#: shell/e-shell.c:1242
+#: shell/e-shell.c:1311
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6519,15 +9605,15 @@ msgstr ""
 "ба!! `%s' ╨Д╟║ ╦╩╣╣ ╬Ьюл ав╬ЗЁв©Д :-(\n"
 "%s ддфВЁмф╝╟║ ╩Г╦аго╫е╟е ╟╟╫ю╢о╢ы."
 
-#: shell/e-shortcuts-view.c:123
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "╩У ╢эцЮ╠в╥Лю╩ ╩Щ╪╨"
 
-#: shell/e-shortcuts-view.c:126
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "╠в╥Л юл╦╖:"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -6536,150 +9622,269 @@ msgstr ""
 "╢эцЮ ╦╥╢К╥н╨нем `%s'╠в╥Лю╩\n"
 "а╓╦╩╥н аЖ©Л╫ц╟з╫ю╢о╠Н?"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "аЖ©ЛаЖ╦╤╪╪©Д"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "юл ╢эцЮ╠в╥Лю╩ а╕╟е"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "юл ╢эцЮ╠в╥Лю╩ а╕╟е"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "юшю╨ ╬фюлдэ(_S)"
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "юшю╨ ╬фюлдэю╦╥н ╢эцЮ╦╥╢К ╨╦╠Б"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "е╚ ╬фюлдэ(_L)"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "е╚ ╬фюлдэю╦╥н ╢эцЮ╦╥╢К ╨╦╠Б"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "╩У ╠в╥Л(_N)..."
 
-#: shell/e-shortcuts-view.c:281
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "╩У ╢эцЮ╠в╥Лю╩ ╩Щ╪╨"
 
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
-msgstr ""
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
+msgstr "юл ╢эцЮ╠в╥Лю╩ а╕╟е"
 
-#: shell/e-shortcuts-view.c:284
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "юл ╢эцЮ╠в╥Лю╩ а╕╟е"
 
-#: shell/e-shortcuts-view.c:289
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "╩У ╠в╥Л(_N)..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "юл ╢эцЮ╠в╥Лю╩ а╕╟е"
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "╢эцЮ ╦╥╢К ╟╗цъ╠Б(_H)"
 
-#: shell/e-shortcuts-view.c:290
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "╢эцЮ ╦╥╢К╦╕ ╟╗цЦ╢о╢ы"
 
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "х╟╪╨"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "юл ╢эцЮ╠в╥Лю╩ а╕╟е"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "юл ╢эцЮ╠в╥Лю╩ а╕╟е"
+
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "©╜╠Б"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
 
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:377
+#: shell/e-shortcuts-view.c:476
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "╠тд╒ юл╦╖: "
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "юл ╢эцЮ╠в╥Лю╩ а╕╟е"
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:375
+#: shell/e-shortcuts.c:585
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-storage-set-view.c:617 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
-msgid "_View"
-msgstr "╨╦╠Б(_V)"
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "╢эцЮ ╦╥╢К(_S)"
 
-#: shell/e-storage-set-view.c:617
-msgid "View the selected folder"
-msgstr "╪╠ец╣х фЗ╢У ╨╦╠Б"
+#: shell/e-shortcuts.c:984
+msgid "Inbox"
+msgstr ""
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "©╛╤ТцЁ(_C)"
 
-#: shell/e-storage.c:178
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(юл╦╖ ╬Ью╫)"
 
-#: shell/e-storage.c:429
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "©║╥╞ ╬Ью╫"
 
-#: shell/e-storage.c:431
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "юо╧щ ©ю╥Ы"
 
-#: shell/e-storage.c:433
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "╟╟ю╨ юл╦╖юг фЗ╢У╟║ юл╧л а╦юГгу╢о╢ы"
 
-#: shell/e-storage.c:435
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "аЖа╓╣х фЗем гЭ╫дюл ©ц╧ы╦ёаЖ ╬й╫ю╢о╢ы"
 
-#: shell/e-storage.c:437
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "ютцБ╥б ©ю╥Ы"
 
-#: shell/e-storage.c:439
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "фЗ╢У╦╕ ╦╦╣И╠Б©║ цФ╨пгя ╟Ь╟ёюл ╬Ью╫"
 
-#: shell/e-storage.c:441
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "аЖа╓╣х фЗ╢У╦╕ цёю╩╪Ж ╬Ь╫ю╢о╢ы"
 
-#: shell/e-storage.c:443
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:445
-msgid "Permission denied"
-msgstr "гЦ╟║╠г ╟е╨н"
-
-#: shell/e-storage.c:447
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "юш╣©юл аЖ©Ь╣гаЖ ╬йю╫"
 
-#: shell/e-storage.c:449
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "юл юЗюЕ╦ец╪©║ аЖа╓╣х гЭ╫дюл аЖ©Ь╣гаЖ ╬й╫ю╢о╢ы"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "Evolution ╫╘."
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
+
+#: shell/e-task-widget.c:173
+#, fuzzy
+msgid "%s (%d%% complete)"
+msgstr "% ©о╥А(_p):"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "╣©юш ╪╠ец"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "хё╫╨ф╝:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "фЗ╢У юл╦╖:"
 
-#: shell/main.c:74
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder type:"
+msgstr "фЗ╢У а╬╥Ы:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Specify where to create the folder:"
+msgstr "фЗ╢У ╦╦╣И ╟Вю╩ аЖа╓го╪╪©Д:"
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr "Evolutionю╦╥н фдюою╩ ╟║а╝©ю╫г╥а╦И \"╟║а╝©ю╠Б\"╦╕ ╢╘╦ё╪╪©Д."
+
+#: shell/importer/import.glade.h:2
+msgid "Evolution Import Utility"
+msgstr ""
+
+#: shell/importer/import.glade.h:3
+msgid "Evolution Importer Utility"
+msgstr ""
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+
+#: shell/importer/intelligent.c:191
+#, fuzzy
+msgid "Importers"
+msgstr "╟║а╝©ю╠Б"
+
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "аЖ©ЛаЖ╦╤╪╪©Д"
+
+#: shell/importer/intelligent.c:199
+#, fuzzy
+msgid "Don't ask me again"
+msgstr "юл ╦ч╪╪аЖ╦╕ ╢ы╫ц ╨╪ ╪Ж ╬Ь╫ю╢о╢ы"
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
 #, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:99
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -6687,239 +9892,324 @@ msgstr ""
 "╟╗╩Ггу╢о╢ы\n"
 "Evolution фю\n"
 
-#: shell/main.c:130
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "Evolution ╫╘ю╩ цй╠Бх╜ гр╪Ж ╬Ь╫ю╢о╢ы."
 
-#: shell/main.c:176
-msgid "Disable."
+#: shell/main.c:215
+msgid "Disable splash screen"
+msgstr ""
+
+#: shell/main.c:216
+msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:196
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "╨╦ЁК╨╦ ддфВЁмф╝ ╫ц╫╨ешю╩ цй╠Бх╜ гр╪Ж ╬Ь╫ю╢о╢ы."
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "╨╧╩Г"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
+msgstr "╪╠ецгя╟м ╨╧╩Г"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "╩У╥н©Н ©╛╤ТцЁ╦╕ ╦╦╣Г╢ы"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "©╛╤ТцЁ╦╕ аЖ©Н╢ы"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "╩У╥н©Н ©╛╤ТцЁ╦╕ ╦╦╣Г╢ы"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "цё╠Б"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "юз╦ё╠Б"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "©╛╤ТцЁ цё╬ф╨╩╢ы"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr "╪╠ецгя╟м юз╦╖"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "©╛╤ТцЁ╦╕ аЖ©Н╢ы"
+
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "╩У ©╛╤ТцЁ"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:22
-#: ui/evolution-mail.xml.h:27
-msgid "Previews the message to be printed"
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New list"
+msgstr "╢╨╫╨"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "╨ыюл╠Б"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "е╛╦Ё╨╦╣Е©║╪╜ ╨ы©╘Ёж╠Б"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
 msgstr "юн╪Б╣и ╦ч╫цаЖ╦╕ ╧л╦╝╨╬╢о╢ы"
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "©╛╤ТцЁ╦╕ юн╪Бгу╢о╢ы"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:47
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "юЭ╨н ╪╠ец"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "©╛╤ТцЁ╦╕ аЖ©Н╢ы"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "аъаЖ"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "цК╪р"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "╦П╣н ╨╦╠Б"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "╦П╣Г ©╛╤ТцЁ ╨╦╠Б"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "©╛╤ТцЁ(_C)"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "©╛╤ТцЁ(_C)"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "юн╪Б(_P)..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "©╛╤ТцЁ цё╠Б(_S)"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:77
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:42
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
+msgstr "юЭ╨н ╪╠ец(_S)"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "╣╣╠╦(_T)"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "╢Е╩У╬©"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "╪Ёа╓ю╩ ╨╞╟Фгу╢о╢ы"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a new all day Event"
-msgstr ""
+#, fuzzy
+msgid "Create a New All-Day _Event"
+msgstr "╩У╥н©Н ╬Ю╪с╦╕ ╦╦╣Г╢ы"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "╩У╥н©Н ╬Ю╪с╦╕ ╦╦╣Г╢ы"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "╩У ╢ч╥бю╩ ╦╦╣Л╢о╢ы"
+msgid "Create a new appointment"
+msgstr "╩У╥н©Н ╬Ю╪с╦╕ ╦╦╣Г╢ы"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
+msgid "Create an event for the whole day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "╟║╠Б"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "╫ц╟ё╩Сю╦╥н ╣з╥н ╟║╠Б"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "╫ц╟ё╩Сю╦╥н ╬ую╦╥н ╟║╠Б"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "Ё╞б╔╥н юл╣©(_D)"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
-msgstr "©ю╢ц╥н юл╣©(_T)"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "аЖа╓гя Ё╞╥н ╟║╠Б"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "гЖюГ ╫ц╟ёю╦╥н юл╣©"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "╢ч"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr ""
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "╩У ╬Ю╪с"
 
-#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "╢ыю╫"
+#: ui/evolution-calendar.xml.h:18
+#, fuzzy
+msgid "Previews the calendar to be printed"
+msgstr "юн╪Б╣и ╦ч╫цаЖ╦╕ ╧л╦╝╨╬╢о╢ы"
 
 #: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "╢ч╥б ©╜╠Б"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "юлюЭ"
-
-#: ui/evolution-calendar.xml.h:25
 msgid "Print calendar"
 msgstr "╢ч╥б юн╪Бго╠Б"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "гЖюГюг ╢ч╥бю╩ юн╪Бгу╢о╢ы"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "╢ы╦╔юл╦╖ю╦╥н юЗюЕ"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "╩Г©Кюз а╓╨╦"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "╢ч╥бю╩ ╢ы╦╔ ╟мю╦╥н юЗюЕгу╢о╢ы"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "го╥Г╬© ╨╦╠Б"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "гя╢ч╬© ╨╦╠Б"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "гяаж╬© ╨╦╠Б"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:223
-#: widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "©ю╢ц"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "аж"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "╬Ю╪с(_A)"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "╦чюо ╪Ёа╓(_M)..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "╢ч(_M)"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
-msgid "_New"
-msgstr "╩У╥н©Н(_N)"
+#: ui/evolution-calendar.xml.h:37
+msgid "_Week"
+msgstr "аж(_W)"
 
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "╢ч╥б ©╜╠Б(_O)"
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "╢щ╠Б"
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:74
-#: ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "╢ы╦╔юл╦╖ю╦╥н юЗюЕ(_S)..."
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "юл ╬Ю╪сю╩ ╢щ╫ю╢о╢ы"
 
-#: ui/evolution-calendar.xml.h:45
-msgid "_Week"
-msgstr "аж(_W)"
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "юл ╬Ю╪сю╩ ╩Ха╕гу╢о╢ы"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "юн╪Б╣и ╦ч╫цаЖ╦╕ ╧л╦╝╨╬╢о╢ы"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "юн╪Б ╧л╦╝╨╦╠Б(_v)"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "юн╪Б ╪Ёа╓"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "юл гв╦Яю╩ юн╪Б"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "юн╪Б..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "юЗюЕхд ╦╤д╖"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "╬Ю╪сю╩ юЗюЕгяхд ╢ыюл╬С╥н╠в╦╕ ╢щ╢б╢ы"
+
+#: ui/evolution-comp-editor.xml.h:17
+#, fuzzy
+msgid "Save this item to disk"
+msgstr "╨Д╦╕ %s╥н ╨╞╟Ф"
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "гЮ╣©(_A)"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "фдюо(_F)"
 
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "юл гв╦Я╦╕ ╩Ха╕гу╢о╢ы"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "╩Ха╕..."
 
@@ -6931,27 +10221,12 @@ msgstr "╣╣©Р╦╩"
 msgid "Print En_velope..."
 msgstr "╨юеУ юн╪Б(_v)..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "юл гв╦Яю╩ юн╪Б"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:32 ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "юн╪Б..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "╢ы╦╔юл╦╖ю╦╥н юЗюЕ(_A)..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "юЗюЕхд ╦╤д╖"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "╬Ю╪сю╩ юЗюЕгяхд ╢ыюл╬С╥н╠в╦╕ ╢щ╢б╢ы"
@@ -6968,795 +10243,993 @@ msgstr "©б╤Сюн ╣╣©Р╦╩ю╩ ╨╦©╘аь╢ы"
 msgid "Send _message to contact..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
-msgid "_File"
-msgstr "фдюо(_F)"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "юЗюЕ(_S)"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "юл юю©Кга╥н╠в╥╔©║ ╢Кго©╘"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "юл гв╦Я╦╕ ╩Ха╕гу╢о╢ы"
+
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "юш╬Вю╩ юЗюЕгяхд ╢ыюл╬С╥н╠в╦╕ ╢щ╢б╢ы"
+
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "╢ы╦╔ юл╣Ию╩ цй╢К(_I)..."
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "юл га╥н╠в╥╔ю╨..."
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "╢ы╦╔юл╦╖ю╦╥н ╦ч╪╪аЖ юЗюЕ..."
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "гЮ╣©(_n)"
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "╧лфц цК╪р"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+msgid "Cancel the meeting for this item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "╨Я©Р(_l)"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Forward as i_Calendar"
+msgstr "╢ч╥б ╨р╥╞╣Июл╠Б"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "юз╦ё╠Б(_u)"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "юл ╦ч╪╪аЖ╦╕ ╢ы╦╔╩Г╤В©║╟т юЭ╢чгу╢о╢ы"
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "╨Я©Р"
-
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "╪╠ецгя ╨н╨п ╨Я©Р"
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr "╧лфц цК╪р"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "юл ╬Ю╪сю╩ ╢щ╫ю╢о╢ы"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "фЗ╢У╥н ╨╧╩Г..."
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+msgid "Schedule a meeting for this item"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "╨╧╩Г"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "гЮ╣©(_A)"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "╪╠ецгя╟м ╨╧╩Г"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "Evolutionю╨..."
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "юз╦ё╠Б"
+#: ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "цК╪р╣й"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "╪╠ецгя╟м юз╦╖"
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "гЖюГ фдюою╩ юЗюЕ"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "юл ╬Ю╪сю╩ ╩Ха╕гу╢о╢ы"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "фМаЖ юш╪╨"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "XML╥н ╢Щга"
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "╩У ╦ч╪╪аЖ╦╕ юш╪╨гу╢о╢ы"
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "╟Мд╔©╧а╓: фЗ╢Уюг ц╧б╟гв╦Я(_r)"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "юш╬В(_T) (╟Мд╔©╧а╓)"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "╢ыю╫ гв╦Яю╦╥н юл╣©"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "╠Б╬О╣х ╬охё ╧Ж╦╝╠Б"
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "юлюЭ гв╦Яю╦╥н юл╣©"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "юш╬В(_T) (╟Мд╔©╧а╓)"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
+msgstr "╠╦╣╤ ╟Э╦╝(_S)..."
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "╢ыю╫(_e)"
+#: ui/evolution-mail-global.xml.h:13
+msgid "Permanently remove all deleted messages from all folders"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "╨ыюл╠Б"
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send / Receive"
+msgstr "╨╦Ё╩╟М ╧ч╠Б"
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "е╛╦Ё╨╦╣Е©║╪╜ ╨ы©╘Ёж╠Б"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "╧п╦╟ фМаЖ╦╕ ╨╦Ё╩╟М ╩У фМаЖ╦╕ ╟║а╝©б╢ы"
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "юлюЭ(_v)"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "юлюЭ"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "юн╪Б ╧л╦╝╨╦╠Б(_v)"
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
+msgstr "╟║╩С фЗ╢У фМаЩ╠Б(_E)..."
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "юн╪Б ╪Ёа╓(_e)..."
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
+msgstr "фМаЖ ╟е╦ё╟Ё(_F)..."
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "юн╪Б ╪Ёа╓"
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr "фМаЖ ╦ч╪╪аЖ(_M)"
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
-msgid "Save"
-msgstr "юЗюЕ"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "╦чюо ╪Ёа╓(_M)..."
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "╬Ю╪сю╩ юЗюЕгяхд ╢ыюл╬С╥н╠в╦╕ ╢щ╢б╢ы"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "╧л╦╝╨╦╠Б"
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "гЖюГ фдюою╩ юЗюЕ"
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
+msgstr "╨╦Ё╩╟М ╧ч╠Б(_S)"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr ""
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "╪╠ец╣х ╦ч╪╪аЖ ╪Ш╠Х(_S)"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "юЭ╨н ╪╠ец"
+#: ui/evolution-mail-list.xml.h:5
+#, fuzzy
+msgid "Cut selected messages"
+msgstr "╪╠ецгя ╦ч╪╪аЖ╦╕ юн╪Бгу╢о╢ы"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "юЭц╪╦╕ ╪╠ецгу╢о╢ы"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "╪╠ец╣х ╦ч╪╪аЖ ╪Ш╠Х(_S)"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr ""
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "╩Ха╕╣х ╦ч╪╪аЖ ╪Ш╠Х(_D)"
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
+msgstr "юпю╨ ╦ч╪╪аЖ ╪Ш╠Х(_R)"
+
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "юл га╥н╠в╥╔ю╨(_A)..."
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "юЭ╨н╦╕ юпю╨ ╟мю╦╥н г╔╫ц(_e)"
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
-msgid "_Close"
-msgstr "╢щ╠Б(_C)"
+#: ui/evolution-mail-list.xml.h:11
+msgid "Mark all visible messages as read"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:28
-msgid "_Contact (FIXME)"
-msgstr "©╛╟А(_C) (╟Мд╔©╧а╓)"
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "е╛╦Ё╨╦╣Е©║╪╜ ╨ы©╘Ёж╠Б"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "╨╧╩Г(_C)"
+#: ui/evolution-mail-list.xml.h:14
+msgid "Permanently remove all deleted messages from this folder"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "╣П╧Ж╠К(_D)"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "юЭ╨н ╪╠ец(_A)"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
-msgid "_Help"
-msgstr "╣╣©Р╦╩(_H)"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "╠ше╦╥║ ╪╠ец(_T)"
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr ""
+#: ui/evolution-mail-list.xml.h:19
+#, fuzzy
+msgid "Select all visible messages"
+msgstr "юл ╦ч╪╪аЖ╦╕ ╩Ха╕гу╢о╢ы"
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "фМаЖ ╦ч╫цаЖ(_M) (╪Ж╦╝аъ)"
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "╦П╣н ╨╦╠Б(_A)"
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "фЗ╢У╥н юл╣©(_M)..."
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
+#: ui/evolution-mail-list.xml.h:22
+msgid "Temporarily hide all messages that have already been read"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "╨ыюл╠Б(_P)"
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "╪╠ецгя ╦ч╪╪аЖ╦╕ юн╪Бгу╢о╢ы"
 
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "юн╪Б(_P)"
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "©╛╟Э╣х ╦ч╪╪аЖ ╦Я╥о"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:70
-#: ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "а╕╟е(_E)"
+
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "фЗ╢У(_F)"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "╪╠ец ╧щюЭ(_I)"
+
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Properties..."
 msgstr "╪Ёа╓(_P)..."
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "юЭ╨н ╪╠ец(_S)"
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "©╛╟Э╣х ╦ч╪╪аЖ ╦Я╥о"
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:41
-msgid "_Task (FIXME)"
-msgstr "юш╬В(_T) (╟Мд╔©╧а╓)"
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "Apply filter rules to the selected messages"
+msgstr "╪╠ецгя ╦ч╪╪аЖ╦╕ юн╪Бгу╢о╢ы"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "юл ╦ч╪╪аЖ╦╕ ╧чю╨ ╦П╣Г ╩Г╤В©║╟т х╦╫ею╩ гу╢о╢ы"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
+msgid "Compose a reply to the sender of the selected message"
+msgstr "юл ╦ч╪╪аЖ╦╕ ╨╦Ё╫╩Г╤В©║╟т х╦╫ею╩ гу╢о╢ы"
+
+#: ui/evolution-mail-message.xml.h:6
+#, fuzzy
+msgid "Copy selected messages to another folder"
+msgstr "╦ч╪╪аЖ╦╕ ╩У фЗ╢У╥н ╨╧╩Ггу╢о╢ы"
+
+#: ui/evolution-mail-message.xml.h:7
+msgid "Create _Virtual Folder From Message"
+msgstr "╦ч╫цаЖ╥н╨нем ╟║╩С фЗ╢У ╩Щ╪╨(_V)"
+
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "╩У фМаЖ╦╕ юш╪╨гу╢о╢ы"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "╩У фМаЖ"
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:1
-msgid "Compose"
-msgstr "фМаЖ юш╪╨"
+#: ui/evolution-mail-message.xml.h:12
+#, fuzzy
+msgid "Create a virtual folder for these recipients"
+msgstr "╦ч╫цаЖ╥н╨нем ╟║╩С фЗ╢У ╩Щ╪╨(_V)"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Compose a new message"
-msgstr "╩У ╦ч╪╪аЖ╦╕ юш╪╨гу╢о╢ы"
+#: ui/evolution-mail-message.xml.h:13
+#, fuzzy
+msgid "Create a virtual folder for this mailing list"
+msgstr "╦ч╫цаЖ╥н╨нем ╟║╩С фЗ╢У ╩Щ╪╨(_V)"
 
-#: ui/evolution-mail.xml.h:4
-msgid "Copy message to a new folder"
-msgstr "╦ч╪╪аЖ╦╕ ╩У фЗ╢У╥н ╨╧╩Ггу╢о╢ы"
+#: ui/evolution-mail-message.xml.h:14
+#, fuzzy
+msgid "Create a virtual folder for this sender"
+msgstr "╦ч╫цаЖ╥н╨нем ╟║╩С фЗ╢У ╩Щ╪╨(_V)"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Create _Virtual Folder From Message"
+#: ui/evolution-mail-message.xml.h:15
+#, fuzzy
+msgid "Create a virtual folder for this subject"
 msgstr "╦ч╫цаЖ╥н╨нем ╟║╩С фЗ╢У ╩Щ╪╨(_V)"
 
-#: ui/evolution-mail.xml.h:8
-msgid "Display all of the message headers"
+#: ui/evolution-mail-message.xml.h:17
+#, fuzzy
+msgid "Display the next important message"
+msgstr "юл ╦ч╪╪аЖ╦╕ ╨╦Ё╫╩Г╤В©║╟т х╦╫ею╩ гу╢о╢ы"
+
+#: ui/evolution-mail-message.xml.h:18
+#, fuzzy
+msgid "Display the next message"
 msgstr "╦П╣Г ╦ч╫цаЖ гЛ╢У ╨╦юл╠Б"
 
-#: ui/evolution-mail.xml.h:9
-msgid "Empty _Trash"
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
+msgstr "╪╠ецгя ╦ч╪╪аЖ╦╕ юн╪Бгу╢о╢ы"
+
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:21
+msgid "Display the previous important message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:22
+#, fuzzy
+msgid "Display the previous message"
+msgstr "юл ╦ч╪╪аЖ╦╕ ╩Ха╕гу╢о╢ы"
+
+#: ui/evolution-mail-message.xml.h:23
+msgid "Display the previous unread message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:10
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
+msgstr "╦чюо╦╣ ╦╝╫╨ф╝©║╢Кгя гйем"
+
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "╧ъ╪шюн©║╢Кгя ╟е╦ё╟т(_n)"
 
-#: ui/evolution-mail.xml.h:11
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "╪Ж╫еюн©║╢Кгя ╟е╦ё╟т(_R)"
 
-#: ui/evolution-mail.xml.h:12
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "а╕╦Я©║╢Кгя ╟е╦ё╟т(_S)"
 
-#: ui/evolution-mail.xml.h:13
-msgid "Forget _Passwords"
-msgstr "╠Б╬О╣х ╬охё ╧Ж╦╝╠Б"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "юЭ╢ч"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "╢ы╦╔ аж╪р╥н юЭ╢ч"
 
-#: ui/evolution-mail.xml.h:17
-msgid "Full _Headers"
-msgstr "╦П╣Г гЛ╢У ╨╦╠Б(_H)"
+#: ui/evolution-mail-message.xml.h:31
+#, fuzzy
+msgid "Forward _Attached"
+msgstr "╢ы╦╔ аж╪р╥н юЭ╢ч"
 
-#: ui/evolution-mail.xml.h:18
-msgid "Hide S_elected Messages"
-msgstr "╪╠ец╣х ╦ч╪╪аЖ ╪Ш╠Х(_S)"
+#: ui/evolution-mail-message.xml.h:32
+#, fuzzy
+msgid "Forward _Inline"
+msgstr "╢ы╦╔ аж╪р╥н юЭ╢ч"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Hide _Deleted Messages"
-msgstr "╩Ха╕╣х ╦ч╪╪аЖ ╪Ш╠Х(_D)"
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Forward _Quoted"
+msgstr "╢ы╦╔ аж╪р╥н юЭ╢ч"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Hide _Read messages"
-msgstr "юпю╨ ╦ч╪╪аЖ ╪Ш╠Х(_R)"
+#: ui/evolution-mail-message.xml.h:34
+msgid "Forward the selected message in the body of a new message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:21
-msgid "Manage _Subscriptions..."
-msgstr "╠╦╣╤ ╟Э╦╝(_S)..."
+#: ui/evolution-mail-message.xml.h:35
+msgid "Forward the selected message quoted like a reply"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:22
-msgid "Mar_k as Read"
-msgstr "юпю╨ ╟мю╦╥н г╔╫ц(_k)"
+#: ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward the selected message to someone"
+msgstr "╪╠ецгя ╦ч╪╪аЖ╦╕ юн╪Бгу╢о╢ы"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Mark All as R_ead"
-msgstr "юЭ╨н╦╕ юпю╨ ╟мю╦╥н г╔╫ц(_e)"
+#: ui/evolution-mail-message.xml.h:37
+msgid "Forward the selected message to someone as an attachment"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:24
-msgid "Mark as U_nread"
-msgstr "юпаЖ ╬йю╨ ╟мю╦╥н г╔╫ц(_n)"
+#: ui/evolution-mail-message.xml.h:39
+#, fuzzy
+msgid "Load _Images"
+msgstr "юЭ╢ч╣х ╦ч╫цаЖ"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "аъ©Д"
+
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
+msgstr "юпаЖ ╬йю╨ ╟мю╦╥н г╔╫ц"
+
+#: ui/evolution-mail-message.xml.h:44
+#, fuzzy
+msgid "Mark the selected messages as having been read"
+msgstr "╪╠ецгя ╦ч╪╪аЖ╦╕ юн╪Бгу╢о╢ы"
+
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "╪╠ецгя ╦ч╪╪аЖ╦╕ юн╪Бгу╢о╢ы"
+
+#: ui/evolution-mail-message.xml.h:46
+msgid "Mark the selected messages as not having been read"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "╪╠ецгя ╦ч╪╪аЖ╦╕ юн╪Бгу╢о╢ы"
+
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "╪╠ецгя ╦ч╪╪аЖ╦╕ юн╪Бгу╢о╢ы"
+
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "юл╣©"
 
-#: ui/evolution-mail.xml.h:26
-msgid "Move message to a new folder"
+#: ui/evolution-mail-message.xml.h:50
+#, fuzzy
+msgid "Move selected messages to another folder"
 msgstr "╦ч╪╪аЖ╦╕ ╩У фЗ╢У╥н юл╣©гу╢о╢ы"
 
-#: ui/evolution-mail.xml.h:30
-msgid "Print message to the printer"
-msgstr "╦ч╫цаЖ юн╪Б"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "╢ыю╫"
 
-#: ui/evolution-mail.xml.h:33
-msgid "Redirect (FIXME: implement me)"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "юл ╦ч╪╪аЖ╦╕ ╨╦Ё╫╩Г╤В©║╟т х╦╫ею╩ гу╢о╢ы"
 
-#: ui/evolution-mail.xml.h:36
-msgid "Reply to _All"
-msgstr "юЭц╪ х╦╫е(_A)"
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "╦ч╪╪аЖ"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "╠ше╦╥║ ╪╠ец(_T)"
 
-#: ui/evolution-mail.xml.h:39
-msgid "S_ource"
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "╦ч╪╪аЖ юн╪Б"
+
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Open the selected message in a new window"
+msgstr "╪╠ецгя ╦ч╪╪аЖ╦╕ юн╪Бгу╢о╢ы"
+
+#: ui/evolution-mail-message.xml.h:57
+msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:40 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "юЭ╨н ╪╠ец(_A)"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "юн╪Б╣и ╦ч╫цаЖ╦╕ ╧л╦╝╨╬╢о╢ы"
 
-#: ui/evolution-mail.xml.h:41
-msgid "Select _Thread"
-msgstr "╠ше╦╥║ ╪╠ец(_T)"
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "юлюЭ"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Send / Receive"
-msgstr "╨╦Ё╩╟М ╧ч╠Б"
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "╦ч╪╪аЖ юн╪Б"
 
-#: ui/evolution-mail.xml.h:43
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
-msgstr ""
-"╧п╦╟ фМаЖ╦╕ ╨╦Ё╩╟М\n"
-"  ╩У фМаЖ╦╕ ╟║а╝©б╢ы"
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "╦ч╪╪аЖ юн╪Б"
 
-#: ui/evolution-mail.xml.h:45
-msgid "Send queued mail and retrieve new mail"
-msgstr "╧п╦╟ фМаЖ╦╕ ╨╦Ё╩╟М ╩У фМаЖ╦╕ ╟║а╝©б╢ы"
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "╦ч╪╪аЖ юн╪Б"
 
-#: ui/evolution-mail.xml.h:46
-msgid "Show _All"
-msgstr "╦П╣н ╨╦╠Б(_A)"
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
+msgid "Print Message..."
+msgstr "╦ч╪╪аЖ юн╪Б"
 
-#: ui/evolution-mail.xml.h:48
-msgid "Threaded Message list"
-msgstr "©╛╟Э╣х ╦ч╪╪аЖ ╦Я╥о"
+#: ui/evolution-mail-message.xml.h:65
+#, fuzzy
+msgid "Print Preview..."
+msgstr "юн╪Б ╧л╦╝╨╦╠Б"
 
-#: ui/evolution-mail.xml.h:49
-msgid "VFolder on Se_nder"
-msgstr "╧ъ╪шюз©║╣Ш╦╔ ╟║╩СфЗ╢У(_n)"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "╦ч╪╪аЖ юн╪Б"
 
-#: ui/evolution-mail.xml.h:50
-msgid "VFolder on _Recipients"
-msgstr "╪Ж╫еюз©║╣Ш╦╔ ╟║╩СфЗ╢У(_R)"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "х╦╫е"
 
-#: ui/evolution-mail.xml.h:51
-msgid "VFolder on _Subject"
-msgstr "а╕╦Я©║╣Ш╦╔ ╟║╩СфЗ╢У(_S)"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "юЭц╪ х╦╫е"
 
-#: ui/evolution-mail.xml.h:52
-msgid "View Raw Message Source"
-msgstr "Raw ╦ч╫цаЖ ╨╦╠Б"
+#: ui/evolution-mail-message.xml.h:71
+#, fuzzy
+msgid "S_earch Message"
+msgstr "фМаЖ ╦ч╪╪аЖ(_M)"
 
-#: ui/evolution-mail.xml.h:53
-msgid "Virtual Folder _Editor..."
-msgstr "╟║╩С фЗ╢У фМаЩ╠Б(_E)..."
+#: ui/evolution-mail-message.xml.h:72
+#, fuzzy
+msgid "Save the message as a text file"
+msgstr "╦ч╪╪аЖ╦╕ аЖа╓гя фЗ╢У╥н юЗюЕгу╢о╢ы"
 
-#: ui/evolution-mail.xml.h:54
-msgid "_Apply Filters"
-msgstr "╟е╦ё╟Ё юШ©К(_A)"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Attachment"
-msgstr "ц╥╨н(_A)"
+#: ui/evolution-mail-message.xml.h:74
+msgid "Show Email _Source"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Compose"
-msgstr "фМаЩ(_C)"
+#: ui/evolution-mail-message.xml.h:75
+#, fuzzy
+msgid "Show Full _Headers"
+msgstr "╦П╣Г гЛ╢У ╨╦╠Б(_H)"
 
-#: ui/evolution-mail.xml.h:57
-msgid "_Copy to Folder..."
-msgstr "фЗ╢У╥н ╨╧╩Г(_C)..."
+#: ui/evolution-mail-message.xml.h:76
+msgid "Show message in the normal style"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:58
-msgid "_Create Filter From Message"
-msgstr "╦ч╫цаЖ╥н╨нем ╟е╦ё╟т ╩Щ╪╨(_C)"
+#: ui/evolution-mail-message.xml.h:77
+#, fuzzy
+msgid "Show message with all email headers"
+msgstr "╦ч╪╪аЖ╦╕ ╩У фЗ╢У╥н ╨╧╩Ггу╢о╢ы"
 
-#: ui/evolution-mail.xml.h:60
-msgid "_Expunge"
-msgstr "а╕╟е(_E)"
+#: ui/evolution-mail-message.xml.h:78
+#, fuzzy
+msgid "Show the raw email source of the message"
+msgstr "╦ч╪╪аЖ©║ фдюою╩ ц╥╨нгу╢о╢ы"
 
-#: ui/evolution-mail.xml.h:61
-msgid "_Filters..."
-msgstr "фМаЖ ╟е╦ё╟Ё(_F)..."
+#: ui/evolution-mail-message.xml.h:79
+#, fuzzy
+msgid "Un-delete the selected messages"
+msgstr "╪╠ецгя ╦ч╪╪аЖ╦╕ юн╪Бгу╢о╢ы"
 
-#: ui/evolution-mail.xml.h:62 ui/evolution.xml.h:31
-msgid "_Folder"
-msgstr "фЗ╢У(_F)"
+#: ui/evolution-mail-message.xml.h:80
+#, fuzzy
+msgid "VFolder on Mailing _List..."
+msgstr "╦чюо╦╣ ╦╝╫╨ф╝©║╢Кгя гйем"
 
-#: ui/evolution-mail.xml.h:63
-msgid "_Forward"
-msgstr "юЭ╢ч(_F)"
+#: ui/evolution-mail-message.xml.h:81
+#, fuzzy
+msgid "VFolder on Se_nder..."
+msgstr "╧ъ╪шюз©║╣Ш╦╔ ╟║╩СфЗ╢У(_n)"
 
-#: ui/evolution-mail.xml.h:64
-msgid "_Inline"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "VFolder on _Recipients..."
+msgstr "╪Ж╫еюз©║╣Ш╦╔ ╟║╩СфЗ╢У(_R)"
 
-#: ui/evolution-mail.xml.h:65 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "╪╠ец ╧щюЭ(_I)"
+#: ui/evolution-mail-message.xml.h:83
+#, fuzzy
+msgid "VFolder on _Subject..."
+msgstr "а╕╦Я©║╣Ш╦╔ ╟║╩СфЗ╢У(_S)"
 
-#: ui/evolution-mail.xml.h:66
-msgid "_Mail Message"
-msgstr "фМаЖ ╦ч╪╪аЖ(_M)"
+#: ui/evolution-mail-message.xml.h:84
+msgid "_Apply Filters"
+msgstr "╟е╦ё╟Ё юШ©К(_A)"
 
-#: ui/evolution-mail.xml.h:67
-msgid "_Mail Settings..."
-msgstr "╦чюо ╪Ёа╓(_M)..."
+#: ui/evolution-mail-message.xml.h:85
+#, fuzzy
+msgid "_Copy to Folder"
+msgstr "фЗ╢У╥н ╨╧╩Г"
 
-#: ui/evolution-mail.xml.h:68
-msgid "_Move to Folder..."
-msgstr "фЗ╢У╥н юл╣©(_M)..."
+#: ui/evolution-mail-message.xml.h:86
+msgid "_Create Filter From Message"
+msgstr "╦ч╫цаЖ╥н╨нем ╟е╦ё╟т ╩Щ╪╨(_C)"
 
-#: ui/evolution-mail.xml.h:69
-msgid "_Open Selected Items"
-msgstr "╪╠ец╣х ╦ч╪╪аЖ ©╜╠Б(_S)"
+#: ui/evolution-mail-message.xml.h:88
+#, fuzzy
+msgid "_Forward Message"
+msgstr "юЭ╢ч╣х ╦ч╫цаЖ"
 
-#: ui/evolution-mail.xml.h:71
-msgid "_Quoted"
-msgstr "юн©К(_Q)"
+#: ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Message Display"
+msgstr "г╔╫ц"
 
-#: ui/evolution-mail.xml.h:72
-msgid "_Reply"
-msgstr "х╦╫е(_R)"
+#: ui/evolution-mail-message.xml.h:90
+#, fuzzy
+msgid "_Move to Folder"
+msgstr "фЗ╢У╥н юл╣©"
 
-#: ui/evolution-mail.xml.h:73
-msgid "_Resend Messages"
+#: ui/evolution-mail-message.xml.h:91
+#, fuzzy
+msgid "_Normal Display"
+msgstr "г╔╫ц"
+
+#: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Open Message"
 msgstr "╦ч╪╪аЖ╣Ию╩ ╢ы╫ц ╨╦Ё╩╠Б(_R)"
 
-#: ui/evolution-mail.xml.h:75
-msgid "_Send / Receive"
-msgstr "╨╦Ё╩╟М ╧ч╠Б(_S)"
+#: ui/evolution-mail-message.xml.h:93
+#, fuzzy
+msgid "_Re-send Message"
+msgstr "╦ч╪╪аЖ╣Ию╩ ╢ы╫ц ╨╦Ё╩╠Б(_R)"
 
-#: ui/evolution-mail.xml.h:76
-msgid "_Threaded"
-msgstr "╬╡╥╧╣Е г╔╫ц(_T)"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "юл ц╒ю╩ ╢щ╫ю╢о╢ы"
 
-#: ui/evolution-mail.xml.h:78
-msgid "_Undelete"
-msgstr "╣г╩Л╦╡(_U)"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr ""
+
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr ""
+
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr ""
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "╢щ╠Б(_C)"
+
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "╨╦╠Б(_V)"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "ц╥╨н"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "гЖюГ фдюо ╢щю╫"
 
 #: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Delete all but signature"
+msgstr "╪╜╦М фдюою╩ ╟М╦ё╪╪©Д"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "юл ╦ч╪╪аЖ╦╕ PGP╥н ╬охёх╜гу╢о╢ы"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "гЭ╫д(_o)"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "еь╫╨ф╝ фдюо ╩Пют"
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "╦ч╪╪аЖ©║ еь╫╨ф╝╥н фдюою╩ ╩Пютгу╢о╢ы"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "еь╫╨ф╝ фдюо ╩Пют"
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "фдюою╩ ©╠╢о╢ы"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "PGP ╬охёх╜"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "PGP ╪╜╦М"
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "цй╟М╦╕ юЗюЕ(_D)"
+#, fuzzy
+msgid "S/MIME Encrypt"
+msgstr "PGP ╬охёх╜"
 
 #: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "фЗ╢У╥н юЗюЕ(_f)... (╟Мд╔©╧а╓)"
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "юЗюЕ"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "╢ы╦╔юл╦╖ю╦╥н юЗюЕ"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr "цй╟М╦╕ юЗюЕ(_D)"
+
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "фЗ╢У╥н юЗюЕ..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "гЖюГ фдюою╩ юЗюЕ"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "гЖюГ фдюою╩ ╢ы╦╔юл╦╖ю╦╥н юЗюЕгу╢о╢ы"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "╦ч╪╪аЖ╦╕ аЖа╓гя фЗ╢У╥н юЗюЕгу╢о╢ы"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "╨╦Ё©"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Ё╙аъ©║ ╨╦Ё©(_L)"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Ё╙аъ©║ ╨╦Ё©(_L)"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "фМаЖ╦╕ HTMLгЭ╫дю╦╥н ╨╦Ё©"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Ё╙аъ©║ ╦ч╪╪аЖ╦╕ ╨╦Ёю╢о╢ы"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "аЖ╠щ ╦ч╪╪аЖ╦╕ ╨╦Ёю╢о╢ы"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "юл ╦ч╪╪аЖ╦╕ аЖ╠щ ╨╦Ёю╢о╢ы"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "ц╥╨н╧╟ ╨╦юс/╪Ш╠Х"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "ц╥╨н╧╟ ╨╦╠Б(_a)"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "ц╥╨н╧╟ ╨╦╠Б"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "юл ╦ч╪╪аЖ©║ PGPе╟╥н ╪╜╦Мгт"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "юл ╦ч╪╪аЖ©║ PGPе╟╥н ╪╜╦Мгт"
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr "╪Шю╨ бЭа╤C гв╦Яю╩ ╨╦©╘аы ╟мюнаЖ╦╕ ╟Аа╓"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr "бЭа╤ гв╦Яю╩ ╨╦©╘аы ╟мюнаЖ╦╕ ╟Аа╓"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "╧ъ╫е гв╦Яю╩ ╨╦©╘аы ╟мюнаЖ╦╕ ╟Аа╓"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "х╦╫е аж╪р гв╦Яю╩ ╨╦©╘аы ╟мюнаЖ╦╕ ╟Аа╓"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "ц╥╨н(_A)"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "╪Шю╨ бЭа╤ гв╦Я(_B)"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "бЭа╤ гв╦Я(_C)"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "╣П╧Ж╠К(_D)"
+
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Delete all"
+msgstr "╩Ха╕(_D)"
+
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "╧ъ╫е гв╦Я(_F)"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "╩Пют(_I)"
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
-msgstr "еь╫╨ф╝ фдюо ╩Пют(_I)... (╟Мд╔ ©╧а╓)"
-
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "©╜╠Б(_O)..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "х╦╫е аж╪р гв╦Я(_R)"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "╨╦╬х(_S)"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "╣╣©Р╦╩(_H)"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "фЗ╢У(_o)"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "╠╦╣╤"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "╠╦╣╤ аъаЖ"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "╢ы╫ц цё╠Б"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "юГ╫ггЮ"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "╧ы╡ы╠Б"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "╧ы╡ы╠Б"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "юЭц╪ х╦╫е(_l) (╟Мд╔ ©╧а╓)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr ""
+#: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Task"
+msgstr "цК╪р╣й"
 
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "юш╬Вю╩ юЗюЕгяхд ╢ыюл╬С╥н╠в╦╕ ╢щ╢б╢ы"
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "юл юоа╓╦╕ ╩Ха╕гу╢о╢ы"
 
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
+#: ui/evolution-task-editor.xml.h:7
+msgid "Re_fresh Task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "╫ггЮцК╪р"
-
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "╦╤аЖ╦╥ ╫ггЮ цК╪р"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
-msgid "_Appointment (FIXME)"
-msgstr "╬Ю╪с(_A) (╟Мд╔©╧а╓)"
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "Copy selected task"
+msgstr "╪╠ец╣х ╦ч╪╪аЖ ©╜╠Б(_S)"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
+#: ui/evolution-tasks.xml.h:4
+msgid "Create a new task"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr ""
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "юл юоа╓╦╕ ╩Ха╕гу╢о╢ы"
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Create a new task"
-msgstr ""
+#: ui/evolution-tasks.xml.h:7
+#, fuzzy
+msgid "Delete selected tasks"
+msgstr "юл юоа╓╦╕ ╩Ха╕гу╢о╢ы"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "е╛╦Ё╨╦╣Е©║╪╜ ╨ы©╘Ёж╠Б"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr ""
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "╦чюо ╪Ёа╓(_M)..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr ""
 
@@ -7764,271 +11237,491 @@ msgstr ""
 msgid "About Evolution..."
 msgstr "Evolutionю╨..."
 
+#: ui/evolution.xml.h:2
+#, fuzzy
+msgid "Add to _Shortcut Bar"
+msgstr "╢эцЮ ╦╥╢К(_S)"
+
 #: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "юл ц╒ю╩ ╢щ╫ю╢о╢ы"
+#, fuzzy
+msgid "Change the name of this folder"
+msgstr "╨Д╦╕ %s╥н ╨╞╟Ф"
 
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
-msgstr ""
+#: ui/evolution.xml.h:6
+#, fuzzy
+msgid "Copy this folder"
+msgstr "фЗ╢У╥н ╨╧╩Г"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr ""
+#: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "╩У фЗ╢У╦╕ ╩Щ╪╨"
 
-#: ui/evolution.xml.h:6
-msgid "Customize toolbars"
+#: ui/evolution.xml.h:8
+msgid "Create a link to this folder in the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "╩У фЗ╢У╦╕ ╩Щ╪╨"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "юл гв╦Я╦╕ ╩Ха╕гу╢о╢ы"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "╢ы╦╔ фЗ╢У╦╕ г╔╫ц"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "а╬╥А(_x)"
 
-#: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
-msgstr "Evolution ╢эцЮ ╦╥╢К(_s)"
+#: ui/evolution.xml.h:16
+msgid "Evolution _FAQ"
+msgstr ""
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:17
+#, fuzzy
+msgid "Evolution _Window"
+msgstr "Evolution ╪Ёд║"
+
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "га╥н╠в╥╔ю╩ ╦╤д╗╢о╢ы"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "╫цюшго╠Б"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:13
-msgid "Main toolbar"
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "%sю╩(╦╕) ©чбйю╦╥н юл╣©"
+
+#: ui/evolution.xml.h:24
+msgid "Open in New _Window"
 msgstr ""
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:25
+msgid "Open this folder in an other window"
+msgstr ""
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Evolutionюг а╓╨╦ ╨╦╠Б"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "╧Ж╠в а╕╨╦"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "╧Ж╠в а╕╨╦(_B)"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "Bug Buddy╥н ╧Ж╠ва╕╨╦╦╕ гу╢о╢ы"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:30
+msgid "Toggle"
+msgstr ""
+
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "Toggle whether we are working offline."
+msgstr "╧ъ╫е гв╦Яю╩ ╨╦©╘аы ╟мюнаЖ╦╕ ╟Аа╓"
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr ""
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "╢ч╥б ╩Г©Кго╠Б(_C)"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr ""
 
-#: ui/evolution.xml.h:23
-msgid "Work Offline"
-msgstr "©юга╤Сюн©║╪╜ юш╬В"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr "╪╠ец╣х фЗ╢У ╨╦╠Б"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "Evolutionю╨(_A)..."
 
-#: ui/evolution.xml.h:25
-msgid "_Actions"
-msgstr "гЮ╣©(_A)"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "╬Ю╪с(_A) (╟Мд╔©╧а╓)"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "©╛╟А(_C) (╟Мд╔©╧а╓)"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "╨╧╩Г(_C)"
+
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "фЗ╢У╥н ╟║╠Б(_G)..."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr ""
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "╩Жюн(_I)"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "фМаЖ ╦ч╪╪аЖ(_M)"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "юл╣©"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "╩У╥н©Н(_N)"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "╩У ╟║╩СфЗ╢У(_N)"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "©╜╠Б(_O)..."
+
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "╢эцЮ ╦╥╢К(_S)"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "╢эцЮ ╦╥╢К(_S)"
 
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "юш╬В(_T) (╟Мд╔©╧а╓)"
+
+#: ui/evolution.xml.h:64
+#, fuzzy
+msgid "_Work Offline"
+msgstr "©юга╤Сюн©║╪╜ юш╬В"
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "╦чюо ╪Ёа╓(_M)..."
+
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "Address Cards"
+msgstr "аж╪р _2:"
+
+#: views/addressbook/galview.xml.h:2
+#, fuzzy
+msgid "By Company"
+msgstr "х╦╩Г"
+
+#: views/addressbook/galview.xml.h:3
+#, fuzzy
+msgid "Phone List"
+msgstr "юЭх╜ гЭеб"
+
+#: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "By Sender"
+msgstr "╨╦Ё╫юл"
+
+#: views/mail/galview.xml.h:2
+#, fuzzy
+msgid "By Status"
+msgstr "╩Себ"
+
+#: views/mail/galview.xml.h:3
+#, fuzzy
+msgid "By Subject"
+msgstr "а╕╦Я"
+
+#: views/mail/galview.xml.h:4
+#, fuzzy
+msgid "Messages"
+msgstr "╦ч╪╪аЖ"
+
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With Category"
+msgstr "╦Я╥о:"
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 msgid "%A, %B %d, %Y"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "╧ы╩щ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "╩Г╧╚╫г ╤╟Ё╡"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr "а╓╨╦ ╬Ью╫"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr "╢ы╦╔ юл╣Ию╩ цй╢К(_I)..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 msgid "_Options"
 msgstr "╪Ёа╓(_O)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 msgid "Meeting _start time:"
 msgstr "х╦юг ╫цюш ╫ц╟ё(_s):"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 msgid "Meeting _end time:"
 msgstr "х╦юг а╬╥А ╫ц╟ё(_e):"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
 msgstr "╦П╣Г бЭ╪╝юз"
 
-#: widgets/menus/gal-view-menus.c:171
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr ""
 
+#: widgets/menus/gal-view-menus.c:259
+msgid "Define Views"
+msgstr ""
+
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr ""
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr ""
-
-#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "гЖюГ"
 
-#: widgets/misc/e-cell-date-edit.c:239
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "©ю╢ц"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "х╝юн"
 
-#: widgets/misc/e-cell-date-edit.c:720
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "аж"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+msgid "Turkish"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "а╤аВ"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "╢╨╫╨"
+
+#: widgets/misc/e-charset-picker.c:160
+#, c-format
+msgid "Unknown character set: %s"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "╠Бе╦"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
+#: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:160
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "©╛╤ТцЁ фМаЩ╠Б"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "╟М╠ч ╟к╩Ж"
 
-#: widgets/misc/e-filter-bar.c:311
-msgid "Advanced ..."
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "╦П╣н ╨╦╠Б"
+
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
 msgstr "╟М╠ч..."
 
-#: widgets/misc/e-messagebox.c:141
+#: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "а╓╨╦"
 
-#: widgets/misc/e-messagebox.c:148
+#: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "╟Ф╟М"
 
-#: widgets/misc/e-messagebox.c:162
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "©║╥╞"
+
+#: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "аЗ╧╝"
 
-#: widgets/misc/e-messagebox.c:169
+#: widgets/misc/e-messagebox.c:180
 msgid "Message"
 msgstr "╦ч╪╪аЖ"
 
 #. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
+#: widgets/misc/e-messagebox.c:224
 msgid "Don't show this message again."
 msgstr "юл ╦ч╪╪аЖ╦╕ ╢ы╫ц ╨╪ ╪Ж ╬Ь╫ю╢о╢ы"
 
-#: widgets/misc/e-search-bar.c:140
+#: widgets/misc/e-search-bar.c:155
 msgid "Sear_ch"
 msgstr "╟к╩Ж(_c)"
 
@@ -8040,16 +11733,373 @@ msgstr "╟Ёюн©К аж╪р╥о ╪╜╧Ж"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:165
+#: wombat/wombat.c:173
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): GNOME-VFS╦╕ цй╠Бх╜ гр ╪Ж ╬Ь╫ю╢о╢ы"
 
-#: wombat/wombat.c:177
+#: wombat/wombat.c:185
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): ╠вЁПю╩ цй╠Бх╜ гр ╪Ж ╬Ь╫ю╢о╢ы"
 
-#: wombat/wombat.c:190
+#: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo╦╕ цй╠Бх╜ гр ╪Ж ╬Ь╫ю╢о╢ы"
 
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "╪Ёа╓ю╩ ╨╞╟Фгу╢о╢ы"
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "╢ч╥б ╪Ёа╓"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "©╛╤ТцЁ(_C)..."
+
+#~ msgid "_Company:"
+#~ msgstr "х╦╩Г(_C):"
+
+#~ msgid "Find..."
+#~ msgstr "цё╠Б..."
+
+#~ msgid "Click here to add a contact"
+#~ msgstr "©╛╤ТцЁ©║ цъ╟║го╠Б"
+
+#~ msgid "Open calendar"
+#~ msgstr "╢ч╥б ©╜╠Б"
+
+#~ msgid "Save calendar"
+#~ msgstr "╢ч╥б юЗюЕ"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>╢ч╥б╦╕ юп╢б аъ ©ю╥Ы:<br>аЖ©Ь╣гаЖ╬й╢б ╧Ф╧Щ"
+
+#~ msgid "Colors"
+#~ msgstr "╩Ж╩С"
+
+#~ msgid "Highlight"
+#~ msgstr "╟╜а╤"
+
+#~ msgid "TaskPad"
+#~ msgstr "юш╬Вфп╣Е"
+
+#~ msgid "Edit Task"
+#~ msgstr "юш╬В фМаЩ"
+
+#~ msgid "Percent complete"
+#~ msgstr "фш╪╬ф╝ ©о╥А"
+
+#~ msgid "Mark the task complete"
+#~ msgstr "юш╬Вюл ©о╥А╣г╬Зю╫ю╩ г╔╫ц"
+
+#~ msgid "Edit this task..."
+#~ msgstr "юл юоа╓ю╩ ╪Жа╓..."
+
+#~ msgid "Edit the task"
+#~ msgstr "юоа╓ фМаЩ"
+
+#~ msgid "Go to Today"
+#~ msgstr "©ю╢ц╥н юл╣©"
+
+#~ msgid "Add to Calendar"
+#~ msgstr "╢ч╥б©║ цъ╟║"
+
+#~ msgid "Update Calendar"
+#~ msgstr "╢ч╥б ╟╩╫е"
+
+#~ msgid "Attendee address"
+#~ msgstr "бЭ╪╝юз аж╪р"
+
+#~ msgid "Attendees: "
+#~ msgstr "бЭ╪╝юз:"
+
+#~ msgid "Organizer: "
+#~ msgstr "╠Бх╧юз:"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "╬Ю╪с ╠Б╨╩"
+
+#~ msgid "_Starting date:"
+#~ msgstr "╫цюш Ё╞б╔(_S):"
+
+#~ msgid "URL string `%s' contains an invalid protocol"
+#~ msgstr "URL `%s'юл а╕╢К╥н╣х га╥неДдщю╩ ╟║аЖ╟М южаЖ╬й╫ю╢о╢ы"
+
+#~ msgid "Port number in URL `%s' is non-numeric"
+#~ msgstr "URL `%s'©║юж╢б фВф╝ ╧Ьхё╟║ ╪Щюз╟║ ╬ф╢у╢о╢ы"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "IMAP фЗ╢У╦╕ ╩ЛфЛ╨╬╢о╢ы"
+
+#~ msgid "Inline attachment"
+#~ msgstr "ц╥╨н"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "©Д╟еюл ╨╦еК фдюоюл ╬ф╢оЁв©Д."
+
+#~ msgid "That file exists but is not readable."
+#~ msgstr "фдюоюл юж╠Б╢бгя╣╔ юпю╩ ╪Ж╟║ ╬ЬЁв©Д."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "фдюоюл юпю╩╪Ж юж╢б ╟е╟╟╠Б╢бгя╣╔ ©╜ ╪Ж╟║ ╬Ь╫ю╢о╢ы."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "фдюоюл ╬фаж е╘Ёв©Д(100k╣╣ Ёяю╫).\n"
+#~ "╩Пютго╟М ╫мю╦╫е╟е ╦бЁ╙©Д?"
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "╠Б╨╩ ╠вЁП га╥н╠в╥╔ю╦╥н %sю╩ ©╜╠Б"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "╠Б╨╩ ╠вЁП ╨Й╤С©Ла╝╥н %s╦╕ ©╜╠Б"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "%s╥н юл╦чюо ╨╦Ё╩╠Б"
+
+#~ msgid "Run %s"
+#~ msgstr "%s ╫ггЮ"
+
+#~ msgid "Close %s"
+#~ msgstr "%s ╢щ╠Б"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "%sю╩(╦╕) юлюЭ аы╥н юл╣©"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "%sю╩(╦╕) ╢ыю╫ аы╥н юл╣©"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "HTML фдюою╩ ©╜ ╪Ж╟║ ╬Ь╫ю╢о╢ы:\n"
+#~ "%s"
+
+#~ msgid "RDF Summary"
+#~ msgstr "RDF ©Д╬Ю"
+
+#~ msgid "Update automatically"
+#~ msgstr "юз╣©ю╦╥н ╟╩╫е"
+
+#~ msgid "Remove criterion"
+#~ msgstr "а╤╟г ╩Ха╕"
+
+#~ msgid "Forward to Address"
+#~ msgstr "юЭ╢чгр аж╪р"
+
+#~ msgid "Mark as Read"
+#~ msgstr "юпю╨ ╟мю╦╥н г╔╫ц"
+
+#~ msgid "Move to Folder..."
+#~ msgstr "фЗ╢У╥н юл╣©..."
+
+#~ msgid "Copy to Folder..."
+#~ msgstr "фЗ╢У╥н ╨╧╩Г..."
+
+#~ msgid "Advanced"
+#~ msgstr "╟М╠ч"
+
+#~ msgid "Email address:"
+#~ msgstr "юЭюз©ЛфМ аж╪р:"
+
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "╦чюо ╪Ёа╓"
+
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "╦чюо ╪Ёа╓ Druid"
+
+#~ msgid "Password:"
+#~ msgstr "╨Я╧п╧Ьхё:"
+
+#~ msgid "Remember my password"
+#~ msgstr "юл ╨Я╧п╧Ьхё ╠Б╬О"
+
+#~ msgid "Reply address:"
+#~ msgstr "х╦╫е аж╪р:"
+
+#~ msgid "Save password"
+#~ msgstr "╬охё юЗюЕ"
+
+#~ msgid "Server type:"
+#~ msgstr "╪╜╧Ж а╬╥Ы::"
+
+#~ msgid ""
+#~ "Type the name by which you would like to refer to these servers. For "
+#~ "example: \"Work\" or \"Home\"."
+#~ msgstr "юл ╪╜╧Ж╦╕ ╟║╦ёеЁ юл╦╖ю╩ аЖа╓го╪╪©Д.╟║╥и \"аВюЕ\"юлЁ╙ ╤г╢б \"аЩ\"."
+
+#~ msgid "minutes."
+#~ msgstr "╨п"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "\"%s\" фЗ╢У╦╕ \"%s\" фВ╦Дю╦╥н ╧ы╡ы╠Б"
+
+#~ msgid "Closing current folder"
+#~ msgstr "гЖюГ фЗ╢У ╢щ╢баъ"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "©╧юЭ фЗ╢У╦╕ ╢ы╦╔ юл╦╖ю╦╥н ╧ы╡ы╬Н╪╜ ©╜╠Б"
+
+#~ msgid "Copying messages"
+#~ msgstr "╦ч╪╪аЖ ╨╧╩Г"
+
+#~ msgid "Do you accept?"
+#~ msgstr "╧ч╬ф╣Июл╟з╫ю╢о╠Н?"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (юЭ╢ч╣х ╦ч╫цаЖ)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "юЭ╢ч: (а╕╦Я ╬Ью╫)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "юЭ╢ч╣х ╦ч╫цаЖ (а╕╦Я ╬Ью╫)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----юЭ╢ч ╦ч╫цаЖ-----<br><b>╨╦Ё╫ ╩Г╤В:</b> %s<br><b>╧ч╢б ╩Г╤В:</b> "
+#~ "%s<br><b>а╕╦Я:</b> %s<br>"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Evolution фдюо╣Июл а╕╢К╥н ╪Ёд║╣г╬З╣г╬З╫ю╢о╢ы."
+
+#~ msgid "Activate"
+#~ msgstr "х╟╪╨"
+
+#~ msgid "Find a contact"
+#~ msgstr "©╛╤ТцЁ цё╬ф╨╩╢ы"
+
+#~ msgid "View All"
+#~ msgstr "╦П╣н ╨╦╠Б"
+
+#~ msgid "View all contacts"
+#~ msgstr "╦П╣Г ©╛╤ТцЁ ╨╦╠Б"
+
+#~ msgid "5 Days"
+#~ msgstr "╢Е╩У╬©"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "╩У ╢ч╥бю╩ ╦╦╣Л╢о╢ы"
+
+#~ msgid "Open Calendar"
+#~ msgstr "╢ч╥б ©╜╠Б"
+
+#~ msgid "Prev"
+#~ msgstr "юлюЭ"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "╢ч╥бю╩ ╢ы╦╔ ╟мю╦╥н юЗюЕгу╢о╢ы"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "╢ч╥б ©╜╠Б(_O)"
+
+#~ msgid "About this application"
+#~ msgstr "юл юю©Кга╥н╠в╥╔©║ ╢Кго©╘"
+
+#~ msgid "About..."
+#~ msgstr "юл га╥н╠в╥╔ю╨..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "гЮ╣©(_n)"
+
+#~ msgid "C_lear"
+#~ msgstr "╨Я©Р(_l)"
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "фЗ╢У╥н ╨╧╩Г..."
+
+#~ msgid "Dump XML"
+#~ msgstr "XML╥н ╢Щга"
+
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "╟Мд╔©╧а╓: фЗ╢Уюг ц╧б╟гв╦Я(_r)"
+
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "юш╬В(_T) (╟Мд╔©╧а╓)"
+
+#~ msgid "Go to the next item"
+#~ msgstr "╢ыю╫ гв╦Яю╦╥н юл╣©"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "юлюЭ гв╦Яю╦╥н юл╣©"
+
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "юш╬В(_T) (╟Мд╔©╧а╓)"
+
+#~ msgid "N_ext"
+#~ msgstr "╢ыю╫(_e)"
+
+#~ msgid "Pre_vious"
+#~ msgstr "юлюЭ(_v)"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "юн╪Б ╪Ёа╓(_e)..."
+
+#~ msgid "Select everything"
+#~ msgstr "юЭц╪╦╕ ╪╠ецгу╢о╢ы"
+
+#~ msgid "_About..."
+#~ msgstr "юл га╥н╠в╥╔ю╨(_A)..."
+
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "фМаЖ ╦ч╫цаЖ(_M) (╪Ж╦╝аъ)"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "фЗ╢У╥н юл╣©(_M)..."
+
+#~ msgid "New Mail"
+#~ msgstr "╩У фМаЖ"
+
+#~ msgid "Print message to the printer"
+#~ msgstr "╦ч╫цаЖ юн╪Б"
+
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr ""
+#~ "╧п╦╟ фМаЖ╦╕ ╨╦Ё╩╟М\n"
+#~ "  ╩У фМаЖ╦╕ ╟║а╝©б╢ы"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "Raw ╦ч╫цаЖ ╨╦╠Б"
+
+#~ msgid "_Compose"
+#~ msgstr "фМаЩ(_C)"
+
+#~ msgid "_Reply"
+#~ msgstr "х╦╫е(_R)"
+
+#~ msgid "_Threaded"
+#~ msgstr "╬╡╥╧╣Е г╔╫ц(_T)"
+
+#~ msgid "Send the message now"
+#~ msgstr "аЖ╠щ ╦ч╪╪аЖ╦╕ ╨╦Ёю╢о╢ы"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "еь╫╨ф╝ фдюо ╩Пют(_I)... (╟Мд╔ ©╧а╓)"
+
+#~ msgid "Redo"
+#~ msgstr "юГ╫ггЮ"
+
+#~ msgid "Replace a string"
+#~ msgstr "╧ы╡ы╠Б"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "юЭц╪ х╦╫е(_l) (╟Мд╔ ©╧а╓)"
+
+#~ msgid "Undo"
+#~ msgstr "╫ггЮцК╪р"
+
+#~ msgid "Undo the last action"
+#~ msgstr "╦╤аЖ╦╥ ╫ггЮ цК╪р"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Evolution ╢эцЮ ╦╥╢К(_s)"
 
+#~ msgid "Advanced ..."
+#~ msgstr "╟М╠ч..."
diff --git a/po/lt.po b/po/lt.po
index 4722f09b6a..1b6b1897b6 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.10\n"
-"POT-Creation-Date: 2001-05-05 17:29+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-05-05 01:02+0200\n"
 "Last-Translator: Gediminas Paulauskas <menesis@delfi.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -13,11 +13,21 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import VCard files into Evolution."
+msgstr "Gamykla importuoti GnomeCard byloms А Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports VCard files into Evolution."
+msgstr "Importuoja GnomeCard bylas А Evolution."
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "KortelК: "
 
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +35,7 @@ msgstr ""
 "\n"
 "Vardas: "
 
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,7 +43,7 @@ msgstr ""
 "\n"
 "  PrieПdКlis: "
 
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -41,7 +51,7 @@ msgstr ""
 "\n"
 "  Vardas:     "
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -49,7 +59,7 @@ msgstr ""
 "\n"
 "  Papildomas: "
 
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -57,7 +67,7 @@ msgstr ""
 "\n"
 "  PavardК:    "
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -65,7 +75,7 @@ msgstr ""
 "\n"
 "  GalШnК:     "
 
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -73,7 +83,7 @@ msgstr ""
 "\n"
 "Gimimo data:"
 
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -81,7 +91,7 @@ msgstr ""
 "\n"
 "Adresas:"
 
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -89,13 +99,13 @@ msgstr ""
 "\n"
 "  PaПto dКЧК:  "
 
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -103,7 +113,7 @@ msgstr ""
 "\n"
 "  GatvК:       "
 
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -111,7 +121,7 @@ msgstr ""
 "\n"
 "  Miestas:     "
 
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -119,7 +129,7 @@ msgstr ""
 "\n"
 "  Regionas:    "
 
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -127,7 +137,7 @@ msgstr ""
 "\n"
 "  PaПto kodas: "
 
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -135,13 +145,13 @@ msgstr ""
 "\n"
 "  ValstybК:    "
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -149,7 +159,7 @@ msgstr ""
 "\n"
 "Telefonai:\n"
 
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -157,7 +167,7 @@ msgstr ""
 "\n"
 "Telefonas:"
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -165,7 +175,7 @@ msgstr ""
 "\n"
 "El. paПtas:\n"
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -173,7 +183,7 @@ msgstr ""
 "\n"
 "El. paПtas:"
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -181,7 +191,7 @@ msgstr ""
 "\n"
 "PaПto programa: "
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -189,7 +199,7 @@ msgstr ""
 "\n"
 "Laiko juosta: "
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -197,7 +207,7 @@ msgstr ""
 "\n"
 "Geogr. vietovК: "
 
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -205,7 +215,7 @@ msgstr ""
 "\n"
 "Verslo padКtis: "
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -213,7 +223,7 @@ msgstr ""
 "\n"
 "Organizacija: "
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -221,31 +231,31 @@ msgstr ""
 "\n"
 "  Vardas: "
 
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -253,7 +263,7 @@ msgstr ""
 "\n"
 "Kategorijos: "
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -271,7 +281,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -279,7 +289,7 @@ msgstr ""
 "\n"
 "Unikali eilutК: "
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -287,27 +297,25 @@ msgstr ""
 "\n"
 "VieПas raktas: "
 
-#: addressbook/backend/ebook/e-destination.c:232
-msgid "???"
-msgstr "???"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr "Gamykla importuoti GnomeCard byloms А Evolution."
+#: addressbook/backend/ebook/e-card.c:4037
+#, fuzzy
+msgid "Multiple VCards"
+msgstr "Keletas laiПkЬ"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "Importuoja GnomeCard bylas А Evolution."
+#: addressbook/backend/ebook/e-card.c:4045
+#, fuzzy, c-format
+msgid "VCard for %s"
+msgstr "аvesk %s slaptaЧodА"
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "NegalКjau inicializuoti Bonobo"
 
@@ -320,14 +328,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook neАkelta\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "NegalКjau paleisti wombat serverio"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "NegalКjau paleisti wombat"
 
@@ -336,728 +344,848 @@ msgstr "NegalКjau paleisti wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Nepavyko perskaityti piloto Address programos bloko"
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#, fuzzy
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Evolution adresЬ knygelКs konduito konfigШravimo Аrankis\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Evolution adresЬ knygelКs maЧЬ korteliЬ vaizduoklК"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "Evolution kontaktЬ tvarkymo komponentas."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr "AdresЬ knygelКs adreso vaizduoklКs gamykla"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#, fuzzy
+msgid "Factory for the Addressbook's address popup"
+msgstr "AdresЬ knygelКs adreso ???? gamykla"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr "Evolution adresЬ knygelКs komponento gamykla."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#, fuzzy
+msgid "Factory for the sample Addressbook control"
+msgstr "Paspausk Хia, jei reikia adresЬ knygelКs"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "LDAP serveris"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Byla"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "NeЧinomas adresЬ knygelКs tipas"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "Jokio (anoniminis reЧimas)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "SlaptaЧodis"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "NeЧinomas auth tipas"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "Pagrindas"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "Vienas"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "Submedis"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Prisiminti ПА slaptaЧodА"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "Hostas:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Prievadas:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "PaieПkos sritis:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Autentikacija:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Kelias:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "Sukurti keliЮ jei jis neegzistuoja."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "Redaguoti adresЬ knygelФ"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "PridКti adresЬ knygelФ"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"Pasirink tavo turimos adresЬ knygelКs tipЮ, ir Аvesk reikiamЮ informacijЮ "
+"apie jЮ."
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Vardas:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "ApraПymas:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr ""
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "PridКti"
+msgid "Addressbook Sources"
+msgstr "AdresЬ knygelКs Пaltinis"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "IПtrinti"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Vardas"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "_PridКti"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "K_eisti"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "Kiti kontaktai"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "аvesk %s slaptaЧodА"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Negaliu atidaryti adresЬ knygelКs"
+
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
+msgstr "Bet kuriame lauke yra"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "Varde yra"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "El. paПte yra"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "Varde yra"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "URI, kurА rodys AplankЬ narПyklК"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "Pagrindinis el. paПtas"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "El. paПtas 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "El. paПtas 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "Pasirink bylЮ"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Sukurti naujЮ kontaktЮ"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "Redaguoti adresЬ knygelФ"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "Keisti kontakto informacijЮ"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "PridКti prie kontaktЬ"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "El. paПto adresas:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "UЧdrausti uЧklausas"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Leisti uЧklausas (Pavojinga!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Evolution adresЬ knygelКs vardЬ pasirinkimo sЮsaja."
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr "AdresЬ knygelКs vardЬ pasirinkimo sЮsajos gamykla"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "PaПalinti"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "PaПalinti visus"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "PaПto siuntimas"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Kiti kontaktai"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "LaiПko gavКjai"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "Pasirink vardus"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "Pasirink vardЮ iП:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "Kategorija:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_IeПkoti"
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "_Jubiliejus:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "V_erslo"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "Verslo _faksas"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "K_ontaktai..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ka_tegorijos..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Kontakto redaktorius"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "DetalКs"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Byloje kaip:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Paprastas"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Naujas telefono tipas"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "Pas_tabos:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Organizacija:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "TelefonЬ tipai"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
-msgstr "Pagrindinis el. paПtas"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "Nori gauti _HTML laiПkus"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Tinklapio adresas:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
-msgstr "_PridКti"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "_Adresas..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "_Asistento vardas:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "_Gimtadienis:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Verslo"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Kompanija:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "_Kontaktai..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:639 mail/mail-config.glade.h:75
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:98
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_IПtrinti"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "_Departamentas:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "_Pilnas vardas..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_NamЬ"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "_Pareigos:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "_Vadybininko vardas:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_Mobilus"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "_Slapyvardis:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "_Ofisas:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_Profesija:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "S_utuoktinis:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "_Tai yra paПto adresas"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "IПtrinti kontaktЮ?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "пis kontaktas priklauso Пioms kategorijoms:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Asistento"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Verslo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Verslo 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Verslo faksas"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Atsakiklis"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Automobilio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Kompanijos"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "NamЬ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "NamЬ 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "NamЬ faksas"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Mobilus"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Kitas"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Kitas faksas"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "IeПkas"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Pagrindinis"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Teleksas"
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
-msgid "Email 2"
-msgstr "El. paПtas 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
-msgid "Email 3"
-msgstr "El. paПtas 3"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "IПtrinti kontaktЮ?"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:233
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Kontakto greitas pridКjimas"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:235
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "Redaguoti visЮ"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:276
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Pilnas vardas"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:282
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "El. paПtas"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresas _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Kanada"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Patikrinti adresЮ"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Valst_ybК:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Suomija"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "JAV"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Adresas:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_Miestas:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "_PO Box:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "_Valstija/Provincija:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "_ZIP/PaПto kodas:"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Tikrinti pilnЮ vardЮ"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Vardas:"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_PavardК:"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "Vi_durinis:"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_GalШnК:"
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Titulas:"
 
-#: addressbook/gui/component/addressbook.c:241
-msgid "As _Minicards"
-msgstr "Rodyti _maЧas korteles"
-
-#: addressbook/gui/component/addressbook.c:247
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Rodyti _lentelФ"
-
-#: addressbook/gui/component/addressbook.c:407
-#, c-format
-msgid "Enter password for %s"
-msgstr "аvesk %s slaptaЧodА"
-
-#: addressbook/gui/component/addressbook.c:435
-msgid "Unable to open addressbook"
-msgstr "Negaliu atidaryti adresЬ knygelКs"
-
-#: addressbook/gui/component/addressbook.c:440
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Mes negalКjome atidaryti Пios adresЬ knygelКs. Tai\n"
-"reiПkia arba tai, kad tu Аvedei neteisingЮ URI, arba \n"
-"bandei prieiti prie LDAP serverio, bet neturi \n"
-"Аkompiliuoto LDAP palaikymo. Jei tu Аvedei URI, \n"
-"pasitikrink URI teisingumЮ ir Аvesk iП naujo. Jei ne, \n"
-"tikriausiai bandei prieiti prie LDAP serverio. Jei nori\n"
-"naudoti LDAP, tu turi parsisiЬsti ir Аdiegti OpenLDAP,\n"
-"o tada perkompiliuoti ir Аdiegti Evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:563
-msgid "Show All"
-msgstr "Rodyti visus"
-
-#: addressbook/gui/component/addressbook.c:565
-msgid "Advanced..."
-msgstr "IПsami..."
-
-#: addressbook/gui/component/addressbook.c:595 calendar/gui/gnome-cal.c:236
-msgid "Any field contains"
-msgstr "Bet kuriame lauke yra"
-
-#: addressbook/gui/component/addressbook.c:596
-msgid "Name contains"
-msgstr "Varde yra"
-
-#: addressbook/gui/component/addressbook.c:597
-msgid "Email contains"
-msgstr "El. paПte yra"
-
-#: addressbook/gui/component/addressbook.c:740
-msgid "The URI that the Folder Browser will display"
-msgstr "URI, kurА rodys AplankЬ narПyklК"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "LDAP serveris"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Byla"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "NeЧinomas adresЬ knygelКs tipas"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "Jokio (anoniminis reЧimas)"
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
-msgid "Password"
-msgstr "SlaptaЧodis"
-
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:170
-msgid "Unknown auth type"
-msgstr "NeЧinomas auth tipas"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "Base"
-msgstr "Pagrindas"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "One"
-msgstr "Vienas"
-
-#: addressbook/gui/component/addressbook-config.c:183
-msgid "Subtree"
-msgstr "Submedis"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Unknown scope type"
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "Hosto vardas:"
 
-#: addressbook/gui/component/addressbook-config.c:353
-msgid "Bind DN:"
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "Gruodis"
 
-#: addressbook/gui/component/addressbook-config.c:354
-msgid "FIXME Bind DN Help text here"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
-msgstr "Prisiminti ПА slaptaЧodА"
-
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
-msgid "Host:"
-msgstr "Hostas:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Host help text here."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Port:"
-msgstr "Prievadas:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
+msgstr "PaПalinti"
 
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "Kontakto redaktorius"
 
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
-msgstr ""
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "Kontakto redaktorius"
 
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:435
-msgid "Search Scope:"
-msgstr "PaieПkos sritis:"
-
-#: addressbook/gui/component/addressbook-config.c:489
-msgid "Authentication:"
-msgstr "Autentikacija:"
-
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
-msgid "Path:"
-msgstr "Kelias:"
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "FIXME Path Help text here"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:513
-msgid "Create path if it doesn't exist."
-msgstr "Sukurti keliЮ jei jis neegzistuoja."
-
-#: addressbook/gui/component/addressbook-config.c:647
-msgid "Edit Addressbook"
-msgstr "Redaguoti adresЬ knygelФ"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#, fuzzy
+msgid "New Contact:"
+msgstr "Naujas kontaktas"
 
-#: addressbook/gui/component/addressbook-config.c:649
-msgid "Add Addressbook"
-msgstr "PridКti adresЬ knygelФ"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#, fuzzy
+msgid "Original Contact:"
+msgstr "Kiti kontaktai"
 
-#: addressbook/gui/component/addressbook-config.c:665
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"Pasirink tavo turimos adresЬ knygelКs tipЮ, ir Аvesk reikiamЮ informacijЮ "
-"apie jЮ."
-
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
-msgid "Name:"
-msgstr "Vardas:"
-
-#: addressbook/gui/component/addressbook-config.c:672
-msgid "FIXME Name help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:674
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "ApraПymas:"
-
-#: addressbook/gui/component/addressbook-config.c:675
-msgid "FIXME Description help text here"
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "AdresЬ knygelКs Пaltinis"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:19
-#: mail/message-browser.c:203 ui/evolution-addressbook.xml.h:3
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "IПtrinti"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "Keisti"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Vardas"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+msgid "Changed Contact:"
 msgstr "Kiti kontaktai"
 
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "UЧdrausti uЧklausas"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "Leisti uЧklausas (Pavojinga!)"
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
-msgstr "Keisti kontakto informacijЮ"
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
-msgid "Add to Contacts"
-msgstr "PridКti prie kontaktЬ"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#, fuzzy
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Evolution adresЬ knygelКs konduito konfigШravimo Аrankis\n"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution adresЬ knygelКs maЧЬ korteliЬ vaizduoklК"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "Evolution kontaktЬ tvarkymo komponentas."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "AdresЬ knygelКs adreso vaizduoklКs gamykla"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-#, fuzzy
-msgid "Factory for the Addressbook's address popup"
-msgstr "AdresЬ knygelКs adreso ???? gamykla"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "Evolution adresЬ knygelКs komponento gamykla."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-#, fuzzy
-msgid "Factory for the sample Addressbook control"
-msgstr "Paspausk Хia, jei reikia adresЬ knygelКs"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
-msgstr "PaПalinti"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
-msgid "Remove All"
-msgstr "PaПalinti visus"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Evolution adresЬ knygelКs vardЬ pasirinkimo sЮsaja."
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "AdresЬ knygelКs vardЬ pasirinkimo sЮsajos gamykla"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Rasti..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "LaiПko gavКjai"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Pasirink vardus"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Pasirink vardЮ iП:"
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "PaieПka"
 
@@ -1169,156 +1297,254 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "IПsaugoti kaip vCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr "SiЬsti kontaktЮ kitam"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Send message to contact"
 msgstr "SiЬsti laiПkЮ kontaktui"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/message-browser.c:200
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:55 ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Spausdinti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr "Spausdinti vokЮ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "IПtrinti"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "Klaida Аkeliant %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "пaltiniai"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "NeЧinoma klaida"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "Dirbti atsijungus"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "PriКjimas uЧdraustas"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "Byla nerasta"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Veiksmas nepalaikomas"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "Nutraukta"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "I/O klaida"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "Klaida Аkeliant %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Klaida Аkeliant %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Klaida Аkeliant %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "Klaida Аkeliant %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr ""
+"Klaida skaitant duomenis:\n"
+"%s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* Spausk Хia, kad pridКtum kontaktЮ *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr "Byloje kaip"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "El. paПtas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "Pagrindinis telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr "Asistento telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "Verslo telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr "Atsakiklio telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "Kompanijos telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "NamЬ telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Organizacija"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "Verslo adresas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "NamЬ adresas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "Mobilus telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "Automobilio telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "Verslo telefonas 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "NamЬ telefonas 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "Kitas telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "Kitas adresas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Tinklapis"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "Departamentas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Ofisas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "Titulas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Profesija"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Vadybininkas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "PravardК"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "Sutuoktinis"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Pastaba"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr "Laisvas-uЧsiКmФs URL"
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "Baigta"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "аkeliamas kalendorius..."
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "IПsaugoti А adresЬ knygelФ"
 
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1362,7 +1588,8 @@ msgid "Dimensions:"
 msgstr "IПmatavimai:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "пriftas..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1422,7 +1649,6 @@ msgid "Margins"
 msgstr "ParaПtКs"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "StulpeliЬ skaiХius:"
 
@@ -1502,37 +1728,63 @@ msgstr "Tipas:"
 msgid "Width:"
 msgstr "Plotis:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "пriftas..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "аvyko klaida, bendraujant su kalendoriaus serveriu"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nepavyko perskaityti piloto Calendar programos bloko"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "NegalКjau perskaityti piloto ToDo programos bloko"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "Priminti man apie АvykА "
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "UЧtildyti"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#, fuzzy
+msgid "Evolution calendar executive summary component."
+msgstr "Evolution paПto komponento."
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Gerai"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolution kalendoriaus iTip/iMip vaizduoklК"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr "Evolution komponentas tvarkyti kalendoriui."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr "Kalendoriaus apЧvalgos komponento gamykla."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr "Evolution kalendoriaus komponento gamykla."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Evolution kalendoriaus komponento gamykla."
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1542,143 +1794,257 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:56
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "PraneПimas apie tavo АvykА %A, %Y %b %d, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "PraneПimas apie tavo АvykА %A, %Y %b %d, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "PraneПimas apie tavo АvykА %A, %Y %b %d, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "PraneПimas apie tavo АvykА %A, %Y %b %d, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "PraneПimas apie tavo АvykА %A, %Y %b %d, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "PraneПimas apie tavo АvykА %A, %Y %b %d, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "PraneПimas apie tavo АvykА %A, %Y %b %d, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "Rodyti informacijЮ apie Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "PerspКjimas bus %A, %Y %b %d, %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "UЧdaryti"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "UЧtildyti"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "UЧtildymo laikas (minutКmis)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "Keisti АvykА"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "NКra jokios apЧvalgos."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "Priminti man apie АvykА "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "UЧtildyti"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Gerai"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
 "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
 "know."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:93 calendar/gui/main.c:52
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
 msgid "Could not initialize GNOME"
 msgstr "NegalКjau inicializuoti GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:108
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "NegalКjau inicializuoti Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "NegalКjau sukurti laikino katalogo: %s"
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
-msgstr "Byla nerasta"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A, %Y m. %B %e d."
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a, %b %d"
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
-msgstr "Atidaryti kalendoriЬ"
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a, %b %d"
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
-msgstr "IПsaugoti kalendoriЬ"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:468
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%Y %B"
+
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "NegalКjau sukurti kalendoriaus rodinio. Patikrink, ar gerai Аdiegti ORBit ir "
 "OAF."
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "VieПas"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "AsmeniПkas"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Slaptas"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1606
-#: calendar/gui/event-editor.c:1633
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "NeЧinomas"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "п"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "P"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "R"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:691
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "AukПtas"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
-#: calendar/gui/calendar-model.c:1574
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:690
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normalus"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:689
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "чemas"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Skaidrus"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Neskaidrus"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "NepradКta"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "Vykdoma"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "UЧbaigta"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:544
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Nutraukta"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %Y-%m-%d %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y-%m-%d %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:802
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1689,23 +2055,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:882
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr "Klasifikacija turi bШti ╔VieПas╢, ╔AsmeniПkas╢, ╔Slaptas╢ arba ╔Joks╢"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
-#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1198
-#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
-#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Joks"
 
-#: calendar/gui/calendar-model.c:970
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1715,118 +2085,294 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1010
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "ProcentinК reikПmК turi bШti tarp 0 ir 100 imtinai"
 
-#: calendar/gui/calendar-model.c:1051
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "Prioritetas turi bШti ╔AukПtas╢, ╔Normalus╢, ╔чemas╢ arba ╔NeapibrКЧtas╢."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1064
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "NeapibrКЧtas"
 
-#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "Skaidrumas turi bШti ╔Skaidrus╢, ╔Neskaidrus╢ arba ╔Joks╢"
 
-#: calendar/gui/calendar-model.c:1576
+#: calendar/gui/calendar-model.c:1710
 #, fuzzy
 msgid "Recurring"
 msgstr "Pasikartojimas"
 
-#: calendar/gui/calendar-model.c:1578
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Priskirtas"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Taip"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Ne"
 
-#: calendar/gui/calendar-summary.c:198
-msgid "%A, %e %B %Y"
-msgstr "%A, %Y m. %B %e d."
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "KorteliЬ vaizdas"
 
-#: calendar/gui/calendar-summary.c:207
-msgid "Appointments"
-msgstr "аvykiai"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "Darb_o savaitК"
 
-#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
-msgid "%I:%M%p"
-msgstr "%H:%M"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "ApibrКЧti vaizdus"
 
-#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:948
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "UЧduotys"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "MКnesis"
 
-#: calendar/gui/calendar-summary.c:443
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Klaida Аkeliant kalendoriЬ</b>"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "URI, kurА rodys kalendorius"
 
-#: calendar/gui/calendar-summary.c:455
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Klaida Аkeliant kalendoriЬ:</b>Metodas nepalaikomas"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "PerspКjimai garsu"
 
-#: calendar/gui/calendar-summary.c:622
-msgid "Display"
-msgstr "Vaizdavimas"
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "LaiПko gavКjai"
 
-#: calendar/gui/calendar-summary.c:627
-msgid "Show appointments"
-msgstr "Rodyti Аvykius"
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "Vaizdavimo parinktys"
 
-#: calendar/gui/calendar-summary.c:635
-msgid "Show tasks"
-msgstr "Rodyti uЧduotis"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:690
-msgid "Things to do"
-msgstr "KЮ reikia nuveikti"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "аkeliamas kalendorius"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "URI, kurА rodys kalendorius"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "PerspКjimas bus %A, %Y %b %d, %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "LaiПko ro_dymas"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "PraneПimas apie tavo АvykА %A, %Y %b %d, %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Groti garsЮ"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
-msgstr "NКra jokios apЧvalgos."
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "UЧdaryti"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "Paleisti programЮ"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Keisti АvykА"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "UЧtildymo laikas (minutКmis)"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "dienЬ"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "Atnaujinti kas "
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "valandЬ"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "minuХiЬ"
+
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr " %d dienЬ"
+
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr " 1 diena"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr " %d savaiХiЬ"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr " 1 savaitК"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr " %d valandЬ"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr " 1 valanda"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr " %d minuХiЬ"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr " 1 minutК"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr " %d sekundЧiЬ"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr " 1 sekundК"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr "Groti garsЮ"
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "Rodyti visas laiПko antraПtes"
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an email"
+msgstr "PasiЬsti laiПkЮ"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr "Paleisti programЮ"
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr " prieП Аvykio pradЧiЮ"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr " po Аvykio pradЧios"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr " prieП Аvykio pabaigЮ"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr " po Аvykio pabaigos"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "Pagrindas"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "Data ir laikas"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "Priminimas"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "ApЧvalga:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_Parinktys"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "po"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "prieП"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "dienЮ(as)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr "Аvykio pabaigЮ"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr "valandЮ(as)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+msgid "minute(s)"
+msgstr "minutФ(es)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
+msgstr "Аvykio pradЧiЮ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
@@ -1857,36 +2403,38 @@ msgid "60 minutes"
 msgstr "60 minuХiЬ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "PerspКjimai baigiasi po"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "PerspКjimai garsu"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "PyptelКti, kai atsiranda aliarmo langai."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Kalendorius"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "Kalendoriaus nuostatos"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Spalvos"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+#, fuzzy
+msgid "Compress weekends in month view"
 msgstr "Suspausti savaitgalius"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+#, fuzzy
+msgid "Date Navigator"
 msgstr "DatЬ navigatorius parinktys"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1894,583 +2442,1085 @@ msgid "Defaults"
 msgstr "аprastai"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Vaizdavimo parinktys"
+#: mail/mail-config.glade.h:30
+msgid "Display"
+msgstr "Vaizdavimas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
-msgstr "Kada reikia"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Leisti uЧtildymЮ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Dienos pabaiga:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Pirma savaitКs diena:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "Pen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:484
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Penktadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "ParyПkinti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "пiandienos Аvykius"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "пiandienos Аvykiai:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "аvykius, kurie dar ne Пiandien"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "аvykiai, kurie dar ne Пiandien:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "Pir"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Pirmadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "PraКjusius Аvykius"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "PraКjФ Аvykiai:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
-msgstr "Pasirink spalvЮ"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "Svarbumas"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#, fuzzy
+msgid "Overdue tasks"
+msgstr "PraКjusius Аvykius"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Priminti man apie visus Аvykius"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Priminimas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "пeП"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:485
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "пeПtadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Rodyti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "Rodyti АvykiЬ pabaigos laikus"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Rodyti savaiХiЬ numerius"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "Dienos pradЧia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "Sek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:486
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Sekmadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
 msgstr "UЧduotys"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "пiandienos Аvykius"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "Ket"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Ketvirtadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "LikФs laikas"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Time"
+msgstr "Titulas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "Laiko dalijimas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Laiko formatas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"Laiko juosta: "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "Ant"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Antradienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "PerspКjimai vaizdu"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "Tre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "TreХiadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "Darbo savaitК"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
+msgstr "Darb_o savaitК"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "minutes prieП jiems Аvykstant."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
-msgid "seconds."
-msgstr "sekundЧiЬ."
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "Ar tu tikrai nori iПtrinti ПiЮ sЮskaitЮ?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "Ar tu tikrai nori iПtrinti uЧduotА ╔%s╢?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "Ar tu tikrai nori iПtrinti Чurnalo АraПЮ ╔%s╢?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "UЧbaigta"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "UЧbaigta"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#, fuzzy
+msgid "Due "
+msgstr "Kada reikia"
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "Keisti АvykА"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "аvykis -- %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "UЧduotis -- %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "чurnalo АraПas -- %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "NКra apЧvalgos"
 
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "UЧraПyti bylЮ?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Byla tokiu vardu jau yra.\n"
+"UЧraПyti jЮ?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "IПsaugoti kaip..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Ar tu tikrai nori iПtrinti АvykА ╔%s╢?"
 
-#: calendar/gui/dialogs/delete-comp.c:73
+#: calendar/gui/dialogs/delete-comp.c:87
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Ar tu tikrai nori iПtrinti ПА bevardА АvykА?"
 
-#: calendar/gui/dialogs/delete-comp.c:79
+#: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Ar tu tikrai nori iПtrinti uЧduotА ╔%s╢?"
 
-#: calendar/gui/dialogs/delete-comp.c:82
+#: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Ar tu tikrai nori iПtrinti ПiЮ bevardФ uЧduotА?"
 
-#: calendar/gui/dialogs/delete-comp.c:88
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Ar tu tikrai nori iПtrinti Чurnalo АraПЮ ╔%s╢?"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Ar tu tikrai nori iПtrinti ПА bevardА Чurnalo АraПЮ?"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Ar nori iПsaugoti pakeitimus?"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "Ar tu tikrai nori iПtrinti АvykА ╔%s╢?"
 
-#: calendar/gui/dialogs/task-editor.c:707
-msgid "Edit Task"
-msgstr "Keisti uЧduotА"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "Ar tu tikrai nori iПtrinti uЧduotА ╔%s╢?"
 
-#: calendar/gui/dialogs/task-editor.c:713 calendar/gui/event-editor.c:382
-msgid "No summary"
-msgstr "NКra apЧvalgos"
+#: calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "Ar tu tikrai nori iПtrinti Чurnalo АraПЮ ╔%s╢?"
 
-#: calendar/gui/dialogs/task-editor.c:719 calendar/gui/event-editor.c:388
-#, c-format
-msgid "Appointment - %s"
-msgstr "аvykis -- %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Pasirink bylЮ"
 
-#: calendar/gui/dialogs/task-editor.c:722 calendar/gui/event-editor.c:391
-#, c-format
-msgid "Task - %s"
-msgstr "UЧduotis -- %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Skyriai:"
 
-#: calendar/gui/dialogs/task-editor.c:725 calendar/gui/event-editor.c:394
-#, c-format
-msgid "Journal entry - %s"
-msgstr "чurnalo АraПas -- %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Laiko juosta: "
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% uЧ_baigta:"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
+msgstr "аvykis"
+
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
+msgstr "Priminimas"
+
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
+msgstr "Pasikartojimas"
+
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "AtПaukti susitikimЮ"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "Vis_os dienos Аvykis"
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Klasifikacija"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Date & Time"
 msgstr "Data ir laikas"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "UЧbaigimo data:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Pri_vate"
 msgstr "As_meniПkas"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "PaЧanga"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "_VieПas"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "P_radЧios data:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "Sa_ntrauka:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "UЧduotis"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
 msgid "_Confidential"
 msgstr "_Slaptas"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "_Kontaktai..."
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "P_abaigos laikas:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "_Kada reikia:"
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "_PradЧios laikas:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_Svarbumas:"
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "_BШsena:"
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "GrupКs pavadinimas:"
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
-msgstr "Kategorijos"
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "пaltinis"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Completion Date"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr "Pirmininkas"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr "BШtinas dalyvis"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr "NebШtinas dalyvis"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr "Ne dalyvis"
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "PaПalinti veiksmЮ"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr " Priimti "
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr " Atmesti "
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "IПtrintas"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "Vykdoma"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Automobilio telefonas"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "BШtinas dalyvis"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "NebШtinas dalyvis"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Ne dalyvis"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "IПsiЬsta"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "IПtrinti..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
+msgstr "Dalyvis"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
 msgstr "UЧbaigimo data"
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "End Date"
-msgstr "Pabaigos data"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "IПtrintas"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Start Date"
-msgstr "PradЧios data"
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "IПtrintas"
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
-msgstr "GeografinК vietovК"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "Vadybininkas"
 
-#: calendar/gui/e-calendar-table.c:164
-msgid "Percent complete"
-msgstr "ProcentЬ uЧbaigta"
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "Gruodis"
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Summary"
-msgstr "ApЧvalga"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr "RSVP"
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
-msgstr "Skaidrumas"
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr "RolК"
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
-msgstr "URL"
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "BШsena"
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
-msgstr "PerspКjimai"
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Tipas"
 
-#: calendar/gui/e-calendar-table.c:170
-msgid "Click here to add a task"
-msgstr "Spausk Хia, kad pridКtum uЧduotА"
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizatorius:"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Organizatorius:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "Pakv_iesti kitus..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Organizatorius:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a, %Y %b %d"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "пiame Аvykyje yra pasikartojimЬ, kuriЬ Evolution negali keisti."
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr "lygiai"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "diena"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr " "
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr "-Ю"
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr "kartЮ(us) pasitaikys"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
+msgstr "Kitoks pakartojimas"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Kas"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "IПimtys"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
+msgstr "Jokio pakartojimo"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
+msgstr "PerЧiШra"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
+msgstr "Pakartojimo taisyklК"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
+msgstr "Paprastas pakartojimas"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "Keisti"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "kol"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "amЧinai"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "mКnesА(ius)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr "iki"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "savaitФ(es)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
+msgstr "metus"
+
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr "Ar nori iПsaugoti pakeitimus?"
+
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "UЧbaigimo data:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "IПtrintas"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "IПtrintas"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "Joks"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "UЧduotis"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% uЧ_baigta:"
+
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
+msgstr "PaЧanga"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "P_radЧios data:"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
+msgstr "_Kada reikia:"
+
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
+msgstr "_Svarbumas:"
+
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
+msgstr "_BШsena:"
+
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "PaЧymКti uЧbaigta"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "Ati_daryti"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
-msgstr "PaЧymКti, jog uЧduotis uЧbaigta"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "_IПkirpti"
 
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit this task..."
-msgstr "Keisti ПiЮ uЧduotА..."
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Kopijuoti"
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "Keisti ПiЮ uЧduotА"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "а_dКti"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "PaЧymКti uЧbaigta"
+
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "IПtrinti ПiЮ uЧduotА"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
+msgstr "PaЧymКti uЧbaigta"
+
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "IПtrinti uЧduotА"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
-msgstr "am"
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "Spausk Хia, kad pridКtum uЧduotА"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% uЧ_baigta:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "PerspКjimai"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategorijos"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "UЧbaigta"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "UЧbaigimo data"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "Kada reikia"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Pabaigos data"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "GeografinК vietovК"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Svarbumas"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "PradЧios data"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "ApЧvalga"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "UЧduotys"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "Skaidrumas"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minuХiЬ padalos"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A, %B %e"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr "%a, %b %d"
-
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%b %d"
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "pm"
+
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Naujas Аvykis"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "Naujas visos dienos Аvykis"
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
-msgid "Go to Today"
-msgstr "Eiti А ПiandienЮ"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "Eiti А Пia_ndienЮ"
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "Eiti А datЮ..."
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Atidaryti"
-
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "IПtrinti ПА АvykА"
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "аraПyti susitikimЮ А dienotvarkФ"
-
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Leisti perkelti ПА pasitaikymЮ"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "IПtrinti ПА pasitaikymЮ"
 
-#: calendar/gui/e-day-view.c:3179
-msgid "Delete all Occurrences"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "IПtrinti visus pasitaikymus"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minuХiЬ padalos"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
-msgstr "AП negalКjau atnaujinti tavo kalendoriaus bylos!\n"
+#: calendar/gui/e-itip-control.c:697
+#, fuzzy
+msgid "This is a meeting request."
+msgstr "_Tai yra paПto adresas"
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
-msgid "Component successfully updated."
-msgstr "Komponentas sКkmingai atnaujintas."
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
-msgstr "Buvo klaida Аkeliant kalendoriaus bylЮ."
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
-msgstr "AП negalКjau atidaryti tavo kalendoriaus bylos!\n"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
-msgstr "AП negalКjau Аkelti tavo kalendoriaus bylos!\n"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
-msgstr "AП negalКjau skaityti tavo kalendoriaus bylos!\n"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+#, fuzzy
+msgid "The message is not understandable."
+msgstr "пis laiПkas Пiuo metu nepasiekiamas"
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
-msgstr "Tai atsakymas iП kaЧko, kas nebuvo pakviestas!"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:499
-msgid "I couldn't update your calendar store."
-msgstr "NegalКjau atnaujinti kalendoriaus saugyklos."
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
-msgstr "AП negalКjau iПtrinti kalendoriaus komponento!\n"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Component successfully deleted."
-msgstr "Komponentas sКkmingai iПtrintas."
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-msgid "I don't recognize this type of calendar component."
-msgstr "AП nepaЧАstu tokio kalendoriaus komponento tipo."
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
-msgstr "PridКti А kalendoriЬ"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
-msgid " Accept "
-msgstr " Priimti "
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:815
-msgid " Decline "
-msgstr " Atmesti "
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Tentative "
+#: calendar/gui/e-itip-control.c:834
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "Atrodo, jog aplankas yra neatkuriamai sugadintas."
+
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
-msgstr "Atnaujinti kalendoriЬ"
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
-msgstr "AtПaukti susitikimЮ"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr "AП negalКjau atnaujinti tavo kalendoriaus bylos!\n"
+
+#: calendar/gui/e-itip-control.c:1015
+#, fuzzy
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "AП negalКjau atidaryti tavo kalendoriaus bylos!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, fuzzy, no-c-format
@@ -2485,26 +3535,22 @@ msgstr "--kam--"
 msgid "Calendar Message"
 msgstr "Kalendoriaus ЧinutК"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:623
+#: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Data:"
 
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "аkeliamas kalendorius"
+
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "аkeliamas kalendorius..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizatorius:"
-
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Serverio ЧinutК:"
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "ApЧvalga:"
-
 #: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "pabaigos-data"
@@ -2513,419 +3559,48 @@ msgstr "pabaigos-data"
 msgid "date-start"
 msgstr "pradЧios-data"
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "Dalyvis"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "Dalyvio adresas"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "Dalyviai: "
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"AtПaukti\n"
-"susitikimЮ"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr "Pirmininkas"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "Susitikimo pakvietimai"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "Ne dalyvis"
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "NebШtinas dalyvis"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "Organizatorius: "
-
-#: calendar/gui/e-meeting-dialog.glade.h:14
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"Skelbti\n"
-"АvykА"
-
-#: calendar/gui/e-meeting-dialog.glade.h:16
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"PapraПyti\n"
-"susitikimo"
-
-#: calendar/gui/e-meeting-dialog.glade.h:19
-msgid "Required Participant"
-msgstr "BШtinas dalyvis"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Role"
-msgstr "RolК"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"Laikas\n"
-"dienotvarkКje"
-
-#: calendar/gui/e-meeting-dialog.glade.h:23 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1083
-msgid "Status"
-msgstr "BШsena"
-
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "Visi"
 
-#: calendar/gui/e-tasks.c:155
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "Kategorija:"
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "NegalКjau Аkelti uЧduoХiЬ А ╔%s╢"
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metodas, reikalingas Аkelti ╔%s╢, nepalaikomas"
 
-#: calendar/gui/event-editor.c:376
-msgid "Edit Appointment"
-msgstr "Keisti АvykА"
-
-#: calendar/gui/event-editor.c:454
-msgid "on"
-msgstr "lygiai"
-
-#: calendar/gui/event-editor.c:479 filter/filter-datespec.c:81
-msgid "day"
-msgstr "diena"
-
-#: calendar/gui/event-editor.c:606
-msgid "on the"
-msgstr " "
-
-#: calendar/gui/event-editor.c:613
-msgid "th"
-msgstr "-Ю"
-
-#: calendar/gui/event-editor.c:759
-msgid "occurrences"
-msgstr "kartЮ(us) pasitaikys"
-
-#: calendar/gui/event-editor.c:876
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "пiame Аvykyje yra pasikartojimЬ, kuriЬ Evolution negali keisti."
-
-#: calendar/gui/event-editor.c:1548
-#, c-format
-msgid " %d days"
-msgstr " %d dienЬ"
-
-#: calendar/gui/event-editor.c:1550
-msgid " 1 day"
-msgstr " 1 diena"
-
-#: calendar/gui/event-editor.c:1553
-#, c-format
-msgid " %d weeks"
-msgstr " %d savaiХiЬ"
-
-#: calendar/gui/event-editor.c:1555
-msgid " 1 week"
-msgstr " 1 savaitК"
-
-#: calendar/gui/event-editor.c:1558
-#, c-format
-msgid " %d hours"
-msgstr " %d valandЬ"
-
-#: calendar/gui/event-editor.c:1560
-msgid " 1 hour"
-msgstr " 1 valanda"
-
-#: calendar/gui/event-editor.c:1563
-#, c-format
-msgid " %d minutes"
-msgstr " %d minuХiЬ"
-
-#: calendar/gui/event-editor.c:1565
-msgid " 1 minute"
-msgstr " 1 minutК"
-
-#: calendar/gui/event-editor.c:1568
-#, c-format
-msgid " %d seconds"
-msgstr " %d sekundЧiЬ"
-
-#: calendar/gui/event-editor.c:1570
-msgid " 1 second"
-msgstr " 1 sekundК"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1593
-msgid "Play a sound"
-msgstr "Groti garsЮ"
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1596
-msgid "Show a dialog"
-msgstr "Rodyti dialogЮ"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1599
-msgid "Send an email"
-msgstr "PasiЬsti laiПkЮ"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1602
-msgid "Run a program"
-msgstr "Paleisti programЮ"
-
-#: calendar/gui/event-editor.c:1617
-msgid " before start of appointment"
-msgstr " prieП Аvykio pradЧiЮ"
-
-#: calendar/gui/event-editor.c:1619
-msgid " after start of appointment"
-msgstr " po Аvykio pradЧios"
-
-#: calendar/gui/event-editor.c:1627
-msgid " before end of appointment"
-msgstr " prieП Аvykio pabaigЮ"
-
-#: calendar/gui/event-editor.c:1629
-msgid " after end of appointment"
-msgstr " po Аvykio pabaigos"
-
-#: calendar/gui/event-editor.c:3137 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%a, %Y %b %d"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Vis_os dienos Аvykis"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "аvykis"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "аvykio pagrindai"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Kitoks pakartojimas"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Kas"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "IПimtys"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Keisti"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Jokio pakartojimo"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "PerЧiШra"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Pasikartojimas"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Pakartojimo taisyklК"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Priminimas"
-
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "Nuostatos..."
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Paprastas pakartojimas"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "P_abaigos laikas:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "_PradЧios laikas:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "_PradЧios data:"
-
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "po"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
-msgid "before"
-msgstr "prieП"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "dienЮ(as)"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "Аvykio pabaigЮ"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "kol"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "amЧinai"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "valandЮ(as)"
-
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
-msgid "minute(s)"
-msgstr "minutФ(es)"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr "mКnesА(ius)"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "start of appointment"
-msgstr "Аvykio pradЧiЮ"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "until"
-msgstr "iki"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "week(s)"
-msgstr "savaitФ(es)"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "year(s)"
-msgstr "metus"
-
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-msgid "New Appointment..."
-msgstr "Naujas Аvykis..."
-
-#: calendar/gui/e-week-view.c:3314
-msgid "Delete All Occurrences"
-msgstr "IПtrinti visus pasitaikymus"
-
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%B %e"
 
-#: calendar/gui/gnome-cal.c:223
-msgid "Show all "
-msgstr "Rodyti visus "
-
-#: calendar/gui/gnome-cal.c:237
-msgid "Summary contains"
-msgstr "Santraukoje yra"
-
-#: calendar/gui/gnome-cal.c:238
-msgid "Description contains"
-msgstr "ApraПyme yra"
-
-#: calendar/gui/gnome-cal.c:239
-msgid "Comment contains"
-msgstr "Komentare yra"
-
-#: calendar/gui/gnome-cal.c:240
-msgid "Has category"
-msgstr "Turi kategorijЮ"
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "Naujas Аvykis..."
 
-#: calendar/gui/gnome-cal.c:843
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "NegalКjau atidaryti aplanko su ╔%s╢"
 
-#: calendar/gui/gnome-cal.c:854
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metodas, reikalingas atidaryti ╔%s╢, nepalaikomas"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-#, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution paПto komponento."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution kalendoriaus iTip/iMip vaizduoklК"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "Evolution komponentas tvarkyti kalendoriui."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr "Kalendoriaus apЧvalgos komponento gamykla."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "Evolution kalendoriaus komponento gamykla."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Balandis"
@@ -2947,232 +3622,256 @@ msgid "Go To Date"
 msgstr "Eiti А datЮ"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Eiti А ПiandienЮ"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Sausis"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "Liepa"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "BirЧelis"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "Kovas"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "GeguЧК"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "Lapkritis"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "Spalis"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "RugsКjis"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Eiti А ПiandienЮ"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1-a"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2-a"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3-a"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4-a"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5-a"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6-ta"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7-ta"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8-ta"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9-ta"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10-ta"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11-ta"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12-ta"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13-ta"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14-ta"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15-ta"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16-ta"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17-ta"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18-ta"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19-ta"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20-ta"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21-a"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22-a"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23-a"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24-ta"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25-ta"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26-ta"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27-ta"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28-ta"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29-ta"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30-ta"
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31-a"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Sk"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Pr"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "An"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "Tr"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Kt"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Pn"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "пt"
 
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "UЧduotys"
+
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "Esama diena (%a, %Y %d %b)"
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1104
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Esama savaitК (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Esamas mКnuo (%Y %b)"
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Esami metai (%Y)"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Spausdinti kalendoriЬ"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1524
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:57
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Spaudinio perЧiШra"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Spausdinti ПА elementЮ"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "Spausdinimo nuostatos"
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "Vaizduojamo uЧduoХiЬ aplanko URI"
 
@@ -3208,86 +3907,106 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "SPATKPп"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 #, fuzzy
 msgid "Signing is not supported by this cipher"
 msgstr "Nurodytas tipas Пioje saugykloje nepalaikomas"
 
-#: camel/camel-cipher-context.c:209
+#: camel/camel-cipher-context.c:211
 #, fuzzy
 msgid "Clearsigning is not supported by this cipher"
 msgstr "Nurodytas tipas Пioje saugykloje nepalaikomas"
 
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:251
 #, fuzzy
 msgid "Verifying is not supported by this cipher"
 msgstr "Nurodytas tipas Пioje saugykloje nepalaikomas"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:294
 #, fuzzy
 msgid "Encryption is not supported by this cipher"
 msgstr "Nurodytas tipas Пioje saugykloje nepalaikomas"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:336
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "Nurodytas tipas Пioje saugykloje nepalaikomas"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr "Tu turi dirbti prisijungФs, kad uЧbaigtum ПА veiksmЮ"
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "Sinchronizuojami aplankai"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr "Negaliu atidaryti kaupo aplanko"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Negaliu procesinti kaupo aplanko"
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "Gaunamas laiПkas %d (%d%%)"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
-#, c-format
-msgid "Failed message %d"
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, fuzzy, c-format
+msgid "Failed on message %d"
 msgstr "Nepavyko laiПkas %d"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "Negaliu atidaryti laiПko"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "Sinchronizuojamas aplankas"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-msgid "Complete"
-msgstr "UЧbaigta"
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Gaunamas laiПkas %d iП %d"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "NesКkmК ties laiПku %d iП %d"
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Klaida nagrinКjant filtrЮ: %s: %s"
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Klaida vykdant filtrЮ: %s: %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Klaida vykdant filtro paieПkЮ: %s: %s"
@@ -3323,14 +4042,33 @@ msgstr "Vykdoma uЧklausa neЧinomai antraПtei: %s"
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "NegalКjau sukurti pipe: %s"
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Negaliu sukurti aplanko uЧrakto ant %s: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "Nepavyko Аkelti %s: %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "NegalКjau sukurti %s uЧrakto bylos: %s"
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "BaigКsi laikas, belaukiant %s uЧrakto bylos. Bandyk vКliau."
@@ -3345,114 +4083,109 @@ msgstr "Nepavyko gauti uЧrakto naudojant fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nepavyko gauti uЧrakto naudojant flock(2): %s"
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "NegalКjau patikrinti paПto bylos %s: %s"
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "NegalКjau atidaryti paПto bylos %s: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "NegalКjau atidaryti laikinos paПto bylos %s: %s"
 
-#: camel/camel-movemail.c:199
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "NegalКjau patikrinti %s uЧrakto bylos: %s"
-
-#: camel/camel-movemail.c:245
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Klaida skaitant paПto bylЮ: %s"
-
-#: camel/camel-movemail.c:256
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Klaida АraПant laikinЮ paПto bylЮ: %s"
-
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Nepavyko АraПyti laiПkЬ А laikinЮ bylЮ %s: %s"
 
-#: camel/camel-movemail.c:306
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "NegalКjau sukurti pipe: %s"
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Nepavyko programa Movemail: %s"
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(NeЧinoma klaida)"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Klaida skaitant paПto bylЮ: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Klaida АraПant laikinЮ paПto bylЮ: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Klaida kopijuojant laikinЮ paПto bylЮ: %s"
 
-#: camel/camel-pgp-context.c:188
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "PraПau Аvesti tavo %s slaptaЧodА dКl %s"
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "PraПau Аvesti tavo %s slaptaЧodА"
 
-#: camel/camel-pgp-context.c:509
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
-#: camel/camel-pgp-context.c:1055 camel/camel-pgp-context.c:1267
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Nepateiktas slaptaЧodis."
 
-#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
-#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1062
-#: camel/camel-pgp-context.c:1274
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:681
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:871
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr ""
 
-#: camel/camel-pgp-context.c:888
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "NegalКjau sukurti laikinos bylos: %s"
 
-#: camel/camel-pgp-context.c:1045
+#: camel/camel-pgp-context.c:1063
 #, fuzzy
 msgid "No plaintext to encrypt."
 msgstr "Paspausk ant ikonos, kad iППifruotum."
 
-#: camel/camel-pgp-context.c:1071
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "Nenurodyti jokie gavКjai"
 
-#: camel/camel-pgp-context.c:1259
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -3471,37 +4204,37 @@ msgstr "Nepavyko Аkelti %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nepavyko Аkelti %s: Modulyje nКra inicializacijos kodo."
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s serveris %s"
 
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr "Jungtis nutraukta"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "NegalКjau prisijungti prie %s (prievadas %d): %s"
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr "(neЧinomas hostas)"
 
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:287
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "Veiksmas nutrauktas"
 
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "Serveris netikКtai atsijungК"
 
@@ -3606,7 +4339,7 @@ msgid ""
 msgstr "NegalКjau sukurti pipe: %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "Blogas autentikacijos atsakymas iП serverio."
 
@@ -3672,12 +4405,12 @@ msgstr "VirtualiЬ aplankЬ paПto tiekКjas."
 msgid "For reading mail as a query of another set of folders"
 msgstr "PaПto skaitymui naudojant uЧklausЮ iП kitЬ aplankЬ aibКs"
 
-#: camel/camel-session.c:294 camel/camel-session.c:363
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Protokolui ╔%s╢ nКra tiekКjo."
 
-#: camel/camel-session.c:478
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3686,11 +4419,61 @@ msgstr ""
 "NegalКjau sukurti katalogo %s:\n"
 "%s"
 
-#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:1007 mail/mail-ops.c:1014
-#: mail/mail-ops.c:1032 mail/mail-ops.c:1033
-msgid "Trash"
-msgstr "пiukПlКs"
+#: camel/camel-smime-context.c:173
+#, fuzzy, c-format
+msgid "Please enter your password for %s"
+msgstr "PraПau Аvesti tavo %s slaptaЧodА dКl %s"
+
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "Tokios bylos nКra."
+
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "Tokios bylos nКra."
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, fuzzy, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "Nepavyko serveriui nusiЬsti vartotojo vardo"
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
+#, fuzzy
+msgid "Failed to decode message."
+msgstr "Nepavyko laiПkas %d"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
+#, c-format
+msgid ""
+"Issuer: %s\n"
+"Subject: %s"
+msgstr ""
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
 
 #: camel/camel-tcp-stream-ssl.c:348
 #, c-format
@@ -3711,28 +4494,17 @@ msgstr ""
 "Valstija: %s\n"
 "ValstybК: %s"
 
-#. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:364
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
-msgstr ""
-
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "NegalКjau iПnagrinКti URL ╔%s╢"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr "NКra tokio laiПko %s aplanke %s"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "NКra tokio laiПko: %s"
@@ -3741,64 +4513,75 @@ msgstr "NКra tokio laiПko: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Tu negali kopijuoti laiПkЬ iП Пio ПiukПliЬ aplanko."
 
-#: camel/providers/imap/camel-imap-message-cache.c:150
-#, fuzzy, c-format
-msgid "Could not open cache directory: %s"
-msgstr "NegalКjau sukurti katalogo %s: %s"
-
-#: camel/providers/imap/camel-imap-command.c:232
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "NetikКtas atsakymas iП IMAP serverio: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Nepavyko IMAP komanda: %s"
 
-#: camel/providers/imap/camel-imap-command.c:241 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "NeЧinoma klaida"
-
-#: camel/providers/imap/camel-imap-command.c:295
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "Serverio atsakymas baigКsi per anksti."
 
-#: camel/providers/imap/camel-imap-command.c:487
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP serverio atsakyme nebuvo %s informacijos"
 
-#: camel/providers/imap/camel-imap-command.c:524
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "NetikКtas atsakymas OK iП IMAP serverio: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:170
+#: camel/providers/imap/camel-imap-folder.c:192
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "NegalКjau sukurti katalogo %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:189
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nepavyko Аkelti %s santraukos"
 
-#: camel/providers/imap/camel-imap-folder.c:362
-msgid "Scanning IMAP folder"
-msgstr "Skanuojamas IMAP aplankas"
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
+msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1043
-#: camel/providers/imap/camel-imap-folder.c:1265
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "IПsaugomi laiПkai"
+
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "пis laiПkas Пiuo metu nepasiekiamas"
 
-#: camel/providers/imap/camel-imap-folder.c:1071
-#: camel/providers/imap/camel-imap-folder.c:1298
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "IПsaugomi laiПkai"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "NegalКjau rasti laiПko teksto FETCH atsakyme"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, fuzzy, c-format
+msgid "Could not open cache directory: %s"
+msgstr "NegalКjau sukurti katalogo %s: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "Tikrinama, ar yra naujЬ laiПkЬ"
 
@@ -3806,7 +4589,7 @@ msgstr "Tikrinama, ar yra naujЬ laiПkЬ"
 msgid "Check for new messages in all folders"
 msgstr "Patikrinti, ar yra naujЬ laiПkЬ visuose aplankuose"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:551
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Aplankai"
 
@@ -3840,28 +4623,28 @@ msgstr ""
 "Su Пia parinktimi jungiantis prie IMAP serverio bus naudojamas paprasto "
 "teksto slaptaЧodis."
 
-#: camel/providers/imap/camel-imap-store.c:454
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP serveris %s nepalaiko praПyto autentikacijos tipo %s"
 
-#: camel/providers/imap/camel-imap-store.c:464
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Nepalaikoma %s tipo autentikacija"
 
-#: camel/providers/imap/camel-imap-store.c:488
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPraПom Аvesti IMAP slaptaЧodА dКl %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:503
-#: camel/providers/smtp/camel-smtp-transport.c:402
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "Tu neАvedei slaptaЧodЧio."
 
-#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3871,36 +4654,51 @@ msgstr ""
 "NegalКjau autentikuotis А IMAP serverА.\n"
 "%s\n"
 
-#: camel/providers/imap/camel-imap-store.c:788 mail/mail-local.c:337
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
 msgid "No such folder %s"
 msgstr "NКra tokio aplanko %s"
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "MH formato paПto katalogai"
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr "PaПto laikymui MH tipo paПto kataloguose"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr "StandartinК Unix mailbox byla"
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr "Vietinio paПto laikymui standartiniu mbox formatu"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr "Qmail maildir formato paПto bylos"
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr "Vietinio paПto laikymui qmail maildir kataloguose"
 
+#: camel/providers/local/camel-local-provider.c:70
+#, fuzzy
+msgid "Unix mbox spool-format mail files"
+msgstr "Qmail maildir formato paПto bylos"
+
+#: camel/providers/local/camel-local-provider.c:71
+#, fuzzy
+msgid "For storing local mail in standard Unix spool directories"
+msgstr "Vietinio paПto laikymui qmail maildir kataloguose"
+
 #: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Saugyklos Пaknis %s nКra absoliutus kelias"
@@ -3940,24 +4738,24 @@ msgstr "NegalКjau iПtrinti aplanko santraukos bylos ╔%s╢: %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "NegalКjau iПtrinti aplanko indekso bylos ╔%s╢: %s"
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nepavyko pridКti laiПko А santraukЮ: neЧinoma prieЧastis"
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "NegalКjau pridurti laiПko prie maildir aplanko: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3966,18 +4764,19 @@ msgstr ""
 "Negaliu gauti laiПko: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "NКra tokio laiПko"
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr "Blogas laiПko turinys"
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -3987,14 +4786,14 @@ msgstr ""
 "NegalКjau atidaryti aplanko ╔%s╢:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "NКra tokio aplanko ╔%s╢."
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4004,22 +4803,29 @@ msgstr ""
 "NegalКjau sukurti aplanko: ╔%s╢:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "╔%s╢ nКra maildir katalogas."
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "NegalКjau iПtrinti aplanko ╔%s╢: %s"
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "ne maildir katalogas"
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"NegalКjau sukurti aplanko: ╔%s╢:\n"
+"%s"
+
 #: camel/providers/local/camel-maildir-summary.c:405
 #: camel/providers/local/camel-maildir-summary.c:526
 #, c-format
@@ -4027,11 +4833,13 @@ msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Negaliu atidaryti maildir katalogo kelio: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Negaliu sukurti aplanko uЧrakto ant %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Negaliu atidaryti paПto dКЧutКs: %s: %s\n"
@@ -4041,9 +4849,12 @@ msgstr "Negaliu atidaryti paПto dКЧutКs: %s: %s\n"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Negaliu pridurti laiПko prie mbox bylos: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4052,11 +4863,13 @@ msgstr ""
 "Negaliu gauti laiПko: %s iП aplanko %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Atrodo, jog aplankas yra neatkuriamai sugadintas."
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Nepavyko sukurti laiПko: Sugadinta paПto dКЧutК?"
 
@@ -4102,36 +4915,45 @@ msgstr "Aplankas ╔%s╢ nКra tuПХias. NeiПtryniau."
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
 #: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "Daroma aplanko santrauka"
 
 #: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "NegalКjau atidaryti aplanko: %s: daroma santrauka nuo vietos %ld: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "NegalКjau padaryti aplanko santraukos: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1397
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Sinchronizuojamas aplankas"
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "NegalКjau atidaryti aplanko santraukos darymui: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "NegalКjau atidaryti laikinos paПto bylos: %s"
@@ -4140,21 +4962,28 @@ msgstr "NegalКjau atidaryti laikinos paПto bylos: %s"
 #: camel/providers/local/camel-mbox-summary.c:557
 #: camel/providers/local/camel-mbox-summary.c:746
 #: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Santrauka ir aplankas nesutampa net po sinchronizavimo"
 
 #: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Klaida raПant А laikinЮ paПto dКЧutФ: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Nepavyko raПyti А laikinЮ paПto dКЧutФ: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:635
 #: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "NegalКjau uЧdaryti Пaltinio aplanko %s: %s"
@@ -4169,13 +4998,14 @@ msgstr "NegalКjau uЧdaryti laikino aplanko:  %s"
 msgid "Could not rename folder: %s"
 msgstr "NegalКjau pervadinti aplanko: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "NeЧinoma klaida: %s"
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "NegalКjau pridurti laiПko prie mh aplanko: %s: %s"
@@ -4190,39 +5020,93 @@ msgstr "╔%s╢ nКra katalogas."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Negaliu atidaryti MH katalogo kelio: %s: %s"
 
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "Negaliu pridurti laiПko prie mbox bylos: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "╔%s╢ nКra paprasta byla."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "NКra tokio aplanko ╔%s╢."
+
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy
+msgid "Spool stores do not have an inbox"
+msgstr "VietinКse saugyklose nКra inbox"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "VietinК paПto byla %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "NegalКjau atidaryti laikinos paПto bylos %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "NegalКjau uЧdaryti Пaltinio aplanko %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "PraПom Аvesti NNTP slaptaЧodА vartotojui %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "Serveris atmetК vartotojo vardЮ"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "Nepavyko serveriui nusiЬsti vartotojo vardo"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "Serveris atmetК vartotojo vardЮ/slaptaЧodА"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "LaiПkas %s nerastas."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "NegalКjau gauti grupiЬ sЮraПo iП serverio."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Negaliu Аkelti grupiЬ sЮraПo bylos dКl %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Negaliu iПsaugoti grupiЬ sЮraПo bylos dКl %s: %s"
@@ -4235,17 +5119,17 @@ msgstr "USENET naujienos"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Tai tiekКjas, naudojamas skaitant ir raПant А USENET naujienЬ grupes."
 
-#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "NegalКjau atidaryti katalogo naujienЬ serveriui: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET naujienos per %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4253,8 +5137,8 @@ msgstr ""
 "Su Пia parinktimi NNTP serveryje bus autentikuojamasi paprasto teksto "
 "slaptaЧodЧiu."
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "NegalКjau atidaryti ar sukurti .newsrc bylos dКl %s: %s"
@@ -4305,7 +5189,7 @@ msgstr "Palikti laiПkus serveryje"
 msgid "Delete after %s day(s)"
 msgstr "IПtrinti po %s dienos(Ь)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4400,7 +5284,7 @@ msgid "No such folder `%s'."
 msgstr "NКra tokio aplanko ╔%s╢."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4453,7 +5337,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "PaПto siuntimas per sendmail programЮ"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4463,124 +5347,124 @@ msgstr ""
 "PaПto siuntimui, prisijungiant prie nutolusio paПto serverio naudojant "
 "SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "SintaksКs klaida, komanda neatpaЧinta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "Sintakses klaida parametruose arba argumentuose"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Komanda neАgyvendinta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "Komandos parametras neАgyvendintas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr "Sistemos bШsena, arba sistemos pagalbos atsakymas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "Pagalbos ЧinutК"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Paslauga pasiruoПusi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 #, fuzzy
 msgid "Service closing transmission channel"
 msgstr "Paslauga uЧdaro"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr "PraПytas paПto veiksmas pavyko, uЧbaigtas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "PraПytas paПto veiksmas neАvykdytas: paПto dКЧutК neprieinama"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "PraПytas veiksmas neАvykdytas: paПto dКЧutК neprieinama"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr "PraПytas veiksmas nutrauktas: klaida vykdant"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr "PraПytas veiksmas neАvykdytas: trШksta vietos sistemoje"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "PraПytas veiksmas neАvykdytas: perЧengta vietos saugykloje riba"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "PraПytas veiksmas neАvykdytas: paПto dКЧutКs vardas neleistinas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "Tranzakcija nepavyko"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "Nepateiktas slaptaЧodis."
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "Autentikacijos mechanizmas per silpnas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr "PraПytam autentikacijos mechanizmui bШtinas Пifravimas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "Laikina autentikacijos nesКkmК"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "Autentikacija bШtina"
 
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Atsakymo А pasisveikinimЮ klaida: %s: galbШt nelemtinga"
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "SMTP serveris %s nepalaiko praПyto autentikacijos tipo %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:387
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sPraПom Аvesti SMTP slaptaЧodА dКl %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:410
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4590,316 +5474,236 @@ msgstr ""
 "NegalКjau autentikuotis А SMTP serverА.\n"
 "%s\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:526
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP serveris %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:528
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP paПto siuntimas per %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:553
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr "Negaliu siЬsti laiПko: siuntКjo adresas neapibrКЧtas."
 
-#: camel/providers/smtp/camel-smtp-transport.c:560
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr "Negaliu siЬsti laiПko: siuntКjo adresas neteisingas."
 
-#: camel/providers/smtp/camel-smtp-transport.c:574
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "SiunХiamas laiПkas"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "Negaliu siЬsti laiПko: neapibrКЧti jokie gavКjai."
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "BaigКsi HELO uЧklausos laiko riba: %s: nelemtinga"
 
-#: camel/providers/smtp/camel-smtp-transport.c:687
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO atsakymo klaida: %s: nelemtinga"
 
-#: camel/providers/smtp/camel-smtp-transport.c:720
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr "Klaida sukuriant SASL autentikacijos objektЮ."
 
-#: camel/providers/smtp/camel-smtp-transport.c:735
-#: camel/providers/smtp/camel-smtp-transport.c:747
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Autentikacija"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "BaigКsi AUTH uЧklausos laiko riba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:797
+#: camel/providers/smtp/camel-smtp-transport.c:782
+#, fuzzy
+msgid "AUTH request failed."
+msgstr "BaigКsi AUTH uЧklausos laiko riba: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr "Blogas autentikacijos atsakymas iП serverio.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:823
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "BaigКsi MAIL FROM uЧklausos laiko riba: %s: paПtas neiПsiЬstas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:842
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "MAIL FROM atsakymo klaida: %s: paПtas neiПsiЬstas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:867
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "BaigКsi RCPT TO uЧklausos laiko riba: %s: paПtas neiПsiЬstas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:886
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "RCPT TO atsakymo klaida: %s: paПtas neiПsiЬstas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:917
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "BaigКsi DATA uЧklausos laiko riba: %s: paПtas neiПsiЬstas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:936
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA atsakymo klaida: %s: paПtas neiПsiЬstas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:951
-#: camel/providers/smtp/camel-smtp-transport.c:969
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "BaigКsi DATA siuntimo laiko riba: laiПko nutraukimas: %s: paПtas neiПsiЬstas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:988
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "DATA atsakymo klaida: laiПko nutraukimas: %s: paПtas neiПsiЬstas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1012
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "BaigКsi RSET uЧklausos laiko riba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1031
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET atsakymo klaida: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1054
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "BaigКsi QUIT uЧklausos laiko riba: %s: nelemtinga"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1073
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT atsakymo klaida: %s: nelemtinga"
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 baitas"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u baitЬ"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "priedas"
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Prisegti bylЮ"
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "PaПalinti paЧymКtus elementus iП priedЬ sЮraПo"
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Prisegti priedЮ..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "Prisegti bylЮ prie Пio laiПko"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1083
-msgid "Attachment"
-msgstr "Priedas"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "Priedo savybКs"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Bylos vardas:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "Vidinis priedas"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "MIME tipas:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "SiЬsti kaip:"
-
-#: composer/e-msg-composer.c:529
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"NegalКjau atidaryti paraПo bylos %s: \n"
-"%s"
-
-#: composer/e-msg-composer.c:702
-msgid "Save as..."
-msgstr "IПsaugoti kaip..."
-
-#: composer/e-msg-composer.c:713
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Klaida iПsaugant bylЮ: %s"
-
-#: composer/e-msg-composer.c:733
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Klaida Аkeliant bylЮ: %s"
-
-#: composer/e-msg-composer.c:805
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"Nepavyko atidaryti Пios sЮskaitos juodraПХiЬ aplanko.\n"
-"Ar norКtum naudoti АprastinА juodraПХiЬ aplankЮ?"
-
-#: composer/e-msg-composer.c:863 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:869
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"пis laiПkas nebuvo iПsiЬstas.\n"
-"\n"
-"Ar norКtum iПsaugoti jo pakeitimus?"
-
-#: composer/e-msg-composer.c:894
-msgid "Open file"
-msgstr "Atidaryti bylЮ"
-
-#: composer/e-msg-composer.c:1020
-msgid "That file does not exist."
-msgstr "Tokios bylos nКra."
-
-#: composer/e-msg-composer.c:1030
-msgid "That is not a regular file."
-msgstr "Tai nКra paprasta byla."
-
-#: composer/e-msg-composer.c:1040
-msgid "That file exists but is not readable."
-msgstr "Byla yra, bet jos neАmanoma perskaityti."
-
-#: composer/e-msg-composer.c:1050
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Ta byla atrodК pasiekiama, bet open(2) nepavyko."
-
-#: composer/e-msg-composer.c:1072
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
 msgstr ""
-"Byla yra labai didelК (virП 100K).\n"
-"Ar tu tikrai nori jЮ Аterpti?"
-
-#: composer/e-msg-composer.c:1093
-msgid "An error occurred while reading the file."
-msgstr "аvyko klaida, beskaitant bylЮ."
 
-#: composer/e-msg-composer.c:1394 composer/e-msg-composer.c:1737
-msgid "Compose a message"
-msgstr "Sukurti laiПkЮ"
-
-#: composer/e-msg-composer.c:1828
-msgid "Could not create composer window."
-msgstr "NegalКjau sukurti raПyklКs lango."
-
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "Paspausk Хia, jei reikia adresЬ knygelКs"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:354 mail/mail-format.c:744
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "Nuo:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:360 mail/mail-format.c:746
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "Atsakyti-kam:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:371 mail/mail-format.c:643
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Tema:"
 
-#: composer/e-msg-composer-hdrs.c:385 mail/mail-format.c:748
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "Kam:"
 
-#: composer/e-msg-composer-hdrs.c:386
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "аvesk laiПko gavКjus"
 
-#: composer/e-msg-composer-hdrs.c:389 mail/mail-format.c:750
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "аvesk adresus, kurie gaus Пio laiПko carbon copy"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4907,329 +5711,277 @@ msgstr ""
 "аvesk adresus, kurie gaus Пio laiПko carbon copy, bet jЬ nesimatys laiПko "
 "gavКjЬ sЮraПe."
 
-#: composer/evolution-composer.c:355
-msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
-"NegalКjau sukurti raПyklКs lango, nes tu dar nenurodei\n"
-"jokios asmenybКs paПto komponente."
-
-#: composer/evolution-composer.c:370
-msgid "Cannot initialize Evolution's composer."
-msgstr "NegalКjau inicializuoti Evolution raПyklКs."
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Prisegti bylЮ"
 
-#: data/evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
+#: composer/e-msg-composer.c:670
+#, fuzzy, c-format
+msgid ""
+"Could not open file %s:\n"
+"%s"
 msgstr ""
+"NegalКjau atidaryti bylos ╔%s╢: \n"
+"%s"
 
-#: data/evolution.keys.in.h:1
-msgid "address card"
-msgstr "adreso kortelК"
-
-#: data/evolution.keys.in.h:2
-msgid "calendar information"
-msgstr "kalendoriaus informacija"
-
-#. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
-msgid "%m/%d/%Y"
-msgstr "%Y-%m-%d"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr "Klaida Аkeliant bylЮ: %s"
 
-#. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
-msgid "%a %m/%d/%Y"
-msgstr "%a %Y-%m-%d"
+#: composer/e-msg-composer.c:873
+msgid "Save as..."
+msgstr "IПsaugoti kaip..."
 
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
-msgid "%a %m/%d/%Y %H:%M"
-msgstr "%a %Y-%m-%d %H:%M"
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "аspКjimas"
 
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%a %Y-%m-%d %H:%M"
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
-msgid "%H:%M"
-msgstr "%H:%M"
+#: composer/e-msg-composer.c:906
+#, c-format
+msgid "Error saving file: %s"
+msgstr "Klaida iПsaugant bylЮ: %s"
 
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
+#: composer/e-msg-composer.c:926
+#, c-format
+msgid "Error loading file: %s"
+msgstr "Klaida Аkeliant bylЮ: %s"
 
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
-msgid "%I:%M %p"
-msgstr "%H:%M"
+#: composer/e-msg-composer.c:997
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"Nepavyko atidaryti Пios sЮskaitos juodraПХiЬ aplanko.\n"
+"Ar norКtum naudoti АprastinА juodraПХiЬ aplankЮ?"
 
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-msgid "%I:%M:%S %p"
-msgstr "%H:%M:%S"
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Klaida iПsaugant bylЮ: %s"
 
-#: executive-summary/component/component-factory.c:152
+#: composer/e-msg-composer.c:1055
 #, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Negaliu inicializuoti Evolution paПto komponento."
+msgid "Unable to retrieve message from editor"
+msgstr "NegalКjau parsiЬsti laiПko iП POP serverio %s: %s"
 
-#: executive-summary/component/e-summary.c:926
-#, c-format
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
 msgid ""
-"Cannot open the HTML file:\n"
+"Unable to seek on file: %s\n"
 "%s"
 msgstr ""
-"Negaliu atidaryti HTML bylos:\n"
-"%s"
+"Negaliu sukurti iПvesties bylos: %s\n"
+" %s"
 
-#: executive-summary/component/e-summary.c:940
-#, c-format
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
 msgid ""
-"Error reading data:\n"
+"Unable to truncate file: %s\n"
 "%s"
 msgstr ""
-"Klaida skaitant duomenis:\n"
-"%s"
+"Negaliu sukurti iПvesties bylos: %s\n"
+" %s"
 
-#: executive-summary/component/e-summary.c:958
-msgid "File does not have a place for the services.\n"
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
 msgstr ""
+"Klaida iПsaugant laiПkus А: %s:\n"
+" %s"
 
-#: executive-summary/component/e-summary-callbacks.c:126
-msgid "Select a service"
-msgstr "Pasirink paslaugЮ"
+#: composer/e-msg-composer.c:1173
+#, fuzzy
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+"Evolution rado Pine paПto bylЬ.\n"
+"Ar norКtum jas importuoti А Evolution?"
 
-#: executive-summary/component/e-summary-callbacks.c:290
+#: composer/e-msg-composer.c:1321
 msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
+"This message has not been sent.\n"
 "\n"
-"Just leave it blank for the default"
+"Do you wish to save your changes?"
 msgstr ""
-"Tu gali pasirinkti kitЮ HTML puslapА Executive Summary fonui.\n"
+"пis laiПkas nebuvo iПsiЬstas.\n"
 "\n"
-"Tiesiog palik tuПХiЮ, jei tenkina Аprastinis fonas"
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "Atidaryti %s su Аprasta GNOME programa"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Atidaryti %s su Аprasta GNOME narПykle"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "SiЬsti laiПkЮ А %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Pakeisti rodinА А %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Paleisti %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "UЧdaryti %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Perkelti %s kairКn"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Perkelti %s deПinКn"
+"Ar norКtum iПsaugoti jo pakeitimus?"
 
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Perkelti %s А praeitЮ eilutФ"
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
 
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Perkelti %s А kitЮ eilutФ"
+#: composer/e-msg-composer.c:1351
+msgid "Open file"
+msgstr "Atidaryti bylЮ"
 
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "KonfigШruoti %s"
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "аterpti tekstinФ bylЮ..."
 
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "IПvaizda"
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+msgid "Compose a message"
+msgstr "Sukurti laiПkЮ"
 
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "Fonas:"
+#: composer/e-msg-composer.c:2351
+msgid "Could not create composer window."
+msgstr "NegalКjau sukurti raПyklКs lango."
 
-#: executive-summary/component/main.c:62
+#: composer/evolution-composer.c:359
 msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
 msgstr ""
+"NegalКjau sukurti raПyklКs lango, nes tu dar nenurodei\n"
+"jokios asmenybКs paПto komponente."
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr ""
+#: composer/evolution-composer.c:374
+msgid "Cannot initialize Evolution's composer."
+msgstr "NegalКjau inicializuoti Evolution raПyklКs."
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
+#: data/evolution.desktop.in.h:2
+msgid "The Evolution groupware suite"
 msgstr ""
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "RDF apЧvalgos gamykla."
+#: data/evolution.keys.in.h:1
+msgid "address card"
+msgstr "adreso kortelК"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "RDF apЧvalga"
+#: data/evolution.keys.in.h:2
+msgid "calendar information"
+msgstr "kalendoriaus informacija"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "Testinio bonobo komponento gamykla."
+#. strptime format for a date.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1480
+msgid "%m/%d/%Y"
+msgstr "%Y-%m-%d"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "Testinio komponento gamykla."
+#. strptime format for a time of day, in 12-hour format.
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+msgid "%I:%M:%S %p"
+msgstr "%H:%M:%S"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "TestinК bonobo paslauga"
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "TestinК paslauga"
+#. strptime format for time of day, without seconds, 12-hour format.
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
+msgstr "%H:%M"
 
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "Klaida"
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: executive-summary/test-service/rdf-summary.c:768
-msgid "Update automatically"
-msgstr "Atnaujinti automatiПkai"
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%Y-%m-%d"
 
-#: executive-summary/test-service/rdf-summary.c:778
-msgid "Update now"
-msgstr "Atnaujinti dabar"
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %Y-%m-%d"
 
-#: executive-summary/test-service/rdf-summary.c:788
-msgid "Update every "
-msgstr "Atnaujinti kas "
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
 
-#: executive-summary/test-service/rdf-summary.c:796
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "minuХiЬ"
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:298
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
+msgid "%a %m/%d/%Y"
+msgstr "%a %Y-%m-%d"
 
-#: filter/filter-datespec.c:78
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:303
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%a %Y-%m-%d %H:%M"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:312
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%a %Y-%m-%d %H:%M"
+
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "metai"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "metЬ"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "mКnesis"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "mКnesiЬ"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "savaitК"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "savaiХiЬ"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "dienЬ"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "valanda"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "valandЬ"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "minutК"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "sekundК"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "sekundЧiЬ"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Vaje. Tu uЧmirПai pasirinkti datЮ."
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Vaje. Tu pasirinkai blogЮ datЮ."
 
-#: filter/filter-datespec.c:276
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -5238,7 +5990,7 @@ msgstr ""
 "LaiПko data bus palyginta su esamu laiku, kai\n"
 "paleidЧiamas filtras ar atidaromas vAplankas."
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5246,7 +5998,7 @@ msgstr ""
 "LaiПko data bus palyginta su laiku,\n"
 "kurА tu nurodai Хia."
 
-#: filter/filter-datespec.c:339
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5257,28 +6009,36 @@ msgstr ""
 "pavyzdЧiui, ╔prieП savaitФ╢."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "esamas laikas"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "tavo nurodytas laikas"
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "laikas, santykinis esamam laikui"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Palyginti su"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "dabar"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<spausk Хia, kad pasirinktum datЮ>"
 
@@ -5303,8 +6063,8 @@ msgstr ""
 "Vaje, tu pamirПai pasirinkti aplankЮ.\n"
 "PraПau, grАЧk atgal ir nurodyk tikrЮ aplankЮ, А kurА perkelti laiПkus."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Pasirink aplankЮ"
 
@@ -5316,46 +6076,6 @@ msgstr "аvesk aplanko URI"
 msgid "<click here to select a folder>"
 msgstr "<spausk Хia, kad pasirinktum aplankЮ>"
 
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Keisti filtrus"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "Keisti vAplankus"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Gaunamas"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "SiunХiamas"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr "VirtualШs aplankai"
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr "tik nurodyti aplankai"
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr "vAplankЬ Пaltiniai"
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr "su visais aktyviais nutolusiais aplankais"
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr "su visais vietiniais ir aktyviais nutolusiais aplankais"
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr "su visais vietiniais aplankais"
-
 #: filter/filter-input.c:193
 #, c-format
 msgid ""
@@ -5377,36 +6097,88 @@ msgstr "TaisyklКs pavadinimas:"
 msgid "Untitled"
 msgstr "BevardК"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "Jeigu"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "аvykdyti veiksmus"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "jei visos sЮlygos tenkinamos"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "jei kuri nors sЮlyga tenkinama"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "PridКti sЮlygЮ"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "gaunamas"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "siunХiamas"
 
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "PridКti"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Keisti"
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Keisti filtrus"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "Keisti vAplankus"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "Gaunamas"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "SiunХiamas"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr "VirtualШs aplankai"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr "tik nurodyti aplankai"
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "vAplankЬ Пaltiniai"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "su visais aktyviais nutolusiais aplankais"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "su visais vietiniais ir aktyviais nutolusiais aplankais"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "su visais vietiniais aplankais"
+
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
+#, fuzzy
+msgid "Assign Color"
 msgstr "Priskirti spalvЮ"
 
 #: filter/libfilter-i18n.h:4
@@ -5482,90 +6254,91 @@ msgid "Expression"
 msgstr "IПraiПka"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "PersiЬsti adresu"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "Svarbus"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "yra"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "yra didesnis uЧ"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "yra maЧesnis uЧ"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "nКra"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Konferencija"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "LaiПko tekstas"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "LaiПko antraПtК"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "LaiПkas buvo gautas"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "LaiПkas buvo iПsiЬstas"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Perkelti А aplankЮ"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr "tuo metu arba po"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr "tuo metu ar prieП"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Skaitytas"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "GavКjai"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Regex tenkina"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Atsakytas"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.c:1083
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "аvertis"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "SiuntКjas"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Priskirti bШsenЮ"
 
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Dydis"
+
 #: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "skamba panaПiai А"
@@ -5586,7 +6359,8 @@ msgstr "prasideda su"
 msgid "Stop Processing"
 msgstr "Sustabdyti vykdymЮ"
 
-#: filter/libfilter-i18n.h:51 mail/message-list.c:1084
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Tema"
 
@@ -5614,189 +6388,275 @@ msgstr "Keisti taisyklФ"
 msgid "Score Rules"
 msgstr "аverХio taisyklКs"
 
-#: mail/component-factory.c:329
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
+msgstr "Importuoti"
+
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+msgid "Mail"
+msgstr "PaПtas"
+
+#: importers/elm-importer.c:498
+#, fuzzy
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution rado Elm paПto bylЬ.\n"
+"Ar norКtum jas importuoti А Evolution?"
+
+#: importers/elm-importer.c:527
+msgid "Elm mail"
+msgstr "Elm paПtas"
+
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "PridКti adresЬ knygelФ"
+
+#: importers/evolution-gnomecard-importer.c:253
+#, fuzzy
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution rado Netscape paПto bylЬ.\n"
+"Ar norКtum jas importuoti А Evolution?"
+
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "_Nuostatos"
+
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution rado Netscape paПto bylЬ.\n"
+"Ar norКtum jas importuoti А Evolution?"
+
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution rado Pine paПto bylЬ.\n"
+"Ar norКtum jas importuoti А Evolution?"
+
+#: importers/pine-importer.c:691
+msgid "Pine mail"
+msgstr "Pine paПtas"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "Evolution komponentas paПtui tvarkyti."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr "Evolution paПto raПyklК."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Evolution mail executive summary component."
+msgstr "Evolution paПto komponento."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr "Evolution paПto aplanko vaizdavimo komponentas."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr "Evolution paПto aplanko gamyklos komponentas."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr "Evolution raПyklКs komponento gamykla."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr "Evolution paПto komponento gamykla."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr "PaПto apЧvalgos komponento gamykla."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "PaПto nustatymas"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "_SavybКs..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Pakeisti bylos savybes"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Negaliu inicializuoti Evolution paПto komponento."
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr "Negaliu uЧregistruoti saugyklos apvalkale"
 
-#: mail/folder-browser.c:267
+#: mail/folder-browser-ui.c:254
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "╔%s╢ savybКs"
+
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr "SavybКs"
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "NegalКjau sukurti laikino katalogo: %s"
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "аraПyti paieПkЮ kaip vAplankЮ"
 
-#: mail/folder-browser.c:575 ui/evolution-mail.xml.h:91
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr "vAplankas pagal _TemЮ"
 
-#: mail/folder-browser.c:578 ui/evolution-mail.xml.h:89
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "vAplankas pagal Siu_ntКjЮ"
 
-#: mail/folder-browser.c:581 ui/evolution-mail.xml.h:90
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "vAplankas pagal _GavКjus"
 
-#: mail/folder-browser.c:584 ui/evolution-mail.xml.h:88
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr "vAplankas pagal _KonferencijЮ"
 
-#: mail/folder-browser.c:590
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "Filtras pagal T_emЮ"
 
-#: mail/folder-browser.c:593
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "Filtras pagal Si_untКjЮ"
 
-#: mail/folder-browser.c:596
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "Filtras pagal Ga_vКjus"
 
-#: mail/folder-browser.c:599
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "Filtras pagal K_onferencijЮ"
 
-#: mail/folder-browser.c:608
-msgid "_Open"
-msgstr "Ati_daryti"
-
-#: mail/folder-browser.c:610
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Dar kartЮ siЬsti"
 
-#: mail/folder-browser.c:612 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:113 ui/evolution-tasks.xml.h:8
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "IП_saugoti kaip..."
 
-#: mail/folder-browser.c:614 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "S_pausdinti"
 
-#: mail/folder-browser.c:619
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "_Atsakyti siuntКjui"
 
-#: mail/folder-browser.c:621 ui/evolution-mail.xml.h:66
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "Atsakyti _visiems"
+
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "Atsakyti _visiems"
 
-#: mail/folder-browser.c:623 ui/evolution-mail.xml.h:102
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "P_ersiЬsti"
 
-#: mail/folder-browser.c:625
-msgid "Forward _inline"
-msgstr "PersiЬsti v_iduje"
-
-#: mail/folder-browser.c:628 ui/evolution-mail.xml.h:40
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "PaЧymКti s_kaitytu"
 
-#: mail/folder-browser.c:630 ui/evolution-mail.xml.h:44
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "PaЧymКti _neskaitytu"
 
-#: mail/folder-browser.c:635 ui/evolution-mail.xml.h:107
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "Svarbus"
+
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "PaЧymКti neskaitytu"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "Pe_rkelti А aplankЮ..."
 
-#: mail/folder-browser.c:637 ui/evolution-mail.xml.h:96
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "K_opijuoti А aplankЮ..."
 
-#: mail/folder-browser.c:641 ui/evolution-mail.xml.h:118
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "S_ugrЮЧinti"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:651 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "PridКti adresЬ knygelФ"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Pritaikyti filtrus"
 
-#: mail/folder-browser.c:655
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "Sukurti _taisyklФ iП laiПko"
 
-#: mail/folder-browser.c:794
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "Filtras pagal KonferencijЮ"
 
-#: mail/folder-browser.c:795
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "vAplankas pagal KonferencijЮ"
 
-#: mail/folder-browser.c:797
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtras pagal KonferencijЮ (%s)"
 
-#: mail/folder-browser.c:798
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "vAplankas pagal KonferencijЮ (%s)"
 
-#: mail/folder-browser-factory.c:213
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "╔%s╢ savybКs"
-
-#: mail/folder-browser-factory.c:215 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "SavybКs"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "Evolution komponentas paПtui tvarkyti."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Evolution paПto raПyklК."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Evolution mail executive summary component."
-msgstr "Evolution paПto komponento."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Evolution paПto aplanko vaizdavimo komponentas."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Evolution paПto aplanko gamyklos komponentas."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Evolution raПyklКs komponento gamykla."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Evolution paПto komponento gamykla."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "PaПto apЧvalgos komponento gamykla."
-
-#: mail/importers/elm-importer.c:420
-msgid ""
-"Evolution has found Elm mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution rado Elm paПto bylЬ.\n"
-"Ar norКtum jas importuoti А Evolution?"
-
-#: mail/importers/elm-importer.c:430
-msgid "Elm mail"
-msgstr "Elm paПtas"
-
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr "Gamykla importuoti mbox byloms А Evolution"
@@ -5813,26 +6673,6 @@ msgstr "Gamykla importuoti Outlook Express 4 byloms А Evolution"
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Importuoja Outlook Express 4 bylas А Evolution"
 
-#: mail/importers/netscape-importer.c:440
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Evolution rado Netscape paПto bylЬ.\n"
-"Ar norКtum jas importuoti А Evolution?"
-
-#: mail/importers/pine-importer.c:385
-msgid ""
-"Evolution has found Pine mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution rado Pine paПto bylЬ.\n"
-"Ar norКtum jas importuoti А Evolution?"
-
-#: mail/importers/pine-importer.c:395
-msgid "Pine mail"
-msgstr "Pine paПtas"
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Esamas saugyklos formatas:"
@@ -5867,37 +6707,69 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
 msgid "You have not filled in all of the required information."
 msgstr "Tu neАvedei visos bШtinos informacijos."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Evolution sЮskaitЬ tvarkyklК"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Evolution sЮskaitЬ tvarkyklК"
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "ParaПas:"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"пis laiПkas nebuvo iПsiЬstas.\n"
+"\n"
+"Ar norКtum iПsaugoti jo pakeitimus?"
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr " (Аprasta)"
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "IПjungti"
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "аjungti"
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "Ar tu tikrai nori iПtrinti ПiЮ sЮskaitЮ?"
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "SugrЮЧinti"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "Padaryti ПiЮ sЮskaitЮ Аprastine"
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr "Ar tu tikrai nori iПtrinti ПiЮ naujienЬ sЮskaitЮ?"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:536
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Evolution sЮskaitЬ tvarkyklК"
 
@@ -5965,37 +6837,45 @@ msgstr ""
 "пis laiПkas neturi temos.\n"
 "Tikrai siЬsti?"
 
-#: mail/mail-callbacks.c:311
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr "Tu turi nurodyti gavКjus, kad galКtum iПsiЬsti ПА laiПkЮ."
 
-#: mail/mail-callbacks.c:354
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr "Tu turi susitvarkyti sЮskaitЮ, tik tada galКsi iПsiЬsti ПА laiПkЮ."
 
-#: mail/mail-callbacks.c:593
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:774
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "PersiЬstas laiПkas:\n"
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "Perkelti laiПkЮ(us) А"
 
-#: mail/mail-callbacks.c:879
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Kopijuoti laiПkЮ(us) А"
 
-#: mail/mail-callbacks.c:1156
+#: mail/mail-callbacks.c:1374
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Ar tu tikrai nori taisyti visus %d laiПkus?"
 
-#: mail/mail-callbacks.c:1170
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6003,7 +6883,7 @@ msgstr ""
 "Tu gali taisyti tik laiПkus, esanХius \n"
 "JuodraПХiЬ aplanke."
 
-#: mail/mail-callbacks.c:1202
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6011,31 +6891,24 @@ msgstr ""
 "Tu gali iП naujo pasiЬsti laiПkus\n"
 "tik iП Sent aplanko."
 
-#: mail/mail-callbacks.c:1224
+#: mail/mail-callbacks.c:1442
+#, fuzzy, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "Ar tu tikrai nori taisyti visus %d laiПkus?"
+
+#: mail/mail-callbacks.c:1463
 msgid "No Message Selected"
 msgstr "Joks laiПkas nepaЧymКtas"
 
-#: mail/mail-callbacks.c:1250 mail/mail-display.c:90
-msgid "Overwrite file?"
-msgstr "UЧraПyti bylЮ?"
-
-#: mail/mail-callbacks.c:1254 mail/mail-display.c:94
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Byla tokiu vardu jau yra.\n"
-"UЧraПyti jЮ?"
-
-#: mail/mail-callbacks.c:1298
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "IПsaugoti laiПkЮ kaip..."
 
-#: mail/mail-callbacks.c:1300
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "IПsaugoti laiПkus kaip..."
 
-#: mail/mail-callbacks.c:1435
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6044,23 +6917,24 @@ msgstr ""
 "Klaida, Аkeliant filtro informacijЮ:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1484 ui/evolution-mail.xml.h:56
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "_Filtrai..."
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Spausdinti laiПkЮ"
 
-#: mail/mail-callbacks.c:1531
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "Nepavyko atspausdinti laiПko"
 
-#: mail/mail-callbacks.c:1609
+#: mail/mail-callbacks.c:1966
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Ar tu tikrai nori atidaryti visus %d laiПkus atskiruose languose?"
 
-#: mail/mail-config.c:1121 mail/mail-config.c:1124
-msgid "Connecting to server..."
-msgstr "Jungiamasi prie serverio..."
-
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -6105,10 +6979,14 @@ msgstr ""
 "bus naudojamas tik vaizdavimui."
 
 #. set window title
-#: mail/mail-config-druid.c:445
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr "Evolution sЮskaitЬ meistras"
 
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
+msgstr "Jungiamasi prie serverio..."
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr " Patikrinti, kokie tipai palaikomi "
@@ -6118,34 +6996,64 @@ msgid " color"
 msgstr " spalva"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Nurodytas tipas Пioje saugykloje nepalaikomas"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "SЮskaita"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "SЮskaitos informacija"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "SЮskaitos tvarkymas"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "SЮskaitos"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Priedas"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Autentikacija"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Autentikacijos tipas: "
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "AutomatiПkai tikrinti paПtЮ kas"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "Sukurti"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6160,164 +7068,280 @@ msgstr ""
 "\n"
 "Paspausk ╔Baigti╢, kad iПsaugotum nuostatas."
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "аp_rastas"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Baigta"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "JuodraПХiai"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "JuodraПХiЬ aplankas:"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "Keisti"
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "El. paПto adresas:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "аjungti"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Pilnas vardas:"
 
-#: mail/mail-config.glade.h:27
-msgid "Highlight citations with "
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
+msgstr ""
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "ParaПas:"
+
+#: mail/mail-config.glade.h:43
+#, fuzzy
+msgid "Highlight citations with"
 msgstr "ParyПkinti citatas su "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "AsmenybК"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Inline"
+msgstr "_Viduje"
+
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "PaПto nustatymas"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "PaПto dКЧutКs formatas"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "Padaryti ПiЮ sЮskaitЮ Аprastine"
 
-#: mail/mail-config.glade.h:34
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "PaЧymКti laiПkus skaitytais po:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "LDAP serveris"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "Naujienos"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "NebШtina informacija"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organizacija:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "Pasirink spalvЮ"
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "Negaliu siЬsti laiПko: neapibrКЧti jokie gavКjai."
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "_Cituojant"
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "PaПto gavimas"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "PaПto gavimas"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "Gavimo nuostatos"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "BШtina informacija"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
+
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Security"
+msgstr "_Saugumas"
+
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "Select PGP binary"
 msgstr "Pasirink PGP"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "аprastai siЬsti laiПkus HTML formatu."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "PaПto siuntimas"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "PaПto siuntimas"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "IПsiЬsta"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr "IПsiЬsti laiПkai ir juodraПХiai"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "IПsiЬstЬ laiПkЬ aplankas:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Serverio nustatymas"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Serverio tipas:"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Serveris reikalauja autentikacijos"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "ParaПo byla:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+msgid "Source"
+msgstr "пaltinis"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "NКra informacijos"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "пaltiniai"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "Ypatingi aplankai"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr "StandartinК Unix mbox"
 
-#: mail/mail-config.glade.h:68
-msgid "Type"
-msgstr "Tipas"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "Naudoti saugiЮ jungtА (SSL)"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Vartotojo vardas:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6327,163 +7351,246 @@ msgstr ""
 "\n"
 "Spausk ╔Tolyn╢, kad pradКtum."
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "K_eisti"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
+msgstr ""
+
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
+msgstr ""
+
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr "sekundЧiЬ."
+
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "NegalКjau prisijungti prie POP serverio %s."
+
+#: mail/mail-crypto.c:86
+#, fuzzy
+msgid "Could not create a PGP verification context."
+msgstr "NegalКjau prisijungti prie POP serverio %s."
 
-#: mail/mail-display.c:194
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr "NegalКjau sukurti raПyklКs lango."
+
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
+msgstr ""
+"NegalКjau sukurti katalogo %s:\n"
+"%s"
+
+#: mail/mail-crypto.c:177
+msgid "Could not create a S/MIME signature context."
+msgstr ""
+
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
+msgstr ""
+
+#: mail/mail-crypto.c:240
+msgid "Could not create a S/MIME encryption context."
+msgstr ""
+
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "NegalКjau sukurti raПyklКs lango."
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr "NegalКjau sukurti raПyklКs lango."
+
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "IПsaugoti priedЮ"
 
-#: mail/mail-display.c:234
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "NegalКjau sukurti laikino katalogo: %s"
-
-#: mail/mail-display.c:295
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "IПsaugoti А diskЮ..."
 
-#: mail/mail-display.c:297
-#, c-format
-msgid "Open in %s..."
-msgstr "Atidaryti su %s..."
-
-#: mail/mail-display.c:299
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "чiШrКti viduje"
 
-#: mail/mail-display.c:334
-msgid "External Viewer"
-msgstr "IПorinК ЧiШryklК"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "Atidaryti su %s..."
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "чiШrКti viduje (per %s)"
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "SlКpti"
 
-#: mail/mail-display.c:1107
-msgid "Open link in browser"
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "IПorinК ЧiШryklК"
+
+#: mail/mail-display.c:1048
+msgid "Loading message content"
+msgstr "аkeliamas laiПko turinys"
+
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
 msgstr "NuorodЮ atidaryti narПyklКje"
 
-#: mail/mail-display.c:1109
-msgid "Save as (FIXME)"
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "Kopijuoti adresЮ (FIXME)"
+
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
 msgstr "IПsaugoti kaip (FIXME)"
 
-#: mail/mail-display.c:1111
-msgid "Copy location (FIXME)"
-msgstr "Kopijuoti adresЮ (FIXME)"
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "IПsaugoti kaip..."
 
-#: mail/mail-format.c:522
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr " %d sekundЧiЬ"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s priedas"
 
-#: mail/mail-format.c:564
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "NegalКjau iПnagrinКti MIME laiПko. Rodomas Пaltinis."
 
-#: mail/mail-format.c:771
-msgid "Loading message content"
-msgstr "аkeliamas laiПko turinys"
+#: mail/mail-format.c:746
+msgid "Date"
+msgstr "Data"
 
-#: mail/mail-format.c:1080
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "El. paПto adresas:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr "Nuo"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "Atsakyti-kam:"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "Kam"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Cc:"
+
+#: mail/mail-format.c:1291
 #, fuzzy
 msgid "No GPG/PGP program configured."
 msgstr "NКra jokios PGP/GPG programos."
 
-#: mail/mail-format.c:1095
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "UЧПifruotas laiПkas neparodytas"
 
-#: mail/mail-format.c:1101
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "UЧПifruotas laiПkas"
 
-#: mail/mail-format.c:1102
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Paspausk ant ikonos, kad iППifruotum."
 
-#: mail/mail-format.c:1192 mail/mail-format.c:1580
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 "пis laiПkas yra pasiraПytas skaitmeniniu paraПu, patikrinus nustatyta, kad "
 "jis autentiПkas"
 
-#: mail/mail-format.c:1200 mail/mail-format.c:1588
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "пis laiПkas yra pasiraПytas skaitmeniniu paraПu, bet neina patikrinti, ar "
 "jis autentiПkas"
 
-#: mail/mail-format.c:1801
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "RodyklК А FTP svetainФ (%s)"
 
-#: mail/mail-format.c:1813
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "RodyklК А vietinФ bylЮ (%s), galiojanti svetainКje ╔%s╢"
 
-#: mail/mail-format.c:1817
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "RodyklК А vietinФ bylЮ (%s)"
 
-#: mail/mail-format.c:1851
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "RodyklК А FTP svetainФ (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "RodyklК А neЧinomus iПorinius duomenis (╔%s╢ tipo)"
 
-#: mail/mail-format.c:1856
+#: mail/mail-format.c:2107
 #, fuzzy
 msgid "Malformed external-body part."
 msgstr "Blogai suformuota iПorinio kШno dalis."
 
-#: mail/mail-local.c:509
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "Atidaromas ╔%s╢"
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "KeiХiamas aplanko ╔%s╢ formatas А ╔%s╢"
 
-#: mail/mail-local.c:791
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Pakeisti aplanko ╔%s╢ formatЮ А ╔%s╢"
-
-#: mail/mail-local.c:814
-msgid "Reconfiguring folder"
-msgstr "PerkonfigШruojamas aplankas"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:843
-msgid "Closing current folder"
-msgstr "UЧdaromas esamas aplankas"
-
-#: mail/mail-local.c:875
-msgid "Renaming old folder and opening"
-msgstr "Pervadinamas senas aplankas ir atidaromas"
-
-#: mail/mail-local.c:893
-msgid "Creating new folder"
-msgstr "Kuriamas naujas aplankas"
-
-#: mail/mail-local.c:907
-msgid "Copying messages"
-msgstr "Kopijuojami laiПkai"
-
-#: mail/mail-local.c:924
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6492,7 +7599,7 @@ msgstr ""
 "Negaliu iПsaugoti metainfo. Tikriausiai tau daugiau\n"
 "nebepavyks atidaryti Пio aplanko: %s"
 
-#: mail/mail-local.c:963
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6500,7 +7607,17 @@ msgstr ""
 "Jei tu nebegali daugiau atidaryti Пios paПto\n"
 "dКЧutКs, tau teks sutaisyti jЮ rankutКmis."
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "Tu negali kopijuoti laiПkЬ iП Пio ПiukПliЬ aplanko."
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "KonfigШruoti %s"
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6509,7 +7626,7 @@ msgstr ""
 "Klaida ╔%s╢ metu:\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6518,101 +7635,105 @@ msgstr ""
 "Klaida vykdant veiksmЮ:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:880
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Dirbama"
 
-#: mail/mail-mt.c:862
-msgid "Evolution progress"
-msgstr "Evolution paЧanga"
-
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "SiunХiamas ╔%s╢"
 
-#: mail/mail-ops.c:603
-msgid "Sending message"
-msgstr "SiunХiamas laiПkas"
-
-#: mail/mail-ops.c:718
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "SiunХiamas laiПkas %d iП %d"
 
-#: mail/mail-ops.c:737
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "NesКkmК ties laiПku %d iП %d"
 
-#: mail/mail-ops.c:739 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "UЧbaigta."
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "LaiПkas iПsaugomas А aplankЮ"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "LaiПkai perkeliami А %s"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "LaiПkai kopijuojami А %s"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Perkeliama"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Kopijuojama"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanuojami aplankas, esantys ╔%s╢"
 
-#: mail/mail-ops.c:1154
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "пiukПlКs"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "PersiЬsti laiПkai"
 
-#: mail/mail-ops.c:1195 mail/mail-ops.c:1333
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "Atidaromas aplankas %s"
 
-#: mail/mail-ops.c:1262
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr "Atidaroma saugykla %s"
 
-#: mail/mail-ops.c:1449
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "Atidaromas aplankas %s"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "PerkonfigШruojamas aplankas"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "IПvalomas aplankas"
 
-#: mail/mail-ops.c:1498
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Gaunamas laiПkas %s"
 
-#: mail/mail-ops.c:1565
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Gaunami laiПkai"
 
-#: mail/mail-ops.c:1575
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Gaunamas laiПkas numeris %d iП %d (uid ╔%s╢)"
-
-#: mail/mail-ops.c:1649
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "IПsaugomi laiПkai"
 
-#: mail/mail-ops.c:1728
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6621,12 +7742,7 @@ msgstr ""
 "Negaliu sukurti iПvesties bylos: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1741
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "IПsaugomas laiПkas %d iП %d (uid ╔%s╢)"
-
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6635,11 +7751,11 @@ msgstr ""
 "Klaida iПsaugant laiПkus А: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "IПsaugomas priedas"
 
-#: mail/mail-ops.c:1844
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6648,231 +7764,193 @@ msgstr ""
 "Negaliu sukurti iПvesties bylos: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1872
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "NegalКjau АraПyti duomenЬ: %s"
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "_IeПkoti"
+#: mail/mail-ops.c:2101
+#, c-format
+msgid "Disconnecting from %s"
+msgstr ""
+
+#: mail/mail-search.c:138
+#, fuzzy
+msgid "(Untitled Message)"
+msgstr "(Bevardis)"
+
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Keletas laiПkЬ"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "Taisyti laiПkЮ"
+
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "Taisyti laiПkЮ"
+
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-search.c:315
+#, fuzzy
+msgid "Search Forward"
+msgstr "PersiЬsti"
+
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
+msgstr "Rasti"
 
-#: mail/mail-send-recv.c:138
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "Kelias:"
+
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Nutraukiama..."
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "SiunХiamas ir gaunamas paПtas"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "Gaunamas"
 
-#: mail/mail-send-recv.c:285
+#: mail/mail-send-recv.c:302
 msgid "Updating..."
 msgstr "Atnaujinama..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
 msgid "Waiting..."
 msgstr "Laukiama..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "SiunХiamas"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "Nutraukta."
 
-#: mail/mail-summary.c:110
-msgid "Incomplete message written on pipe!"
-msgstr "Nepilnas laiПkas suraПytas А pipe!"
-
-#: mail/mail-summary.c:468
-msgid "Mail Summary"
-msgstr "PaПto apЧvalga"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
+msgstr "Vartotojas nutraukК veiksmЮ."
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "NegalКjau sukurti laikinos mbox ╔%s╢: %s"
 
-#: mail/mail-tools.c:188
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (persiЬstas laiПkas)"
-
-#: mail/mail-tools.c:198
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (be temos)"
-
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "PersiЬstas laiПkas - %s"
 
-#: mail/mail-tools.c:217
-msgid "Forwarded message (no subject)"
-msgstr "PersiЬstas laiПkas (be temos)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "PersiЬsti laiПkai"
 
-#: mail/mail-tools.c:415
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "PersiЬsti laiПkai"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "vAplankai"
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Naujas vAplankas"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:64
-msgid "Reply"
-msgstr "Atsakyti"
-
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:70
-msgid "Reply to the sender of this message"
-msgstr "Atsakyti Пio laiПko siuntКjui"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:65
-msgid "Reply to All"
-msgstr "Atsakyti visiems"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:68
-msgid "Reply to all recipients of this message"
-msgstr "Atsakyti visiems Пio laiПko gavКjams"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:25
-msgid "Forward"
-msgstr "PersiЬsti"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:29
-msgid "Forward this message"
-msgstr "PersiЬsti ПА laiПkЮ"
-
-#: mail/message-browser.c:200 ui/evolution-mail.xml.h:61
-msgid "Print the selected message"
-msgstr "Spausdinti parinktЮ laiПkЮ"
-
-#: mail/message-browser.c:203 ui/evolution-mail.xml.h:13
-msgid "Delete this message"
-msgstr "IПtrinti ПА laiПkЮ"
-
-#: mail/message-browser.c:208 ui/evolution-event-editor.xml.h:33
-#: ui/evolution-mail.xml.h:54 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Praeitas"
-
-#: mail/message-browser.c:208
-msgid "Previous message"
-msgstr "Praeitas laiПkas"
-
-#: mail/message-browser.c:211 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:50
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Kitas"
-
-#: mail/message-browser.c:211
-msgid "Next message"
-msgstr "Kitas laiПkas"
-
-#: mail/message-list.c:679
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "Nematytas"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "Matytas"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Atsakytas"
 
-#: mail/message-list.c:682
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "Keletas nematytЬ laiПkЬ"
 
-#: mail/message-list.c:683
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "Keletas laiПkЬ"
 
-#: mail/message-list.c:687
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "чemiausias"
 
-#: mail/message-list.c:688
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "чemesnis"
 
-#: mail/message-list.c:692
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "AukПtesnis"
 
-#: mail/message-list.c:693
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "AukПХiausias"
 
-#: mail/message-list.c:943
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "пiandien %H:%M"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "Vakar %H:%M"
 
-#: mail/message-list.c:971
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:979
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %H:%M"
 
-#: mail/message-list.c:981
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "IПsaugomi laiПkai"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1084
-msgid "From"
-msgstr "Nuo"
-
-#: mail/message-list.c:1084
-msgid "Date"
-msgstr "Data"
-
-#: mail/message-list.c:1084
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Gautas"
 
-#: mail/message-list.c:1085
-msgid "To"
-msgstr "Kam"
-
-#: mail/message-list.c:1085
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "Dydis"
 
-#: mail/mail-session.c:161
-msgid "User canceled operation."
-msgstr "Vartotojas nutraukК veiksmЮ."
-
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:47
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Aplankas"
 
@@ -6900,15 +7978,1454 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Atsisakoma aplanko ╔%s╢"
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "Tvarkyti uЧsakymus"
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr ""
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr ""
+
+#: my-evolution/component-factory.c:140
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Negaliu inicializuoti Evolution paПto komponento."
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+msgid "Appointments"
+msgstr "аvykiai"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "Rodyti Аvykius"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%H:%M"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%a %H:%M"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "PaПto apЧvalga"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "Evolution Аdiegimas"
+
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
+msgstr "Buvo klaida Аkeliant kalendoriaus bylЮ."
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Klaida Аkeliant kalendoriЬ</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "Rodyti uЧduotis"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "Skyriai:"
+
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A, %Y m. %B %e d."
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "Nepavyko atspausdinti laiПko"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): negalКjau inicializuoti Bonobo"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "IПvalyti"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
+
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "Variable"
+msgstr "IПjungti"
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "Pastaba"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "Pas_tabos:"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "Egzistuoja"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "пaltiniai"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "mКnesis"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "чemiausias"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Bandyti"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "чemiausias"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "Rodyti"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "Radio"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Drifting rain"
+msgstr "ApraПyme yra"
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "Rasti vКl"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "dabar"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Moderate snow"
+msgstr "Atnaujinti dabar"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+#, fuzzy
+msgid "Drifting snow grains"
+msgstr "ApraПyme yra"
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "PaПtas"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "Rodyti visus "
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "Pagrindinis el. paПtas"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "PaПto gavimas"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Shallow small hail"
+msgstr "Rodyti visus "
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Showers of small hail"
+msgstr "Rodyti visus "
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown precipitation"
+msgstr "NeЧinoma autentikacijos bШsena."
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "NeЧinoma klaida"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "Susitikimo pakvietimai"
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "Egzistuoja"
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "StaХias lapas"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Drifting mist"
+msgstr "Konferencija"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Shallow fog"
+msgstr "Rodyti visus "
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "UЧdaryti ПА langЮ"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "аvertis"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "Rodyti uЧduotis"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "UЧdaryti ПА langЮ"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "SiЬsti"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "AntraПtК"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "dienЬ"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "RugpjШtis"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Raging tornado"
+msgstr "KЮ reikia nuveikti"
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Thunderous tornado"
+msgstr "KЮ reikia nuveikti"
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "Atsakytas"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Aplankai"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "Visi dalyviai"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Rodyti aplankus, prasidedanХius:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "Vaizdavimo parinktys"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "Vaizdavimas"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "Penktadienis"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "TreХiadienis"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "mКnesis"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr " 1 savaitК"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr ""
+"Laikas\n"
+"dienotvarkКje"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Rodyti uЧduotis"
+
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "su visais aktyviais nutolusiais aplankais"
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "Rodyti uЧduotis"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "UЧduotys"
+
+#: my-evolution/my-evolution.glade.h:24
+msgid "Units: "
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Kitas"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "Tikrinti nuostatas"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "Balandis"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "Evolution apvalkalas."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "DetalКs"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "AtПaukti susitikimЮ"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Ypatingi aplankai"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Evolution Аdiegimas"
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6916,28 +9433,24 @@ msgstr ""
 "пiai naujai Evolution versijai reikia Аdiegti papildomЬ bylЬ\n"
 "А tavo asmeninА Evolution katalogЮ"
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "PraПau, paspausk ╔Gerai╢, kad Аdiegtum bylas, arba ╔AtПaukti╢, kad iПeitum."
 
-#: shell/e-setup.c:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "NegalКjau tvarkingai atnaujinti bylЬ"
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr "Evolution bylos sКkmingai Аdiegtos."
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Atrodo, kad tai pirmas kartas, kai tu pasileidai Evolution."
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "PraПom paspausti ╔Gerai╢, kad Аdiegtum Evolution vartotojo bylas А"
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6948,16 +9461,14 @@ msgstr ""
 "%s\n"
 "Klaida: %s"
 
-#: shell/e-setup.c:230
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
-msgstr ""
-"Negaliu kopijuoti bylЬ А\n"
-"╔%s╢."
+msgstr "аvyko klaida, beskaitant bylЮ."
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6968,7 +9479,16 @@ msgstr ""
 "PraПau, perkelk jА, kad galКХiau Аdiegti\n"
 "Evolution vartotojo bylas."
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6979,21 +9499,58 @@ msgstr ""
 "Evolution katalogas. PraПau, perkelk jА, kad \n"
 "galКХiau Аdiegti Evolution vartotojo bylas."
 
-#: shell/e-shell.c:388
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "NegalКjau gauti aplanko ╔%s╢: %s"
+
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"Negaliu kopijuoti bylЬ А\n"
+"╔%s╢."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
 #, c-format
-msgid "Cannot set up local storage -- %s"
+msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell.c:1273
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "Kopijuoti А aplankЮ"
+
+#: shell/e-shell-folder-commands.c:313
 #, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
-"Vaje!  ╔%s╢ rodinys netikКtai numirК.  :-(\n"
-"Tikriausiai tai reiПkia, kad %s komponentas nulШЧo."
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "Perkelti А aplankЮ"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "IПtrinti po %s dienos(Ь)"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "Ar tu tikrai nori iПtrinti uЧduotА ╔%s╢?"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "Atidaromas aplankas %s"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -7002,15 +9559,15 @@ msgstr ""
 "Negaliu sukurti nurodyto aplanko:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "Nurodytas aplanko vardas yra negalimas."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution -- Sukurti naujЮ aplankЮ"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -7018,41 +9575,133 @@ msgstr ""
 "Pasirinkto aplanko tipas yra netinkamas\n"
 "praПytЮjam veiksmui."
 
-#: shell/e-shell-folder-selection-dialog.c:321
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Naujas..."
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Bevardis)"
 
-#: shell/e-shell-view.c:148
-msgid "(No folder displayed)"
-msgstr "(Joks aplankas nerodomas)"
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"Pasirink bylЮ, kuriЮ nori importuoti А Evolution, ir pasirink jos tipЮ iП "
+"sЮraПo.\n"
+"\n"
+"Gali pasirinkti ╔AutomatiПkas╢ jei tu neЧinai, ir Evolution bandys "
+"susigaudyti pati."
 
-#: shell/e-shell-view.c:1203
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
 #, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+"Importuojama %s\n"
+"Importeris nepasiruoПФs.\n"
+"Laukiu 5 sekundes kol bandysiu vКl."
 
-#: shell/e-shell-view.c:1205
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
 #, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"Importuojama %s\n"
+"Importuojamas elementas %d."
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"NКra importerio, kuris galКtЬ suprasti\n"
+"%s"
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr "Importuojama"
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"Importuojama %s.\n"
+"Pradedama %s"
+
+#: shell/e-shell-importer.c:383
+#, c-format
+msgid "Error starting %s"
+msgstr "Klaida pradedant %s"
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:402
+#, c-format
+msgid "Error loading %s"
+msgstr "Klaida Аkeliant %s"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"Importuojama %s\n"
+"Importuojamas elementas 1."
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr "AutomatiПkas"
+
+#: shell/e-shell-importer.c:538
+msgid "Filename:"
+msgstr "Bylos vardas:"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "Pasirink bylЮ"
+
+#: shell/e-shell-importer.c:553
+msgid "File type:"
+msgstr "Bylos tipas:"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "Pasirink aplankЮ"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy nerastas tavo kelyje ($PATH)."
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy negalКjo bШti paleistas."
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -7062,31 +9711,88 @@ msgstr ""
 "paПtui, kalendoriams ir kontaktЬ tvarkymui\n"
 "GNOME darbo aplinkoje."
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Eiti А aplankЮ..."
 
-#: shell/e-shell-view-menu.c:562
-msgid "Work online"
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Sukurti naujЮ trumpiЬ grupФ"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
 msgstr "Dirbti prisijungus"
 
-#: shell/e-shell-view-menu.c:574 shell/e-shell-view-menu.c:586
-msgid "Work offline"
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
 msgstr "Dirbti atsijungus"
 
-#: shell/e-shortcuts.c:381
-msgid "Error saving shortcuts."
-msgstr "Klaida iПsaugant trumpes."
+#: shell/e-shell-view.c:175
+msgid "(No folder displayed)"
+msgstr "(Joks aplankas nerodomas)"
+
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1411
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
+
+#: shell/e-shell-view.c:1413
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr ""
+
+#: shell/e-shell.c:1311
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"Vaje!  ╔%s╢ rodinys netikКtai numirК.  :-(\n"
+"Tikriausiai tai reiПkia, kad %s komponentas nulШЧo."
+
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Sukurti naujЮ trumpiЬ grupФ"
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "GrupКs pavadinimas:"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -7095,119 +9801,202 @@ msgstr ""
 "Ar tu tikrai nori paПalinti grupФ\n"
 "╔%s╢ iП trumpiЬ juostos?"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "NepaПalinti"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "PaПalinti ПiЮ trumpiЬ grupФ"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "PaПalinti ПiЮ trumpiЬ grupФ"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "_MaЧos ikonos"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Rodyti trumpes kaip maЧas ikonas"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "_DidelКs ikonos"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Rodyti trumpes kaip dideles ikonas"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_Nauja grupК..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Sukurti naujЮ trumpiЬ grupФ"
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "_PaПalinti ПiЮ grupФ..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "PaПalinti ПiЮ trumpiЬ grupФ"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "_PaПalinti ПiЮ grupФ..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "PaПalinti ПiЮ trumpiЬ grupФ"
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "_PaslКpti trumpiЬ juostЮ"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "PaslКpti trumpiЬ juostЮ"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "SuЧadinti"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "PaПalinti ПiЮ trumpiЬ grupФ"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "PaПalinti ПiЮ trumpiЬ grupФ"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
-msgstr "SuЧadinti ПiЮ trumpФ"
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Atidaryti"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr "Atidaryti naujame lange"
+
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Atidaryti esamЮ laiПkЮ naujame lange"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "TaisyklКs pavadinimas:"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "PaПalinti ПiЮ trumpiЬ grupФ"
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "PaПalinti ПiЮ trumpФ iП trumpiЬ juostos"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:585
+msgid "Error saving shortcuts."
+msgstr "Klaida iПsaugant trumpes."
+
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "_TrumpiЬ juosta"
+
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "_Kontaktas"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Be pavadinimo)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "NКra klaidЬ"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Bendroji klaida"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "Jau yra aplankas su tokiu pat pavadinimu"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "Nurodytas aplanko tipas yra blogas"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "I/O klaida"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "NeuЧtenka vietos aplankui sukurti"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "Nurodytas aplankas nerastas"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "Funkcija neАgyvendinta Пioje saugykloje"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "PriКjimas uЧdraustas"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "Veiksmas nepalaikomas"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "Nurodytas tipas Пioje saugykloje nepalaikomas"
 
-#: shell/e-storage-set-view.c:650 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:44
-msgid "_View"
-msgstr "_Rodinys"
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
 
-#: shell/e-storage-set-view.c:650
-msgid "View the selected folder"
-msgstr "Rodyti parinktЮ aplankЮ"
+#: shell/e-task-widget.c:173
+#, fuzzy
+msgid "%s (%d%% complete)"
+msgstr "% uЧ_baigta:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "Bet kuriame lauke yra"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "Hostas:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
 
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
@@ -7221,107 +10010,6 @@ msgstr "Aplanko tipas:"
 msgid "Specify where to create the folder:"
 msgstr "Nurodyk, kur sukurti aplankЮ:"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "Evolution apvalkalas."
-
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"Pasirink bylЮ, kuriЮ nori importuoti А Evolution, ir pasirink jos tipЮ iП "
-"sЮraПo.\n"
-"\n"
-"Gali pasirinkti ╔AutomatiПkas╢ jei tu neЧinai, ir Evolution bandys "
-"susigaudyti pati."
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"Importuojama %s\n"
-"Importeris nepasiruoПФs.\n"
-"Laukiu 5 sekundes kol bandysiu vКl."
-
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"Importuojama %s\n"
-"Importuojamas elementas %d."
-
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"NКra importerio, kuris galКtЬ suprasti\n"
-"%s"
-
-#: shell/importer/importer.c:351
-msgid "Importing"
-msgstr "Importuojama"
-
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"Importuojama %s.\n"
-"Pradedama %s"
-
-#: shell/importer/importer.c:372
-#, c-format
-msgid "Error starting %s"
-msgstr "Klaida pradedant %s"
-
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
-msgstr "Klaida Аkeliant %s"
-
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"Importuojama %s\n"
-"Importuojamas elementas 1."
-
-#: shell/importer/importer.c:473
-msgid "Automatic"
-msgstr "AutomatiПkas"
-
-#: shell/importer/importer.c:523
-msgid "Filename:"
-msgstr "Bylos vardas:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
-msgstr "Pasirink bylЮ"
-
-#: shell/importer/importer.c:538
-msgid "File type:"
-msgstr "Bylos tipas:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
-msgstr "Importuoti"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Spausk ╔Import╢, kad pradКtum importuoti bylЮ А Evolution."
@@ -7343,26 +10031,36 @@ msgstr ""
 "Sveikas atvykФs А Evolution importavimo priemonФ.\n"
 "пis meistras padКs tau importuojant iПorines bylas А Evolution."
 
-#: shell/importer/intelligent.c:143
+#: shell/importer/intelligent.c:191
+#, fuzzy
+msgid "Importers"
+msgstr "Importuoti"
+
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "NepaПalinti"
+
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "KitЮ kartЮ nebeklausti"
 
-#: shell/main.c:82
-#, no-c-format
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
@@ -7385,7 +10083,7 @@ msgstr ""
 "Mes tikimКs, kad tau patiks mШsЬ sunkaus darbo vaisiai, ir\n"
 "laukiame tavo prisidКjimo!\n"
 
-#: shell/main.c:107
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7393,237 +10091,325 @@ msgstr ""
 "AХiШ\n"
 "Evolution komanda\n"
 
-#: shell/main.c:138
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "NegalКjau inicializuoti Evolution apvalkalo."
 
-#: shell/main.c:184
+#: shell/main.c:215
 #, fuzzy
 msgid "Disable splash screen"
 msgstr "UЧdrausti "
 
-#: shell/main.c:185
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr "SiЬsti visЬ komponentЬ derinimo iПvestА А bylЮ."
 
-#: shell/main.c:217
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Negaliu inicializuoti Bonobo komponentЬ sistemos."
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Kopijuoti"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
+msgstr "Kopijuoti paЧymКjimЮ"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "Sukurti naujЮ kontaktЮ"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "IПtrinti kontaktЮ"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "Sukurti naujЮ kontaktЮ"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Rasti"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "IПkirpti"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Rasti kontaktЮ"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr "IПkirpti paЧymКjimЮ"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "IПtrinti kontaktЮ"
+
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Naujas kontaktas"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:53
-msgid "Previews the message to be printed"
-msgstr "PerЧiШrКti laiПkЮ prieП spausdinant"
-
 #: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+#, fuzzy
+msgid "New list"
+msgstr "Naujienos"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "аdКti"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "аdКti iП krepПio"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
+msgstr "PerЧiШrКti kalendoriЬ prieП spausdinant"
+
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "Spausdinti kontaktus"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:84
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "PaЧymКti visus"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "IПtrinti kontaktЮ"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Stop"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Sustabdyti АkКlimЮ"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "Rodyti visus"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "Rodyti visus kontaktus"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "_AdresЬ knygelКs Пaltiniai..."
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "_Kontaktas"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "_Kontaktas"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "S_pausdinti..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "_IeПkoti kontaktЬ"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:117
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:43
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
+msgstr "PaЧymКti _viskЮ"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "аran_kiai"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 Dienos"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Sutvarkyti kalendoriЬ"
+#: ui/evolution-calendar.xml.h:2
+#, fuzzy
+msgid "Configure the calendar's settings"
+msgstr "KonfigШruoti adresЬ konduitЮ"
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a new all day Event"
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "Sukurti naujЮ visos dienos АvykА"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Sukurti naujЮ АvykА"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Sukurti naujЮ kalendoriЬ"
+msgid "Create a new appointment"
+msgstr "Sukurti naujЮ АvykА"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "Diena"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Eiti А"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Eiti А ankstesnА laikЮ"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Eiti А ateities laikЮ"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "Eiti А _datЮ"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
-msgstr "Eiti А Пia_ndienЮ"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Eiti А nurodytЮ datЮ"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Eiti А dabartinА laikЮ"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "MКnesis"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr "Naujas А_vykis"
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "Atidaryti kalendoriЬ"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "Praeitas"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Naujas Аvykis"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "PerЧiШrКti kalendoriЬ prieП spausdinant"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Spausdinti kalendoriЬ"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Spausdinti ПА kalendoriЬ"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "IПsaugoti kaip"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "BШtina informacija"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "IПsaugoti kalendoriЬ kaip kaЧkЮ kitЮ"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Rodyti 1 dienЮ"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Rodyti 1 mКnesА"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Rodyti 1 savaitФ"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Rodyti darbo savaitФ"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
-msgid "Today"
-msgstr "Dabar"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "Darb_o savaitК"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "SavaitК"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "а_vykis"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "_PaПto nuostatos..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "_Diena"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "_MКnesis"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:39
-msgid "_New"
-msgstr "_Naujas"
-
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "_Atidaryti kalendoriЬ"
-
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "_SavaitК"
 
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "UЧdaryti"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "UЧdaryti ПА АvykА"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "IПtrinti ПА АvykА"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "PagrindinК АrankinК"
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "PerЧiШrКti laiПkЮ prieП spausdinant"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "Spa_udinio perЧiШra"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "Spausdinimo nuostatos"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Spausdinti ПА elementЮ"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "Spausdinti..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "IПsaugoti ir uЧdaryti"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "IПsaugoti АvykА ir uЧdaryti dialogo langЮ"
+
+#: ui/evolution-comp-editor.xml.h:17
+#, fuzzy
+msgid "Save this item to disk"
+msgstr "Pakeisti rodinА А %s"
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr "Nustatyti puslapio parinktis tavo esamam spausdintuvui"
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "_Veiksmai"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "_Byla"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "IПtrinti ПА elementЮ"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "IПtrinti..."
 
@@ -7635,27 +10421,12 @@ msgstr "Pagalba"
 msgid "Print En_velope..."
 msgstr "Spausdinti _vokЮ..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Spausdinti ПА elementЮ"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:62 ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Spausdinti..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "IПsaugoti _kaip..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "IПsaugoti ir uЧdaryti"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "IПsaugoti kontaktЮ ir uЧdaryti dialogo langЮ"
@@ -7672,884 +10443,1005 @@ msgstr "Rodyti ЧinynЮ"
 msgid "Send _message to contact..."
 msgstr "SiЬsti _laiПkЮ kontaktui..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
-msgid "_File"
-msgstr "_Byla"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "IП_saugoti"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Apie ПiЮ programЮ"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "IПtrinti ПА elementЮ"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Apie..."
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "IПsaugoti uЧduotА ir uЧdaryti dialogo langЮ"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "Veiksm_ai"
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "SiЬsti ko_ntaktЮ kitam..."
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "_AdresЬ knygelК... (FIXME)"
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "SiЬsti _laiПkЮ kontaktui..."
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "IПva_lyti"
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "AtПaukti susitikimЮ"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "_IПkirpti"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#, fuzzy
+msgid "Cancel the meeting for this item"
+msgstr "Keisti Пio aplanko savybes"
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "Ti_krinti vardus (FIXME)"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Forward as i_Calendar"
+msgstr "PersiЬsti kaip v_Calendar (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "IПvalyti"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "PersiЬsti ПА laiПkЮ"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "IПvalyti paЧymКjimЮ"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "UЧdaryti ПА АvykА"
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr ""
+"PapraПyti\n"
+"susitikimo"
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "_Kopijuoti А aplankЮ... (FIXME)"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr "аtraukti s_usitikimЮ А dienotvarkФ"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Kopijuoti"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#, fuzzy
+msgid "Schedule a meeting for this item"
+msgstr "аraПyti susitikimЮ А dienotvarkФ"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Kopijuoti paЧymКjimЮ"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "_Veiksmai"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "IПkirpti"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "%s - Evolution %s"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "IПkirpti paЧymКjimЮ"
+#: ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "Nutraukta"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "IПtrinti ПА АvykА"
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "IПsaugoti esamЮ bylЮ"
+
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "Sukurti"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Sukurti naujЮ laiПkЮ"
+
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
+msgstr ""
+
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "_Pirmas elementas aplanke (FIXME)"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr "IПtuПtinti _ПiukПlinФ"
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "_PersiЬsti (FIXME)"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "Pa_mirПti slaptaЧodЧius"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "PersiЬsti kaip v_Calendar (FIXME)"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "Eiti А tolesnА elementЮ"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
+msgstr "Tvarkyti uЧ_sakymus..."
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Eiti А ankstesnА elementЮ"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "_NeuЧbaigta uЧduotis (FIXME)"
+#: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Perkelti paЧymКtus laiПkus А kitЮ aplankЮ"
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "Pakeisti bylos savybes"
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send / Receive"
+msgstr "SiЬsti / Gauti"
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "_Kitas"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "IПsiЬsti laukiantА paПtЮ ir parsiЬsti naujЮ paПtЮ"
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "аdКti"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "аdКti iП krepПio"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "_Praeitas"
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
+msgstr "_VirtualiЬ aplankЬ taisymas..."
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "Spa_udinio perЧiШra"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
+msgstr "_Filtrai..."
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "Spausdinimo _nuostatos..."
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr "_PaПto laiПkas"
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Spausdinimo nuostatos"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "_PaПto nuostatos..."
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
-msgid "Save"
-msgstr "IПsaugoti"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "PerЧiШra"
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "IПsaugoti АvykА ir uЧdaryti dialogo langЮ"
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
+msgstr "_SiЬsti / Gauti"
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "IПsaugoti esamЮ bylЮ"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr "Keisti Пio aplanko savybes"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "аtraukti s_usitikimЮ А dienotvarkФ"
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "IПtrinti paЧymКtus laiПkus"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "аraПyti А dienotvarkФ kaЧkokА susitikimЮ"
+#: ui/evolution-mail-list.xml.h:5
+#, fuzzy
+msgid "Cut selected messages"
+msgstr "IПtrinti paЧymКtus laiПkus"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "PaЧymКti visus"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "PaslКpti paЧy_mКtus laiПkus"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "PaЧymКti viskЮ"
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "PaslКpti iП_trintus laiПkus"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "Nustatyti puslapio parinktis tavo esamam spausdintuvui"
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
+msgstr "PaslКpti _skaitytus laiПkus"
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "UЧduoties p_raПymas (FIXME)"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "_Apie..."
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "PaЧymКti _visus skaitytais"
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_UЧdaryti"
+#: ui/evolution-mail-list.xml.h:11
+#, fuzzy
+msgid "Mark all visible messages as read"
+msgstr "Pasirinktus laiПkus paЧymКti lyg jie buvo perskaityti"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
-msgid "_Contact (FIXME)"
-msgstr "_Kontaktas (FIXME)"
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "аdКti iП krepПio"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_Kopijuoti"
+#: ui/evolution-mail-list.xml.h:14
+#, fuzzy
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Perkelti paЧymКtus laiПkus А kitЮ aplankЮ"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_Derinti"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "PaЧymКti _visus"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:35
-msgid "_Help"
-msgstr "_Pagalba"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "PaЧymКti _gijЮ"
+
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "_Elementas (FIXME)"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "чu_rnalo АraПas (FIXME)"
+#: ui/evolution-mail-list.xml.h:19
+#, fuzzy
+msgid "Select all visible messages"
+msgstr "IПtrinti paЧymКtus laiПkus"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "P_askutinis elementas aplanke (FIXME)"
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "Rodyti _visus"
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "_PaПto laiПkas (FIXME)"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "Per_kelti А aplankЮ... (FIXME)"
+#: ui/evolution-mail-list.xml.h:22
+#, fuzzy
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Pasirinktus laiПkus paЧymКti lyg jie buvo perskaityti"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "_Pastaba (FIXME)"
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "IПtrinti paЧymКtus laiПkus"
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "а_dКti"
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "Gijomis suskirstytas laiПkЬ sЮraПas"
+
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "IП_valyti"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:109
-#: ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Aplankas"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_Invertuoti paЧymКjimЮ"
+
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Properties..."
 msgstr "_SavybКs..."
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "PaЧymКti _viskЮ"
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "Gijomis suskirstytas laiПkЬ sЮraПas"
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:42
-msgid "_Task (FIXME)"
-msgstr "_UЧduotis (FIXME)"
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "Apply filter rules to the selected messages"
+msgstr "IПtrinti paЧymКtus laiПkus"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "_Neskaitytas elementas (FIXME)"
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "Atsakyti visiems Пio laiПko gavКjams"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "PridКti paslaugЮ"
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Atsakyti Пio laiПko siuntКjui"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "PridКti naujЮ paslaugЮ А Executive Summary"
+#: ui/evolution-mail-message.xml.h:6
+msgid "Copy selected messages to another folder"
+msgstr "Kopijuoti paЧymКtus laiПkus А kitЮ aplankЮ"
 
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Sukurti naujЮ laiПkЮ"
+#: ui/evolution-mail-message.xml.h:7
+msgid "Create _Virtual Folder From Message"
+msgstr "Sukurti _virtualЬ aplankЮ iП laiПko"
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Naujas laiПkas"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
-msgstr "Pritaikyti visus naujus filtrus laiПkams Пioje dКЧutКje"
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:3
-msgid "Change the properties of this folder"
-msgstr "Keisti Пio aplanko savybes"
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:4
-msgid "Compose"
-msgstr "Sukurti"
+#: ui/evolution-mail-message.xml.h:12
+#, fuzzy
+msgid "Create a virtual folder for these recipients"
+msgstr "Sukurti _virtualЬ aplankЮ iП laiПko"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
-msgstr "Sukurti naujЮ laiПkЮ"
+#: ui/evolution-mail-message.xml.h:13
+#, fuzzy
+msgid "Create a virtual folder for this mailing list"
+msgstr "Sukurti _virtualЬ aplankЮ iП laiПko"
 
-#: ui/evolution-mail.xml.h:6
-msgid "Configure Folder..."
-msgstr "KonfigШruoti aplankЮ..."
+#: ui/evolution-mail-message.xml.h:14
+#, fuzzy
+msgid "Create a virtual folder for this sender"
+msgstr "Sukurti _virtualЬ aplankЮ iП laiПko"
 
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
-msgstr "Kopijuoti laiПkЮ А naujЮ aplankЮ"
+#: ui/evolution-mail-message.xml.h:15
+#, fuzzy
+msgid "Create a virtual folder for this subject"
+msgstr "Sukurti _virtualЬ aplankЮ iП laiПko"
 
-#: ui/evolution-mail.xml.h:9
-msgid "Copy selected messages to another folder"
-msgstr "Kopijuoti paЧymКtus laiПkus А kitЮ aplankЮ"
+#: ui/evolution-mail-message.xml.h:17
+#, fuzzy
+msgid "Display the next important message"
+msgstr "Atsakyti Пio laiПko siuntКjui"
 
-#: ui/evolution-mail.xml.h:10
-msgid "Create _Virtual Folder From Message"
-msgstr "Sukurti _virtualЬ aplankЮ iП laiПko"
+#: ui/evolution-mail-message.xml.h:18
+#, fuzzy
+msgid "Display the next message"
+msgstr "Eiti А kitЮ laiПkЮ"
 
-#: ui/evolution-mail.xml.h:12
-msgid "Delete the selected messages"
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
 msgstr "IПtrinti paЧymКtus laiПkus"
 
-#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
-msgstr "Rodyti visas laiПko antraПtes"
-
-#: ui/evolution-mail.xml.h:15
-msgid "Edit Message"
-msgstr "Taisyti laiПkЮ"
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:16
-msgid "Edit the current message"
-msgstr "Taisyti esamЮ laiПkЮ"
+#: ui/evolution-mail-message.xml.h:21
+#, fuzzy
+msgid "Display the previous important message"
+msgstr "Eiti А praeitЮ laiПkЮ"
 
-#: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
-msgstr "IПtuПtinti _ПiukПlinФ"
+#: ui/evolution-mail-message.xml.h:22
+#, fuzzy
+msgid "Display the previous message"
+msgstr "Eiti А praeitЮ laiПkЮ"
 
-#: ui/evolution-mail.xml.h:18
-msgid "Expunge"
-msgstr "IПvalyti"
+#: ui/evolution-mail-message.xml.h:23
+#, fuzzy
+msgid "Display the previous unread message"
+msgstr "Eiti А praeitЮ laiПkЮ"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Filter on Mailing _List"
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "Filtras pagal _KonferencijЮ"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "Filtras pagal Siu_ntКjЮ"
 
-#: ui/evolution-mail.xml.h:21
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "Filtras pagal _GavКjus"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "Filtras pagal _TemЮ"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Finaly remove all mails tagged for deletion"
-msgstr "VisiПkai iПtrinti visus laiПkus, paЧymКtus iПtrintais"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:24
-msgid "Forget _Passwords"
-msgstr "Pa_mirПti slaptaЧodЧius"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "PersiЬsti"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "PersiЬsti kaip"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Forward inline"
-msgstr "PersiЬsti viduje"
-
-#: ui/evolution-mail.xml.h:28
-msgid "Forward the selected mail to someone"
-msgstr "PersiЬsti paЧymКtЮ laiПkЮ kaЧkam"
-
-#: ui/evolution-mail.xml.h:30
-msgid "Forward this message in-line with your mail, so you can edit it"
-msgstr ""
-"PersiЬsti paЧymКtЮ laiПkЮ viduje tavo laiПko, taip kad tu jА gali pakeisti"
-
-#: ui/evolution-mail.xml.h:31
-msgid "Full _Headers"
-msgstr "Pilnos _antraПtКs"
-
-#: ui/evolution-mail.xml.h:32
-msgid "Go to the next message"
-msgstr "Eiti А kitЮ laiПkЮ"
-
-#: ui/evolution-mail.xml.h:33
-msgid "Go to the previous message"
-msgstr "Eiti А praeitЮ laiПkЮ"
+#: ui/evolution-mail-message.xml.h:31
+#, fuzzy
+msgid "Forward _Attached"
+msgstr "PersiЬsti kaip"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Hide Deleted Messages"
-msgstr "PaslКpti iПtrintus laiПkus"
+#: ui/evolution-mail-message.xml.h:32
+#, fuzzy
+msgid "Forward _Inline"
+msgstr "PersiЬsti v_iduje"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Hide S_elected Messages"
-msgstr "PaslКpti paЧy_mКtus laiПkus"
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Forward _Quoted"
+msgstr "PersiЬsti v_iduje"
 
-#: ui/evolution-mail.xml.h:36
-msgid "Hide _Deleted Messages"
-msgstr "PaslКpti iП_trintus laiПkus"
+#: ui/evolution-mail-message.xml.h:34
+#, fuzzy
+msgid "Forward the selected message in the body of a new message"
+msgstr "PersiЬsti paЧymКtЮ laiПkЮ kaЧkam"
 
-#: ui/evolution-mail.xml.h:37
-msgid "Hide _Read messages"
-msgstr "PaslКpti _skaitytus laiПkus"
+#: ui/evolution-mail-message.xml.h:35
+#, fuzzy
+msgid "Forward the selected message quoted like a reply"
+msgstr "PersiЬsti paЧymКtЮ laiПkЮ kaЧkam"
 
-#: ui/evolution-mail.xml.h:38
-msgid "Invert Selection"
-msgstr "Invertuoti ЧymКjimЮ"
+#: ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward the selected message to someone"
+msgstr "PersiЬsti paЧymКtЮ laiПkЮ kaЧkam"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Manage _Subscriptions..."
-msgstr "Tvarkyti uЧ_sakymus..."
+#: ui/evolution-mail-message.xml.h:37
+#, fuzzy
+msgid "Forward the selected message to someone as an attachment"
+msgstr "PersiЬsti paЧymКtЮ laiПkЮ kaЧkam"
 
-#: ui/evolution-mail.xml.h:41
-msgid "Mark All as R_ead"
-msgstr "PaЧymКti _visus skaitytais"
+#: ui/evolution-mail-message.xml.h:39
+#, fuzzy
+msgid "Load _Images"
+msgstr "PersiЬsti laiПkai"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Mark As Read"
-msgstr "PaЧymКti skaitytu"
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "Svarbus"
 
-#: ui/evolution-mail.xml.h:43
-msgid "Mark As U_nread"
-msgstr "PaЧymКti _neskaitytu"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
+msgstr "PaЧymКti neskaitytu"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "Pasirinktus laiПkus paЧymКti lyg jie buvo perskaityti"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "Pasirinktus laiПkus paЧymКti lyg jie buvo perskaityti"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "Pasirinktus laiПkus paЧymКti lyg jie nebuvo perskaityti"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Pasirinktus laiПkus paЧymКti lyg jie nebuvo perskaityti"
+
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "Pasirinktus laiПkus paЧymКti lyg jie buvo perskaityti"
+
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Perkelti"
 
-#: ui/evolution-mail.xml.h:48
-msgid "Move message to a new folder"
-msgstr "Perkelti laiПkЮ А naujЮ aplankЮ"
-
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "Perkelti paЧymКtus laiПkus А kitЮ aplankЮ"
 
-#: ui/evolution-mail.xml.h:51
-msgid "Open in New Window"
-msgstr "Atidaryti naujame lange"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "Kitas"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Kitas laiПkas"
 
-#: ui/evolution-mail.xml.h:52
-msgid "Open the current message in a new window"
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Kitas laiПkas"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "PaЧymКti _gijЮ"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Kitas laiПkas"
+
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Open the selected message in a new window"
 msgstr "Atidaryti esamЮ laiПkЮ naujame lange"
 
-#: ui/evolution-mail.xml.h:58
-msgid "Print Preview of message..."
-msgstr "LaiПko spaudinio perЧiШra..."
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Open the selected message in the composer to re-send it"
+msgstr "Pasirinktus laiПkus paЧymКti lyg jie buvo perskaityti"
 
-#: ui/evolution-mail.xml.h:59
-msgid "Print message to the printer"
-msgstr "Spausdinti laiПkЮ spausdintuvu"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "PerЧiШrКti laiПkЮ prieП spausdinant"
 
-#: ui/evolution-mail.xml.h:60
-msgid "Print message..."
-msgstr "Spausdinti laiПkЮ..."
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "Praeitas"
 
-#: ui/evolution-mail.xml.h:63
-msgid "Redirect (FIXME: implement me)"
-msgstr "Nukreipti (FIXME)"
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Praeitas laiПkas"
 
-#: ui/evolution-mail.xml.h:67
-msgid "Reply to all"
-msgstr "Atsakyti visiems"
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Praeitas laiПkas"
 
-#: ui/evolution-mail.xml.h:69
-msgid "Reply to sender"
-msgstr "Atsakyti siuntКjui"
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Praeitas laiПkas"
 
-#: ui/evolution-mail.xml.h:71
-msgid "S_earch Message"
-msgstr "I_eПkoti laiПke"
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
+msgid "Print Message..."
+msgstr "Spausdinti laiПkЮ..."
 
-#: ui/evolution-mail.xml.h:72
-msgid "S_ource"
-msgstr "п_altinis"
+#: ui/evolution-mail-message.xml.h:65
+#, fuzzy
+msgid "Print Preview..."
+msgstr "Spaudinio perЧiШra"
 
-#: ui/evolution-mail.xml.h:73
-msgid "Save the message into a new file"
-msgstr "IПsaugoti laiПkЮ А naujЮ bylЮ"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "Spausdinti laiПkЮ"
 
-#: ui/evolution-mail.xml.h:75 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "PaЧymКti _visus"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "Atsakyti"
 
-#: ui/evolution-mail.xml.h:76
-msgid "Select _Thread"
-msgstr "PaЧymКti _gijЮ"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "Atsakyti visiems"
 
-#: ui/evolution-mail.xml.h:77
-msgid "Send / Receive"
-msgstr "SiЬsti / Gauti"
+#: ui/evolution-mail-message.xml.h:71
+msgid "S_earch Message"
+msgstr "I_eПkoti laiПke"
 
-#: ui/evolution-mail.xml.h:78
-msgid "Send a reply to the person who sent you this mail"
-msgstr "SiЬsti atsakymЮ asmeniui, kuris tau atsiuntК ПА laiПkЮ"
+#: ui/evolution-mail-message.xml.h:72
+#, fuzzy
+msgid "Save the message as a text file"
+msgstr "IПsaugoti laiПkЮ А naujЮ bylЮ"
 
-#: ui/evolution-mail.xml.h:79
-msgid "Send a single mail in reply to all the selected mail"
-msgstr "SiЬsti vienЮ laiПkЮ, kaip atsakymЮ А visus paЧymКtus laiПkus"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:80
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
+#: ui/evolution-mail-message.xml.h:74
+msgid "Show Email _Source"
 msgstr ""
-"IПsiЬsti laukiantА paПtЮ\n"
-"    ir parsiЬsti naujЮ paПtЮ"
 
-#: ui/evolution-mail.xml.h:82
-msgid "Send queued mail and retrieve new mail"
-msgstr "IПsiЬsti laukiantА paПtЮ ir parsiЬsti naujЮ paПtЮ"
+#: ui/evolution-mail-message.xml.h:75
+#, fuzzy
+msgid "Show Full _Headers"
+msgstr "Pilnos _antraПtКs"
 
-#: ui/evolution-mail.xml.h:83
-msgid "Show _All"
-msgstr "Rodyti _visus"
+#: ui/evolution-mail-message.xml.h:76
+#, fuzzy
+msgid "Show message in the normal style"
+msgstr "Data turi bШti Аvesta formatu: %s"
 
-#: ui/evolution-mail.xml.h:85
-msgid "Threaded Message list"
-msgstr "Gijomis suskirstytas laiПkЬ sЮraПas"
+#: ui/evolution-mail-message.xml.h:77
+#, fuzzy
+msgid "Show message with all email headers"
+msgstr "Patikrinti, ar yra naujЬ laiПkЬ visuose aplankuose"
+
+#: ui/evolution-mail-message.xml.h:78
+#, fuzzy
+msgid "Show the raw email source of the message"
+msgstr "Prisegti bylЮ prie Пio laiПko"
 
-#: ui/evolution-mail.xml.h:86
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "SugrЮЧinti paЧymКtus laiПkus"
 
-#: ui/evolution-mail.xml.h:87
-msgid "Undelete"
-msgstr "SugrЮЧinti"
+#: ui/evolution-mail-message.xml.h:80
+#, fuzzy
+msgid "VFolder on Mailing _List..."
+msgstr "vAplankas pagal _KonferencijЮ"
 
-#: ui/evolution-mail.xml.h:92
-msgid "View Raw Message Source"
-msgstr "Rodyti neapdorotЮ laiПko ПaltinА"
+#: ui/evolution-mail-message.xml.h:81
+#, fuzzy
+msgid "VFolder on Se_nder..."
+msgstr "vAplankas pagal Siu_ntКjЮ"
 
-#: ui/evolution-mail.xml.h:93
-msgid "Virtual Folder _Editor..."
-msgstr "_VirtualiЬ aplankЬ taisymas..."
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "VFolder on _Recipients..."
+msgstr "vAplankas pagal _GavКjus"
 
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail-message.xml.h:83
+#, fuzzy
+msgid "VFolder on _Subject..."
+msgstr "vAplankas pagal _TemЮ"
+
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_Pritaikyti filtrus"
 
-#: ui/evolution-mail.xml.h:95
-msgid "_Attachment"
-msgstr "_Priedas"
+#: ui/evolution-mail-message.xml.h:85
+#, fuzzy
+msgid "_Copy to Folder"
+msgstr "Kopijuoti А aplankЮ"
 
-#: ui/evolution-mail.xml.h:97
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "_Sukurti filtrЮ iП laiПko"
 
-#: ui/evolution-mail.xml.h:99
-msgid "_Expunge"
-msgstr "IП_valyti"
-
-#: ui/evolution-mail.xml.h:100
-msgid "_Filters..."
-msgstr "_Filtrai..."
-
-#: ui/evolution-mail.xml.h:101 ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "_Aplankas"
+#: ui/evolution-mail-message.xml.h:88
+#, fuzzy
+msgid "_Forward Message"
+msgstr "PersiЬsti laiПkai"
 
-#: ui/evolution-mail.xml.h:103
-msgid "_Inline"
-msgstr "_Viduje"
+#: ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Message Display"
+msgstr "LaiПko ro_dymas"
 
-#: ui/evolution-mail.xml.h:104 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Invertuoti paЧymКjimЮ"
+#: ui/evolution-mail-message.xml.h:90
+#, fuzzy
+msgid "_Move to Folder"
+msgstr "Perkelti А aplankЮ"
 
-#: ui/evolution-mail.xml.h:105
-msgid "_Mail Message"
-msgstr "_PaПto laiПkas"
+#: ui/evolution-mail-message.xml.h:91
+#, fuzzy
+msgid "_Normal Display"
+msgstr "Vaizdavimas"
 
-#: ui/evolution-mail.xml.h:106
-msgid "_Mail Settings..."
-msgstr "_PaПto nuostatos..."
+#: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Open Message"
+msgstr "_VКl pasiЬsti laiПkus"
 
-#: ui/evolution-mail.xml.h:108
-msgid "_Open Selected Items"
-msgstr "_Atidaryti paЧymКtus laiПkus"
+#: ui/evolution-mail-message.xml.h:93
+#, fuzzy
+msgid "_Re-send Message"
+msgstr "_VКl pasiЬsti laiПkus"
 
-#: ui/evolution-mail.xml.h:110
-msgid "_Quoted"
-msgstr "_Cituojant"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "UЧdaryti ПА langЮ"
 
-#: ui/evolution-mail.xml.h:111
-msgid "_Reply"
-msgstr "_Atsakyti"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr "Prisitai_kyti Аrankines..."
 
-#: ui/evolution-mail.xml.h:112
-msgid "_Resend Messages"
-msgstr "_VКl pasiЬsti laiПkus"
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "Prisitaikyti"
 
-#: ui/evolution-mail.xml.h:114
-msgid "_Save Message As..."
-msgstr "IП_saugoti laiПkЮ kaip..."
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "Prisitaikyti Аrankines"
 
-#: ui/evolution-mail.xml.h:115
-msgid "_Send / Receive"
-msgstr "_SiЬsti / Gauti"
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "_UЧdaryti"
 
-#: ui/evolution-mail.xml.h:116
-msgid "_Threaded"
-msgstr "_Gijomis"
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "_Rodinys"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Prisegti"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "UЧdaryti esamЮ bylЮ"
 
 #: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Delete all but signature"
+msgstr "Pasirink paraПo bylЮ"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "UЧПifruoti ПА laiПkЮ su PGP"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "F_ormatas"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "аterpti tekstinФ bylЮ..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "аterpti bylЮ А laiПkЮ kaip tekstЮ"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "аterpti tekstinФ bylЮ..."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Atidaryti bylЮ"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "PGP uЧПifruoti"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "PGP pasiraПyti"
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "IПsaugoti juo_draПtА"
+#, fuzzy
+msgid "S/MIME Encrypt"
+msgstr "PGP uЧПifruoti"
 
 #: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "IПsaugoti А _aplankЮ... (FIXME)"
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "IПsaugoti"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "IПsaugoti kaip"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr "IПsaugoti juo_draПtА"
+
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "IПsaugoti А aplankЮ..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "IПsaugoti esamЮ bylЮ"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "IПsaugoti esamЮ bylЮ kitokiu vardu"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "IПsaugoti laiПkЮ А nurodytЮ aplankЮ"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "SiЬsti"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "SiЬsti vК_liau"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "SiЬsti vК_liau"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "SiЬsti laiПkЮ HTML formatu"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "SiЬsti laiПkЮ vКliau"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "SiЬsti laiПkЮ dabar"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "SiЬsti ПА laiПkЮ dabar"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Rodyti/slКpti priedus"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Rodyti _priedus"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Rodyti priedus"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "PasiraПyti ПА laiПkЮ tavo PGP raktu"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "PasiraПyti ПА laiПkЮ tavo PGP raktu"
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Perjungia, ar BCC laukas yra rodomas"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr "Perjungia, ar CC laukas yra rodomas"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Perjungia, ar Nuo pasirinkimas yra rodomas"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Perjungia, ar Atsakyti kam laukas yra rodomas"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "_Priedas"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "_Bcc laukas"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "_Cc laukas"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "_Derinti"
+
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Delete all"
+msgstr "_IПtrinti"
+
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "_Nuo laukas"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "аterpt_i"
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
-msgstr "аterpt_i tekstinФ bylЮ... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Atidaryti..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "_Atsakyti-kam laukas"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "_Saugumas"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "_Pagalba"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "PridКti aplankЮ А uЧsakytЬ aplankЬ sЮraПЮ"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Aplankas"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Atnaujinti sЮraПЮ"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Atnaujinti aplankЬ sЮraПЮ"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "PaПalinti aplankЮ iП uЧsakytЬ aplankЬ sЮraПo"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "UЧsakyti"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Atsisakyti"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "Priski_rti uЧduotА (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Rasti vКl"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "Susitikimo _praПymas (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Pakartoti"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Pakartoti atПauktЮ veiksmЮ"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Pakeisti"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Pakeisti eilutФ"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "Atsakyti _visiems (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "SiЬs_ti bШsenos ataskaitЮ (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "Praleisti pasi_kartojimЮ (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "IПsaugoti uЧduotА ir uЧdaryti dialogo langЮ"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "VКl ieПkoti tos paХios eilutКs"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "IeПkoti eilutКs"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "AtПaukti"
+#: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Task"
+msgstr "Nauja uЧduotis"
 
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "AtПaukti paskutinА veiksmЮ"
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "IПtrinti uЧduotА"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
-msgid "_Appointment (FIXME)"
-msgstr "а_vykis (FIXME)"
+#: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Re_fresh Task"
+msgstr "Atnaujinti sЮraПЮ"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "_PaЧymКti uЧbaigta (FIXME)"
+#: ui/evolution-tasks.xml.h:2
+#, fuzzy
+msgid "Configure the task view's settings"
+msgstr "KonfigШruoti adresЬ konduitЮ"
 
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "_Atsakyti (FIXME)"
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "Copy selected task"
+msgstr "_Atidaryti paЧymКtus laiПkus"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Sukurti naujЮ uЧduotА"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "IПtrinti uЧduotА"
+
+#: ui/evolution-tasks.xml.h:7
+#, fuzzy
+msgid "Delete selected tasks"
+msgstr "IПtrinti uЧduotА"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Nauja uЧduotis"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "аdКti iП krepПio"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "IПsaugoti uЧduotА kaip kaЧkЮ kitЮ"
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "UЧduoХiЬ nuostatos..."
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "_PaПto nuostatos..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_UЧduotis"
 
@@ -8557,132 +11449,220 @@ msgstr "_UЧduotis"
 msgid "About Evolution..."
 msgstr "Apie Evolution..."
 
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "UЧdaryti ПА langЮ"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
-msgstr "Prisitai_kyti Аrankines..."
+#: ui/evolution.xml.h:2
+#, fuzzy
+msgid "Add to _Shortcut Bar"
+msgstr "_TrumpiЬ juosta"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Prisitaikyti"
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the name of this folder"
+msgstr "Keisti Пio aplanko savybes"
 
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Prisitaikyti Аrankines"
+#, fuzzy
+msgid "Copy this folder"
+msgstr "Kopijuoti А aplankЮ"
 
 #: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "Kuriamas naujas aplankas"
+
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "PaПalinti ПiЮ trumpФ iП trumpiЬ juostos"
+
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Kuriamas naujas aplankas"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "IПtrinti ПА elementЮ"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Parodyti kitЮ aplankЮ"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "I_Пeiti"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "Evolution _Langas"
 
-#: ui/evolution.xml.h:10
-msgid "Evolution bar _shortcut"
-msgstr "Evolution juostos _trumpК"
-
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "IПeiti iП programos"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "_SusipaЧinimas"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Importuoti iПorinФ bylЮ"
 
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "PagrindinК АrankinК"
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "Perkelti paЧymКtus laiПkus А kitЮ aplankЮ"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Open in New _Window"
+msgstr "Atidaryti naujame lange"
+
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Open this folder in an other window"
+msgstr "Atidaryti esamЮ laiПkЮ naujame lange"
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Rodyti informacijЮ apie Evolution"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "IПsiЬsti klaidos praneПimЮ"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "IП_siЬsti klaidos praneПimЮ"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "PraneПti apie klaidЮ, naudojant Bug Buddy."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:30
+#, fuzzy
+msgid "Toggle"
+msgstr "RolК"
+
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Perjungti, ar rodyti aplankЬ juostЮ"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Perjungti, ar rodyti trumpiЬ juostЮ"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "Toggle whether we are working offline."
+msgstr "Perjungia, ar Nuo pasirinkimas yra rodomas"
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "K_ontaktЬ menedЧerio naudojimas"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "_Kalendoriaus vartojimas"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "_PaПto programos naudojimas"
 
-#: ui/evolution.xml.h:24
-msgid "Work Offline"
-msgstr "Dirbti atsijungus"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr "Rodyti parinktЮ aplankЮ"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "_Apie Evolution..."
 
-#: ui/evolution.xml.h:26
-msgid "_Actions"
-msgstr "_Veiksmai"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "а_vykis (FIXME)"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "_Kontaktas (FIXME)"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Kopijuoti"
+
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "_AplankЬ juosta"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Eiti А aplankЮ..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "_Importuoti bylЮ..."
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "_Indeksas"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "_PaПto laiПkas"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "Perkelti"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Naujas"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "_Naujas aplankas"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Atidaryti..."
+
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "_TrumpiЬ juosta"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "_TrumpiЬ juosta"
 
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "_UЧduotis (FIXME)"
+
+#: ui/evolution.xml.h:64
+#, fuzzy
+msgid "_Work Offline"
+msgstr "Dirbti atsijungus"
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "_PaПto nuostatos..."
+
 #: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
+#, fuzzy
+msgid "Address Cards"
 msgstr "AdresЬ kortelКs"
 
 #: views/addressbook/galview.xml.h:2
@@ -8713,9 +11693,12 @@ msgstr "LaiПkai"
 msgid "With Category"
 msgstr "Su kategorija"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr ""
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%A, %Y m. %B %e"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
@@ -8789,59 +11772,137 @@ msgstr "Susitikimo pa_baigos laikas:"
 msgid "All Attendees"
 msgstr "Visi dalyviai"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%A, %Y m. %B %e"
-
-#: widgets/menus/gal-view-menus.c:176
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "_Esamas vaizdas"
 
-#: widgets/menus/gal-view-menus.c:202
+#: widgets/menus/gal-view-menus.c:259
 msgid "Define Views"
 msgstr "ApibrКЧti vaizdus"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:422
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "PATKPпS"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
-msgid "%B %Y"
-msgstr "%Y %B"
-
-#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Dabar"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Dabar"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "Gerai"
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Data turi bШti Аvesta formatu: %s"
 
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "savaitК"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "пiukПlКs"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "NebШtinas"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+msgid "New"
+msgstr "Nauja"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "NeЧinoma klaida: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "Kitas"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Kontakto redaktorius"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "IПsaugoti paieПkЮ"
 
-#: widgets/misc/e-filter-bar.c:237
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "IПsami paieПka"
 
-#: widgets/misc/e-filter-bar.c:317
-msgid "Advanced ..."
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "Rodyti visus"
+
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
 msgstr "IПsami..."
 
 #: widgets/misc/e-messagebox.c:152
@@ -8852,6 +11913,10 @@ msgstr "Informacija"
 msgid "Warning"
 msgstr "аspКjimas"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Klaida"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Klausimas"
@@ -8865,7 +11930,7 @@ msgstr "чinutК"
 msgid "Don't show this message again."
 msgstr "KitЮ kartЮ neberodyti Пios ЧinutКs."
 
-#: widgets/misc/e-search-bar.c:148
+#: widgets/misc/e-search-bar.c:155
 msgid "Sear_ch"
 msgstr "Pai_eПka"
 
@@ -8889,8 +11954,637 @@ msgstr "init_corba(): negalКjau inicializuoti GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): negalКjau inicializuoti Bonobo"
 
-#~ msgid "You must be working online to complete this operation"
-#~ msgstr "Tu turi dirbti prisijungФs, kad uЧbaigtum ПА veiksmЮ"
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "Sutvarkyti kalendoriЬ"
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "UЧduoХiЬ nuostatos..."
+
+#~ msgid "???"
+#~ msgstr "???"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "K_ontaktai..."
+
+#~ msgid "_Company:"
+#~ msgstr "_Kompanija:"
+
+#~ msgid "As _Minicards"
+#~ msgstr "Rodyti _maЧas korteles"
+
+#~ msgid "As _Table"
+#~ msgstr "Rodyti _lentelФ"
+
+#~ msgid ""
+#~ "We were unable to open this addressbook.  This either\n"
+#~ "means you have entered an incorrect URI, or have tried\n"
+#~ "to access an LDAP server and don't have LDAP support\n"
+#~ "compiled in.  If you've entered a URI, check the URI for\n"
+#~ "correctness and reenter.  If not, you probably have\n"
+#~ "attempted to access an LDAP server.  If you wish to be\n"
+#~ "able to use LDAP, you'll need to download and install\n"
+#~ "OpenLDAP and recompile and install Evolution.\n"
+#~ msgstr ""
+#~ "Mes negalКjome atidaryti Пios adresЬ knygelКs. Tai\n"
+#~ "reiПkia arba tai, kad tu Аvedei neteisingЮ URI, arba \n"
+#~ "bandei prieiti prie LDAP serverio, bet neturi \n"
+#~ "Аkompiliuoto LDAP palaikymo. Jei tu Аvedei URI, \n"
+#~ "pasitikrink URI teisingumЮ ir Аvesk iП naujo. Jei ne, \n"
+#~ "tikriausiai bandei prieiti prie LDAP serverio. Jei nori\n"
+#~ "naudoti LDAP, tu turi parsisiЬsti ir Аdiegti OpenLDAP,\n"
+#~ "o tada perkompiliuoti ir Аdiegti Evolution.\n"
+
+#~ msgid "SASL"
+#~ msgstr "SASL"
+
+#~ msgid "Find..."
+#~ msgstr "Rasti..."
+
+#~ msgid "Open calendar"
+#~ msgstr "Atidaryti kalendoriЬ"
+
+#~ msgid "Save calendar"
+#~ msgstr "IПsaugoti kalendoriЬ"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>Klaida Аkeliant kalendoriЬ:</b>Metodas nepalaikomas"
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "PerspКjimai baigiasi po"
+
+#~ msgid "Colors"
+#~ msgstr "Spalvos"
+
+#~ msgid "Enable snoozing for"
+#~ msgstr "Leisti uЧtildymЮ"
+
+#~ msgid "Highlight"
+#~ msgstr "ParyПkinti"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "пiandienos Аvykiai:"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "аvykius, kurie dar ne Пiandien"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "аvykiai, kurie dar ne Пiandien:"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "PraКjФ Аvykiai:"
+
+#~ msgid "TaskPad"
+#~ msgstr "UЧduotys"
+
+#~ msgid "Time Until Due"
+#~ msgstr "LikФs laikas"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "PerspКjimai vaizdu"
+
+#~ msgid "Work week"
+#~ msgstr "Darbo savaitК"
+
+#~ msgid "Edit Task"
+#~ msgstr "Keisti uЧduotА"
+
+#~ msgid "Percent complete"
+#~ msgstr "ProcentЬ uЧbaigta"
+
+#~ msgid "Mark the task complete"
+#~ msgstr "PaЧymКti, jog uЧduotis uЧbaigta"
+
+#~ msgid "Edit this task..."
+#~ msgstr "Keisti ПiЮ uЧduotА..."
+
+#~ msgid "Edit the task"
+#~ msgstr "Keisti ПiЮ uЧduotА"
+
+#~ msgid "Go to Today"
+#~ msgstr "Eiti А ПiandienЮ"
+
+#~ msgid "Delete all Occurrences"
+#~ msgstr "IПtrinti visus pasitaikymus"
+
+#~ msgid "Component successfully updated."
+#~ msgstr "Komponentas sКkmingai atnaujintas."
+
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "AП negalКjau Аkelti tavo kalendoriaus bylos!\n"
+
+#~ msgid "I couldn't read your calendar file!\n"
+#~ msgstr "AП negalКjau skaityti tavo kalendoriaus bylos!\n"
+
+#~ msgid "This is a reply from someone who was uninvited!"
+#~ msgstr "Tai atsakymas iП kaЧko, kas nebuvo pakviestas!"
+
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "NegalКjau atnaujinti kalendoriaus saugyklos."
+
+#~ msgid "I couldn't delete the calendar component!\n"
+#~ msgstr "AП negalКjau iПtrinti kalendoriaus komponento!\n"
+
+#~ msgid "Component successfully deleted."
+#~ msgstr "Komponentas sКkmingai iПtrintas."
+
+#~ msgid "I don't recognize this type of calendar component."
+#~ msgstr "AП nepaЧАstu tokio kalendoriaus komponento tipo."
+
+#~ msgid "Add to Calendar"
+#~ msgstr "PridКti А kalendoriЬ"
+
+#~ msgid "Update Calendar"
+#~ msgstr "Atnaujinti kalendoriЬ"
+
+#~ msgid "Attendee address"
+#~ msgstr "Dalyvio adresas"
+
+#~ msgid "Attendees: "
+#~ msgstr "Dalyviai: "
+
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr ""
+#~ "AtПaukti\n"
+#~ "susitikimЮ"
+
+#~ msgid "Organizer: "
+#~ msgstr "Organizatorius: "
+
+#~ msgid ""
+#~ "Publish\n"
+#~ "Event"
+#~ msgstr ""
+#~ "Skelbti\n"
+#~ "АvykА"
+
+#~ msgid "Show a dialog"
+#~ msgstr "Rodyti dialogЮ"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "аvykio pagrindai"
+
+#~ msgid "Settings..."
+#~ msgstr "Nuostatos..."
+
+#~ msgid "_Starting date:"
+#~ msgstr "_PradЧios data:"
+
+#~ msgid "Summary contains"
+#~ msgstr "Santraukoje yra"
+
+#~ msgid "Comment contains"
+#~ msgstr "Komentare yra"
+
+#~ msgid "Has category"
+#~ msgstr "Turi kategorijЮ"
+
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "NegalКjau patikrinti %s uЧrakto bylos: %s"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Skanuojamas IMAP aplankas"
+
+#~ msgid "Inline attachment"
+#~ msgstr "Vidinis priedas"
+
+#~ msgid "Send as:"
+#~ msgstr "SiЬsti kaip:"
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "NegalКjau atidaryti paraПo bylos %s: \n"
+#~ "%s"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "Tai nКra paprasta byla."
+
+#~ msgid "That file exists but is not readable."
+#~ msgstr "Byla yra, bet jos neАmanoma perskaityti."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "Ta byla atrodК pasiekiama, bet open(2) nepavyko."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "Byla yra labai didelК (virП 100K).\n"
+#~ "Ar tu tikrai nori jЮ Аterpti?"
+
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr "%I:%M:%S %p%n"
+
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Negaliu atidaryti HTML bylos:\n"
+#~ "%s"
+
+#~ msgid "Select a service"
+#~ msgstr "Pasirink paslaugЮ"
+
+#~ msgid ""
+#~ "You can select a different HTML page for the background of the Executive "
+#~ "Summary.\n"
+#~ "\n"
+#~ "Just leave it blank for the default"
+#~ msgstr ""
+#~ "Tu gali pasirinkti kitЮ HTML puslapА Executive Summary fonui.\n"
+#~ "\n"
+#~ "Tiesiog palik tuПХiЮ, jei tenkina Аprastinis fonas"
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "Atidaryti %s su Аprasta GNOME programa"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "Atidaryti %s su Аprasta GNOME narПykle"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "SiЬsti laiПkЮ А %s"
+
+#~ msgid "Run %s"
+#~ msgstr "Paleisti %s"
+
+#~ msgid "Close %s"
+#~ msgstr "UЧdaryti %s"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "Perkelti %s kairКn"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "Perkelti %s deПinКn"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Perkelti %s А praeitЮ eilutФ"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "Perkelti %s А kitЮ eilutФ"
+
+#~ msgid "Appearance"
+#~ msgstr "IПvaizda"
+
+#~ msgid "Background:"
+#~ msgstr "Fonas:"
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "RDF apЧvalgos gamykla."
+
+#~ msgid "RDF Summary"
+#~ msgstr "RDF apЧvalga"
+
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Testinio bonobo komponento gamykla."
+
+#~ msgid "Factory for the test component."
+#~ msgstr "Testinio komponento gamykla."
+
+#~ msgid "Test bonobo service"
+#~ msgstr "TestinК bonobo paslauga"
+
+#~ msgid "Test service"
+#~ msgstr "TestinК paslauga"
+
+#~ msgid "Update automatically"
+#~ msgstr "Atnaujinti automatiПkai"
+
+#~ msgid "Forward to Address"
+#~ msgstr "PersiЬsti adresu"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "Pakeisti aplanko ╔%s╢ formatЮ А ╔%s╢"
+
+#~ msgid "Closing current folder"
+#~ msgstr "UЧdaromas esamas aplankas"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Pervadinamas senas aplankas ir atidaromas"
+
+#~ msgid "Copying messages"
+#~ msgstr "Kopijuojami laiПkai"
+
+#~ msgid "Evolution progress"
+#~ msgstr "Evolution paЧanga"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Gaunamas laiПkas numeris %d iП %d (uid ╔%s╢)"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "IПsaugomas laiПkas %d iП %d (uid ╔%s╢)"
+
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "Nepilnas laiПkas suraПytas А pipe!"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (persiЬstas laiПkas)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Fwd: (be temos)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "PersiЬstas laiПkas (be temos)"
+
+#~ msgid "Print the selected message"
+#~ msgstr "Spausdinti parinktЮ laiПkЮ"
+
+#~ msgid "Delete this message"
+#~ msgstr "IПtrinti ПА laiПkЮ"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Evolution bylos sКkmingai Аdiegtos."
+
+#~ msgid "Activate"
+#~ msgstr "SuЧadinti"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "SuЧadinti ПiЮ trumpФ"
+
+#~ msgid "Find a contact"
+#~ msgstr "Rasti kontaktЮ"
+
+#~ msgid "View All"
+#~ msgstr "Rodyti visus"
+
+#~ msgid "View all contacts"
+#~ msgstr "Rodyti visus kontaktus"
+
+#~ msgid "5 Days"
+#~ msgstr "5 Dienos"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Sukurti naujЮ kalendoriЬ"
+
+#~ msgid "Day"
+#~ msgstr "Diena"
+
+#~ msgid "New _Event"
+#~ msgstr "Naujas А_vykis"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Atidaryti kalendoriЬ"
+
+#~ msgid "Prev"
+#~ msgstr "Praeitas"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "IПsaugoti kalendoriЬ kaip kaЧkЮ kitЮ"
+
+#~ msgid "Week"
+#~ msgstr "SavaitК"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Atidaryti kalendoriЬ"
+
+#~ msgid "About this application"
+#~ msgstr "Apie ПiЮ programЮ"
+
+#~ msgid "About..."
+#~ msgstr "Apie..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "Veiksm_ai"
+
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "_AdresЬ knygelК... (FIXME)"
+
+#~ msgid "C_lear"
+#~ msgstr "IПva_lyti"
+
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "Ti_krinti vardus (FIXME)"
+
+#~ msgid "Clear the selection"
+#~ msgstr "IПvalyti paЧymКjimЮ"
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "_Kopijuoti А aplankЮ... (FIXME)"
+
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "_Pirmas elementas aplanke (FIXME)"
+
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "_PersiЬsti (FIXME)"
+
+#~ msgid "Go to the next item"
+#~ msgstr "Eiti А tolesnА elementЮ"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "Eiti А ankstesnА elementЮ"
+
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "_NeuЧbaigta uЧduotis (FIXME)"
+
+#~ msgid "N_ext"
+#~ msgstr "_Kitas"
+
+#~ msgid "Pre_vious"
+#~ msgstr "_Praeitas"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "Spausdinimo _nuostatos..."
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "аraПyti А dienotvarkФ kaЧkokА susitikimЮ"
+
+#~ msgid "Select everything"
+#~ msgstr "PaЧymКti viskЮ"
+
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "UЧduoties p_raПymas (FIXME)"
+
+#~ msgid "_About..."
+#~ msgstr "_Apie..."
+
+#~ msgid "_Item (FIXME)"
+#~ msgstr "_Elementas (FIXME)"
+
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "чu_rnalo АraПas (FIXME)"
+
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "P_askutinis elementas aplanke (FIXME)"
+
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "_PaПto laiПkas (FIXME)"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "Per_kelti А aplankЮ... (FIXME)"
+
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_Pastaba (FIXME)"
+
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "_Neskaitytas elementas (FIXME)"
+
+#~ msgid "Add Service"
+#~ msgstr "PridКti paslaugЮ"
+
+#~ msgid "Add a new service to the Executive Summary"
+#~ msgstr "PridКti naujЮ paslaugЮ А Executive Summary"
+
+#~ msgid "Create a new email"
+#~ msgstr "Sukurti naujЮ laiПkЮ"
+
+#~ msgid "New Mail"
+#~ msgstr "Naujas laiПkas"
+
+#~ msgid "Apply any new filters to the mail in this box"
+#~ msgstr "Pritaikyti visus naujus filtrus laiПkams Пioje dКЧutКje"
+
+#~ msgid "Configure Folder..."
+#~ msgstr "KonfigШruoti aplankЮ..."
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Kopijuoti laiПkЮ А naujЮ aplankЮ"
+
+#~ msgid "Edit the current message"
+#~ msgstr "Taisyti esamЮ laiПkЮ"
+
+#~ msgid "Expunge"
+#~ msgstr "IПvalyti"
+
+#~ msgid "Finaly remove all mails tagged for deletion"
+#~ msgstr "VisiПkai iПtrinti visus laiПkus, paЧymКtus iПtrintais"
+
+#~ msgid "Forward inline"
+#~ msgstr "PersiЬsti viduje"
+
+#~ msgid "Forward this message in-line with your mail, so you can edit it"
+#~ msgstr ""
+#~ "PersiЬsti paЧymКtЮ laiПkЮ viduje tavo laiПko, taip kad tu jА gali pakeisti"
+
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "PaslКpti iПtrintus laiПkus"
+
+#~ msgid "Invert Selection"
+#~ msgstr "Invertuoti ЧymКjimЮ"
+
+#~ msgid "Mark As Read"
+#~ msgstr "PaЧymКti skaitytu"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "PaЧymКti _neskaitytu"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Perkelti laiПkЮ А naujЮ aplankЮ"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "LaiПko spaudinio perЧiШra..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Spausdinti laiПkЮ spausdintuvu"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "Nukreipti (FIXME)"
+
+#~ msgid "Reply to all"
+#~ msgstr "Atsakyti visiems"
+
+#~ msgid "Reply to sender"
+#~ msgstr "Atsakyti siuntКjui"
+
+#~ msgid "S_ource"
+#~ msgstr "п_altinis"
+
+#~ msgid "Send a reply to the person who sent you this mail"
+#~ msgstr "SiЬsti atsakymЮ asmeniui, kuris tau atsiuntК ПА laiПkЮ"
+
+#~ msgid "Send a single mail in reply to all the selected mail"
+#~ msgstr "SiЬsti vienЮ laiПkЮ, kaip atsakymЮ А visus paЧymКtus laiПkus"
+
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr ""
+#~ "IПsiЬsti laukiantА paПtЮ\n"
+#~ "    ir parsiЬsti naujЮ paПtЮ"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "Rodyti neapdorotЮ laiПko ПaltinА"
+
+#~ msgid "_Reply"
+#~ msgstr "_Atsakyti"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "IП_saugoti laiПkЮ kaip..."
+
+#~ msgid "_Threaded"
+#~ msgstr "_Gijomis"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "IПsaugoti А _aplankЮ... (FIXME)"
+
+#~ msgid "Send the message now"
+#~ msgstr "SiЬsti laiПkЮ dabar"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "аterpt_i tekstinФ bylЮ... (FIXME)"
+
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "Priski_rti uЧduotА (FIXME)"
+
+#~ msgid "Meeting Re_quest (FIXME)"
+#~ msgstr "Susitikimo _praПymas (FIXME)"
+
+#~ msgid "Redo"
+#~ msgstr "Pakartoti"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Pakartoti atПauktЮ veiksmЮ"
+
+#~ msgid "Replace"
+#~ msgstr "Pakeisti"
+
+#~ msgid "Replace a string"
+#~ msgstr "Pakeisti eilutФ"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "Atsakyti _visiems (FIXME)"
+
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "SiЬs_ti bШsenos ataskaitЮ (FIXME)"
+
+#~ msgid "S_kip Occurrence (FIXME)"
+#~ msgstr "Praleisti pasi_kartojimЮ (FIXME)"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "VКl ieПkoti tos paХios eilutКs"
+
+#~ msgid "Search for a string"
+#~ msgstr "IeПkoti eilutКs"
+
+#~ msgid "Undo"
+#~ msgstr "AtПaukti"
+
+#~ msgid "Undo the last action"
+#~ msgstr "AtПaukti paskutinА veiksmЮ"
+
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "_PaЧymКti uЧbaigta (FIXME)"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "_Atsakyti (FIXME)"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Evolution juostos _trumpК"
+
+#~ msgid "Advanced ..."
+#~ msgstr "IПsami..."
 
 #~ msgid "Body contains"
 #~ msgstr "Tekstas savyje turi"
@@ -8919,15 +12613,9 @@ msgstr "init_bonobo(): negalКjau inicializuoti Bonobo"
 #~ msgid "VFolder on Recipients"
 #~ msgstr "vAplankas pagal GavКjus"
 
-#~ msgid "Save As..."
-#~ msgstr "IПsaugoti kaip..."
-
 #~ msgid "Mark as Read"
 #~ msgstr "PaЧymКti skaitytu"
 
-#~ msgid "Mark as Unread"
-#~ msgstr "PaЧymКti neskaitytu"
-
 #~ msgid "Move to Folder..."
 #~ msgstr "Perkelti А aplankЮ..."
 
@@ -8943,9 +12631,6 @@ msgstr "init_bonobo(): negalКjau inicializuoti Bonobo"
 #~ msgid "Click here to add a contact"
 #~ msgstr "Spausk Хia, kad pridКtum kontaktЮ"
 
-#~ msgid "Remove action"
-#~ msgstr "PaПalinti veiksmЮ"
-
 #~ msgid "Remove criterion"
 #~ msgstr "PaПalinti sЮlygЮ"
 
@@ -8959,9 +12644,6 @@ msgstr "init_bonobo(): negalКjau inicializuoti Bonobo"
 #~ msgid "Edit Filter Rule"
 #~ msgstr "Keisti filtro taisyklФ"
 
-#~ msgid "Source"
-#~ msgstr "пaltinis"
-
 #~ msgid "Add VFolder Rule"
 #~ msgstr "PridКti vAplanko taisyklФ"
 
@@ -8978,18 +12660,12 @@ msgstr "init_bonobo(): negalКjau inicializuoti Bonobo"
 #~ msgid "Unspecified"
 #~ msgstr "Nenurodyta"
 
-#~ msgid "Check settings"
-#~ msgstr "Tikrinti nuostatas"
-
 #~ msgid "Email address:"
 #~ msgstr "El. paПto adresas:"
 
 #~ msgid "Evolution Mail Configuration"
 #~ msgstr "Evolution paПto nustatymas"
 
-#~ msgid "Hostname:"
-#~ msgstr "Hosto vardas:"
-
 #~ msgid "IMAP"
 #~ msgstr "IMAP"
 
@@ -8999,18 +12675,12 @@ msgstr "init_bonobo(): negalКjau inicializuoti Bonobo"
 #~ msgid "Kerberos"
 #~ msgstr "Kerberos"
 
-#~ msgid "Mail"
-#~ msgstr "PaПtas"
-
 #~ msgid "Mail Account"
 #~ msgstr "PaПto sЮskaita"
 
 #~ msgid "Mail Configuration Druid"
 #~ msgstr "PaПto nustatymo meistras"
 
-#~ msgid "Optional"
-#~ msgstr "NebШtinas"
-
 #~ msgid "Password:"
 #~ msgstr "SlaptaЧodis:"
 
@@ -9026,15 +12696,9 @@ msgstr "init_bonobo(): negalКjau inicializuoti Bonobo"
 #~ msgid "Save password"
 #~ msgstr "IПsaugoti slaptaЧodА"
 
-#~ msgid "Select signature file"
-#~ msgstr "Pasirink paraПo bylЮ"
-
 #~ msgid "Server type:"
 #~ msgstr "Serverio tipas:"
 
-#~ msgid "Signature:"
-#~ msgstr "ParaПas:"
-
 #~ msgid "Transport"
 #~ msgstr "Siuntimas"
 
@@ -9054,9 +12718,6 @@ msgstr "init_bonobo(): negalКjau inicializuoti Bonobo"
 #~ msgid "<unknown>"
 #~ msgstr "<neЧinomas>"
 
-#~ msgid "Message _Display"
-#~ msgstr "LaiПko ro_dymas"
-
 #~ msgid "_Message Hiding"
 #~ msgstr "_LaiПkЬ slКpimas"
 
@@ -9113,9 +12774,6 @@ msgstr "init_bonobo(): negalКjau inicializuoti Bonobo"
 #~ "аvyko klaida, bandant gauti pilotЬ\n"
 #~ "sЮraПЮ iП gnome-pilot demono"
 
-#~ msgid "Configure the address conduit"
-#~ msgstr "KonfigШruoti adresЬ konduitЮ"
-
 #~ msgid "Evolution Address conduit "
 #~ msgstr "Evolution AdresЬ konduitas "
 
@@ -9155,9 +12813,6 @@ msgstr "init_bonobo(): negalКjau inicializuoti Bonobo"
 #~ msgid "Account Properties"
 #~ msgstr "SЮskaitos savybКs"
 
-#~ msgid "E-Mail Address:"
-#~ msgstr "El. paПto adresas:"
-
 #~ msgid "Include in \"Get Mail\" operations."
 #~ msgstr "аtraukti А ╔Gauti paПtЮ╢ veiksmus."
 
@@ -9218,9 +12873,6 @@ msgstr "init_bonobo(): negalКjau inicializuoti Bonobo"
 #~ msgid "_VFolder on Subject"
 #~ msgstr "_vAplankas pagal TemЮ"
 
-#~ msgid "New"
-#~ msgstr "Nauja"
-
 #~ msgid "Customi_ze..."
 #~ msgstr "Prisi_taikyti..."
 
@@ -9229,6 +12881,3 @@ msgstr "init_bonobo(): negalКjau inicializuoti Bonobo"
 
 #~ msgid "Show the _Shortcut Bar"
 #~ msgstr "Rodyti _TrumpiЬ juostЮ"
-
-#~ msgid "_Settings"
-#~ msgstr "_Nuostatos"
diff --git a/po/nl.po b/po/nl.po
index a686c8d268..5f7f820eed 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution CVS\n"
-"POT-Creation-Date: 2001-06-20 11:04+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-06-18 22:09+GMT\n"
 "Last-Translator: Mendel Mobach <mendel@mobach.nl>\n"
 "Language-Team: Nederlands <nl@li.org>\n"
@@ -17,11 +17,19 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3324
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr "Fabriek om GnomeCard bestanden importeren in Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr "Importeert GnomeCard bestanden naar Evolution."
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Kaart: "
 
-#: addressbook/backend/ebook/e-card.c:3326
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -29,7 +37,7 @@ msgstr ""
 "\n"
 "Naam: "
 
-#: addressbook/backend/ebook/e-card.c:3327
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -37,7 +45,7 @@ msgstr ""
 "\n"
 "  Voorvoegsel:      "
 
-#: addressbook/backend/ebook/e-card.c:3328
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -45,7 +53,7 @@ msgstr ""
 "\n"
 "  Gegeven:      "
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -53,7 +61,7 @@ msgstr ""
 "\n"
 "  Extra: "
 
-#: addressbook/backend/ebook/e-card.c:3330
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -61,7 +69,7 @@ msgstr ""
 "\n"
 "  Familie:      "
 
-#: addressbook/backend/ebook/e-card.c:3331
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -69,7 +77,7 @@ msgstr ""
 "\n"
 "  Achtervoegsel:      "
 
-#: addressbook/backend/ebook/e-card.c:3345
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -77,7 +85,7 @@ msgstr ""
 "\n"
 "Geboortedatum: "
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -85,7 +93,7 @@ msgstr ""
 "\n"
 "Adres:"
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -93,7 +101,7 @@ msgstr ""
 "\n"
 "  Postbus:  "
 
-#: addressbook/backend/ebook/e-card.c:3359
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -101,7 +109,7 @@ msgstr ""
 "\n"
 "  Ext:           "
 
-#: addressbook/backend/ebook/e-card.c:3360
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -109,7 +117,7 @@ msgstr ""
 "\n"
 "  Straat:      "
 
-#: addressbook/backend/ebook/e-card.c:3361
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -117,7 +125,7 @@ msgstr ""
 "\n"
 "  Plaats:        "
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -125,7 +133,7 @@ msgstr ""
 "\n"
 "  Regio:      "
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -133,7 +141,7 @@ msgstr ""
 "\n"
 "  Postcode: "
 
-#: addressbook/backend/ebook/e-card.c:3364
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -141,7 +149,7 @@ msgstr ""
 "\n"
 "  Land:      "
 
-#: addressbook/backend/ebook/e-card.c:3377
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
@@ -149,7 +157,7 @@ msgstr ""
 "\n"
 "Afleveringslabel: "
 
-#: addressbook/backend/ebook/e-card.c:3389
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -157,7 +165,7 @@ msgstr ""
 "\n"
 "Telefoons:\n"
 
-#: addressbook/backend/ebook/e-card.c:3392
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -165,7 +173,7 @@ msgstr ""
 "\n"
 "Telefoon:"
 
-#: addressbook/backend/ebook/e-card.c:3416
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -173,7 +181,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3419
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -181,7 +189,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3438
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -189,7 +197,7 @@ msgstr ""
 "\n"
 "Mailer: "
 
-#: addressbook/backend/ebook/e-card.c:3444
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -197,7 +205,7 @@ msgstr ""
 "\n"
 "Tijdzone: "
 
-#: addressbook/backend/ebook/e-card.c:3452
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -205,7 +213,7 @@ msgstr ""
 "\n"
 "Geografische Locatie: "
 
-#: addressbook/backend/ebook/e-card.c:3456
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -213,7 +221,7 @@ msgstr ""
 "\n"
 "Bedrijfsrol: "
 
-#: addressbook/backend/ebook/e-card.c:3468
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -221,7 +229,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3469
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -229,7 +237,7 @@ msgstr ""
 "\n"
 "  Naam:   "
 
-#: addressbook/backend/ebook/e-card.c:3470
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -237,7 +245,7 @@ msgstr ""
 "\n"
 "  Eenheid:  "
 
-#: addressbook/backend/ebook/e-card.c:3471
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -245,7 +253,7 @@ msgstr ""
 "\n"
 "  Eenheid2: "
 
-#: addressbook/backend/ebook/e-card.c:3472
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -253,7 +261,7 @@ msgstr ""
 "\n"
 "  Eenheid3: "
 
-#: addressbook/backend/ebook/e-card.c:3473
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -261,7 +269,7 @@ msgstr ""
 "\n"
 "  Eenheid4: "
 
-#: addressbook/backend/ebook/e-card.c:3477
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -269,7 +277,7 @@ msgstr ""
 "\n"
 "CategorieКn: "
 
-#: addressbook/backend/ebook/e-card.c:3478
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -287,7 +295,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3491
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -295,7 +303,7 @@ msgstr ""
 "\n"
 "Unieke Tekenreeks: "
 
-#: addressbook/backend/ebook/e-card.c:3494
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -303,36 +311,24 @@ msgstr ""
 "\n"
 "Publieke Sleutel: "
 
-#: addressbook/backend/ebook/e-card.c:3755
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr "Meerdere Vkaarten"
 
-#: addressbook/backend/ebook/e-card.c:3763
+#: addressbook/backend/ebook/e-card.c:4045
 #, c-format
 msgid "VCard for %s"
 msgstr "Vkaart voor %s"
 
-#: addressbook/backend/ebook/e-destination.c:244
-msgid "???"
-msgstr "???"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "Fabriek om GnomeCard bestanden importeren in Evolution."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Importeert GnomeCard bestanden naar Evolution."
-
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Kon Bonobo niet initialiseren"
 
@@ -345,14 +341,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook niet geladen\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Kon \"wombat\" server niet starten"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Kon \"wombat\" niet starten"
 
@@ -361,725 +357,813 @@ msgstr "Kon \"wombat\" niet starten"
 msgid "Could not read pilot's Address application block"
 msgstr "Kon de adresgegevens niet uit de pilot lezen"
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr "Een Bonobo control dat een adresboek weergeeft."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "Een Bonobo control dat een adresboek weergeeft."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "Een voorbeeld Bonobo control dat een adresboek weergeeft."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Control dat een Evolution minikaart adresboek weergeeft."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Evolution Adresboek minikaartbekijker"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "Een component voor het afhandelen van contacten."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Fabriek voor het Adresboek Minikaart control"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Fabriek voor de naam selectie interface van het Adresboek"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr "Fabriek voor de naam selectie interface van het Adresboek"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr "Fabriek voor het Evolution adresboek component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr "Fabriek voor het voorbeeld Adresboekcontrol"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "LDAP Server"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Bestand"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Onbekend adresboek type"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "Geen (anonieme modus)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Wachtwoord"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Onbekende aanmeldingstype"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "Basis"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "Een"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "Subboom"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr "Onbekend bereiktype"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr "Bind DN:"
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr "FIXME Verbindings DN Help tekst hier"
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Onthoud dit wachtwoord"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "Computernaam:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr "FIXME Computernaam help tekst hier."
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "Stam DN:"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr "FIXME Stam DN help tekst hier."
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Poort:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr "FIXME Poort help tekst hier."
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "Zoekbereik:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Aanmelding:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr "Geavanceerd LDAP opties"
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Pad:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr "FIXME Pad Help tekst hier"
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "Maak pad als het niet bestaat."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "Bewerk Adresboek"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "Adresboek Toevoegen"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"Selecteer het soort adresboek dat u hebt en voer de relevante informatie "
+"erover in."
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Naam:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr "FIXME Naam help tekst hier"
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Omschrijving:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr "FIXME Beschrijving help tekst hier"
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "Toevoegen"
+msgid "Addressbook Sources"
+msgstr "Adresboekbronnen"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Verwijderen"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Naam"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "_Toevoegen"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "B_ewerken..."
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "Andere Contacten"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "Voer het wachtwoord voor %s in"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Kan het adresboek niet openen"
+
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+"Kan het adresboek niet openen.  Dit kan komen doordat\n"
+"u een ongeldige URI heeft opgegeven of de LDAPserver\n"
+"down is."
+
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+"Deze versie van Evolution heeft geen LDAP support\n"
+"u moet het mee compileren.  Als u LDAP wilt gebruiken in Evolution\n"
+"moet u het programma vanuit de CVS sources meecompileren\n"
+"nadat u OpenLDAP van de link hierbeneden heeft opgehaald.\n"
+
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+"Kan het adressenboek niet openen.  Controleer of het pad bestaat\n"
+"en of u het mag benaderen."
+
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
+msgstr "Elk veld bevat"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "Naam bevat"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "E-mail bevat"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "Naam bevat"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "De URI die de Mapbladeraar zal laten zien"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "Primaire E-mail"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "E-mail 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "E-mail 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "Selecteer een bestand"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Nieuw contact maken"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "Bewerk Adresboek"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "Bewerk Contactinformatie"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "Toevoegen aan contacten"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "E-mailadres:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "Zet queries uit"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Queries toestaan (Gevaarlijk!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "De adresboeknaam-selectie-interface van Evolution."
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr "Factory voor de naamselectie-interface van het Adresboek"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Verwijderen"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "Alle Verwijderen"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+msgid "Send HTML Mail?"
+msgstr "HTLM email versturen?"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Andere Contacten"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "Geaddresseerden"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "Selecteer namen"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "Selecteer naam van:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "Categorie:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Zoeken"
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "_Verjaardag:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "_Bedrijf"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "Bedrijfs_fax"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "C_ontacten..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 #: calendar/gui/dialogs/event-page.glade.h:2
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ca_tegorieКn..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Contacten Bewerken"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor.c:123
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Details"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Opslaan Als:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Algemeen"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Nieuw telefoontype"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "Aa_ntekeningen:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Organisatie:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Telefoontypes"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1431
-msgid "Primary Email"
-msgstr "Primaire E-mail"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "Bij voorkeur _HTML-berichten"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Homepage:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:94
-msgid "_Add"
-msgstr "_Toevoegen"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "_Adres..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "_Assistent:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "Ge_boortedatum:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Werk"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Bedrijf:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "C_ontacten..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:911 mail/mail-config.glade.h:95
-#: ui/evolution-mail.xml.h:110 ui/evolution-tasks.xml.h:9
-#: ui/evolution.xml.h:47
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Verwijderen"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "Af_deling:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "_Volledige Naam..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "PrivИ"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "_Functie:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "_Manager:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_Mobiele Telefoon"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "_Bijnaam:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "Kant_oor:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_Beroep:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "_Echtgeno(o)t(e):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "Dit is een email-adres"
 
-#: addressbook/contact-editor/e-contact-editor.c:657
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Contact verwijderen?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "Dit contact behoort tot deze categoriКen:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1389
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/contact-editor/e-contact-editor.c:1390
-#: addressbook/contact-editor/e-contact-editor.c:1457
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Zakelijk"
 
-#: addressbook/contact-editor/e-contact-editor.c:1391
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Bedrijf 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1392
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Bedrijfsfax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1393
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Terugbel"
 
-#: addressbook/contact-editor/e-contact-editor.c:1394
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/contact-editor/e-contact-editor.c:1395
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Bedrijf"
 
-#: addressbook/contact-editor/e-contact-editor.c:1396
-#: addressbook/contact-editor/e-contact-editor.c:1458
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Thuis"
 
-#: addressbook/contact-editor/e-contact-editor.c:1397
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Thuis 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1398
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Fax Thuis"
 
-#: addressbook/contact-editor/e-contact-editor.c:1399
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN Nummer"
 
-#: addressbook/contact-editor/e-contact-editor.c:1400
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Mobiele Telefoon"
 
-#: addressbook/contact-editor/e-contact-editor.c:1401
-#: addressbook/contact-editor/e-contact-editor.c:1459
-#: mail/mail-config.glade.h:55
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Overige"
 
-#: addressbook/contact-editor/e-contact-editor.c:1402
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Andere Fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1403
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Pieper"
 
-#: addressbook/contact-editor/e-contact-editor.c:1404
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Eerste"
 
-#: addressbook/contact-editor/e-contact-editor.c:1405
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1406
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1407
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1432
-#: addressbook/gui/widgets/e-addressbook-view.c:724
-msgid "Email 2"
-msgstr "E-mail 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1433
-#: addressbook/gui/widgets/e-addressbook-view.c:725
-msgid "Email 3"
-msgstr "E-mail 3"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Contact verwijderen?"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:260
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Contact snel toevoegen"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "Volledig bewerken"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:699
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Volledige Naam:"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:294
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adres _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Canada"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Controleer Adres"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "_Land:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Finland"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "Verenigde Staten"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Adres:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_Plaats:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "_Postbus:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "_Staat/Provincie:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "_Postcode:"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Controleer Volledige Naam"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Dhr."
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "Mjfr."
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Dhr."
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Mevr."
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Mevr."
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "Dhr."
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Voornaam:"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_Achternaam:"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Tweede Naa_m:"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "Achtervoeg_sel:"
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Titel:"
 
-#: addressbook/gui/component/addressbook.c:341
-#, c-format
-msgid "Enter password for %s"
-msgstr "Voer het wachtwoord voor %s in"
-
-#: addressbook/gui/component/addressbook.c:369
-msgid "Unable to open addressbook"
-msgstr "Kan het adresboek niet openen"
-
-#: addressbook/gui/component/addressbook.c:376
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or the LDAP server\n"
-"is down"
-msgstr ""
-"Kan het adresboek niet openen.  Dit kan komen doordat\n"
-"u een ongeldige URI heeft opgegeven of de LDAPserver\n"
-"down is."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "Bestandsnaam:"
 
-#: addressbook/gui/component/addressbook.c:381
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
-msgstr ""
-"Deze versie van Evolution heeft geen LDAP support\n"
-"u moet het mee compileren.  Als u LDAP wilt gebruiken in Evolution\n"
-"moet u het programma vanuit de CVS sources meecompileren\n"
-"nadat u OpenLDAP van de link hierbeneden heeft opgehaald.\n"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "December"
 
-#: addressbook/gui/component/addressbook.c:389
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
-"Kan het adressenboek niet openen.  Controleer of het pad bestaat\n"
-"en of u het mag benaderen."
-
-#: addressbook/gui/component/addressbook.c:549 calendar/gui/gnome-cal.c:214
-msgid "Any field contains"
-msgstr "Elk veld bevat"
-
-#: addressbook/gui/component/addressbook.c:550
-msgid "Name contains"
-msgstr "Naam bevat"
-
-#: addressbook/gui/component/addressbook.c:551
-msgid "Email contains"
-msgstr "E-mail bevat"
-
-#: addressbook/gui/component/addressbook.c:697
-msgid "The URI that the Folder Browser will display"
-msgstr "De URI die de Mapbladeraar zal laten zien"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "LDAP Server"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Bestand"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Onbekend adresboek type"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "Geen (anonieme modus)"
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:59
-msgid "Password"
-msgstr "Wachtwoord"
-
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "Onbekende aanmeldingstype"
-
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "Basis"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "Een"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "Subboom"
-
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr "Onbekend bereiktype"
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr "Bind DN:"
-
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr "FIXME Verbindings DN Help tekst hier"
-
-#: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:68
-msgid "Remember this password"
-msgstr "Onthoud dit wachtwoord"
-
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:39
-msgid "Host:"
-msgstr "Computernaam:"
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr "FIXME Computernaam help tekst hier."
-
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "Stam DN:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr "FIXME Stam DN help tekst hier."
-
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "Poort:"
-
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
-msgstr "FIXME Poort help tekst hier."
-
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
-msgstr "Zoekbereik:"
-
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
-msgstr "Aanmelding:"
-
-#: addressbook/gui/component/addressbook-config.c:501
-msgid "Advanced LDAP Options"
-msgstr "Geavanceerd LDAP opties"
-
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:60
-msgid "Path:"
-msgstr "Pad:"
-
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
-msgstr "FIXME Pad Help tekst hier"
-
-#: addressbook/gui/component/addressbook-config.c:528
-msgid "Create path if it doesn't exist."
-msgstr "Maak pad als het niet bestaat."
-
-#: addressbook/gui/component/addressbook-config.c:662
-msgid "Edit Addressbook"
-msgstr "Bewerk Adresboek"
 
-#: addressbook/gui/component/addressbook-config.c:664
-msgid "Add Addressbook"
-msgstr "Adresboek Toevoegen"
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
-"Selecteer het soort adresboek dat u hebt en voer de relevante informatie "
-"erover in."
-
-#: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:49
-msgid "Name:"
-msgstr "Naam:"
-
-#: addressbook/gui/component/addressbook-config.c:689
-msgid "FIXME Name help text here"
-msgstr "FIXME Naam help tekst hier"
-
-#: addressbook/gui/component/addressbook-config.c:691
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Description:"
-msgstr "Omschrijving:"
-
-#: addressbook/gui/component/addressbook-config.c:692
-msgid "FIXME Description help text here"
-msgstr "FIXME Beschrijving help tekst hier"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Adresboekbronnen"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:603
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-#: calendar/gui/dialogs/recurrence-page.glade.h:5 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:27
-#: mail/message-browser.c:211 ui/evolution-addressbook.xml.h:7
-#: ui/evolution-mail.xml.h:23 ui/evolution-tasks.xml.h:3
-msgid "Delete"
-msgstr "Verwijderen"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: filter/filter.glade.h:3 mail/mail-config.glade.h:33
-msgid "Edit"
-msgstr "Bewerken"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Naam"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
-msgstr "Andere Contacten"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "Zet queries uit"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "Queries toestaan (Gevaarlijk!)"
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:276
-msgid "Edit Contact Info"
-msgstr "Bewerk Contactinformatie"
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:342
-msgid "Add to Contacts"
-msgstr "Toevoegen aan contacten"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Een Bonobo control dat een adresboek weergeeft."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Een Bonobo control dat een adresboek weergeeft."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Een voorbeeld Bonobo control dat een adresboek weergeeft."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Control dat een Evolution minikaart adresboek weergeeft."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution Adresboek minikaartbekijker"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "Een component voor het afhandelen van contacten."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Fabriek voor het Adresboek Minikaart control"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Fabriek voor de naam selectie interface van het Adresboek"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
-msgstr "Fabriek voor de naam selectie interface van het Adresboek"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "Fabriek voor het Evolution adresboek component."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
-msgstr "Fabriek voor het voorbeeld Adresboekcontrol"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:156
-#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
 msgstr "Verwijderen"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:171
-msgid "Remove All"
-msgstr "Alle Verwijderen"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:195
-msgid "Send HTML Mail?"
-msgstr "HTLM email versturen?"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "De adresboeknaam-selectie-interface van Evolution."
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Factory voor de naamselectie-interface van het Adresboek"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Zoek..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Geaddresseerden"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Selecteer namen"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "Contacten Bewerken"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Selecteer naam van:"
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "Contacten Bewerken"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr ""
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Duplicate Contact Detected"
 msgstr ""
 
@@ -1100,26 +1184,27 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
-msgid "Change Anyway"
-msgstr ""
-
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 #, fuzzy
 msgid "Changed Contact:"
 msgstr "Andere Contacten"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+#, fuzzy
+msgid "_Change Anyway"
+msgstr "Andere Contacten"
+
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:242
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Zoeken"
 
@@ -1233,171 +1318,249 @@ msgstr "z"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-#: addressbook/gui/widgets/e-addressbook-view.c:538
-#: addressbook/gui/widgets/e-addressbook-view.c:598
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "Opslaan als VCard"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-#: addressbook/gui/widgets/e-addressbook-view.c:599
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr "Stuur contact naar ander..."
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-#: addressbook/gui/widgets/e-addressbook-view.c:600
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Send message to contact"
 msgstr "Stuur bericht aan contact..."
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-#: addressbook/gui/widgets/e-addressbook-view.c:601 mail/message-browser.c:208
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:71 ui/evolution-tasks.xml.h:6
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Afdrukken"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-#: addressbook/gui/widgets/e-addressbook-view.c:602
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr "Envelop Afdrukken..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:697
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Verwijderen"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "Fout bij laden %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "Bronnen"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Onbekende fout"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "Werk zonder netwerk"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "Operatie niet toegestaan"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "Bestand niet gevonden"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Operatie niet ondersteund"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "Geannuleerd"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "I/O fout"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "Fout bij laden %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Fout bij laden %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Fout bij laden %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr ""
+"Fout bij lezen gegevens:\n"
+"%s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr ""
+"Fout bij lezen gegevens:\n"
+"%s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* Klik hier om een contact toe te voegen *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:698
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr "Opslaan Als:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:700
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "Eerste Telefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr "Assistent Telefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "Bedrijfstelefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr "TerugbelTelefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "BedrijfsTelefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "Thuis Telefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Organisatie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "Bedrijfs Adres"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "Huis Adres"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "Mobiele Telefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "Autotelefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "Bedrijf Telefoon-2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "Thuis Telefoon-2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "Andere Telefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "Ander Adres"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Website"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "Afdeling:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:728
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Kantoor:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:729
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "Functie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Beroep"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Manager"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Bijnaam"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "Echtgenoot/Echtgenote"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Opmerkingen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr "Vrij/Bezet URL"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 #, fuzzy
 msgid "Done."
 msgstr "Klaar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
-#, fuzzy
-msgid "Error removing card"
-msgstr ""
-"Fout bij lezen gegevens:\n"
-"%s"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1111
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
 #, fuzzy
 msgid "Removing cards..."
 msgstr "verwijderen map %s"
 
-#: addressbook/gui/widgets/e-minicard.c:436
-#, fuzzy
-msgid "Error modifying card"
-msgstr "Fout bij laden %s"
-
 #: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Opslaan in het adresboek"
@@ -1445,7 +1608,8 @@ msgid "Dimensions:"
 msgstr "Afmetingen:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Lettertype..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1585,40 +1749,61 @@ msgid "Width:"
 msgstr "Breedte:"
 
 #: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "label26"
+#, fuzzy
+msgid "_Font..."
+msgstr "Lettertype..."
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Fout tijdens communiceren met kalenderserver"
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kon Kalendergegevens niet uit de pilot lezen"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kon actielijstgegevens niet uit de pilot lezen"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "Herinnering van uw afspraak op "
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Een voorbeeld Bonobo-control dat een kalender toont."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Sluimeren"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr "Evolution kalender-samenvatting-component"
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Ok"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolution kalender iTip/iMip bekijker"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr "Evolution component voor het afhandelen van de kalender."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr "Fabriek voor het Kalender Samenvattings component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr "Fabriek voor het Evolution kalender component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr "Fabriek voor het kalender iTip bekijk control"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr "Fabriek voor het voorbeeld Kalender control"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Fabriek voor het Evolution kalender component."
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1628,7 +1813,92 @@ msgstr "Alarmnotificatie-dienst"
 msgid "Factory for the alarm notification service"
 msgstr "Factory voor de Alarmnotificatie-dienst."
 
-#: calendar/gui/alarm-notify/notify-main.c:56
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "Herinnering aan uw afspraak op %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "Herinnering aan uw afspraak op %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "Herinnering aan uw afspraak op %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "Herinnering aan uw afspraak op %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "Herinnering aan uw afspraak op %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "Herinnering aan uw afspraak op %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "Herinnering aan uw afspraak op %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "Toon informatie over Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "Alarm op %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Sluiten"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "Sluimeren"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "Sluimertijd (minuten)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "Afspraak bewerken"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "Geen samenvatting beschikbaar."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "Herinnering van uw afspraak op "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "Sluimeren"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
 "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
@@ -1637,133 +1907,162 @@ msgstr ""
 "Het is %s.  De Unix tijd is %ld nu.  We dachten dat u het wel zou willen "
 "weten."
 
-#: calendar/gui/alarm-notify/notify-main.c:93 calendar/gui/main.c:52
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
 msgid "Could not initialize GNOME"
 msgstr "Kon GNOME niet initialiseren"
 
-#: calendar/gui/alarm-notify/notify-main.c:108
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Kon Bonobo niet initialiseren"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
 msgid "Could not create the alarm notify service factory"
 msgstr "CreКeren van de alarmnotificatie-dienst is mislukt:"
 
-#: calendar/gui/calendar-commands.c:274
-msgid "File not found"
-msgstr "Bestand niet gevonden"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A, %e %B, %Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:298
-msgid "Open calendar"
-msgstr "Open kalender"
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:340
-msgid "Save calendar"
-msgstr "Kalender opslaan"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "Kalenderweergave mislukt.  Controleer uw ORBit en OAF instellingen."
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
-#: calendar/gui/e-calendar-table.c:323
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "Openbaar"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
-#: calendar/gui/e-calendar-table.c:324
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "PrivИ"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
-#: calendar/gui/e-calendar-table.c:325
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Vertrouwelijk"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/dialogs/alarm-page.c:320
-#: calendar/gui/dialogs/alarm-page.c:356
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
 #: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:345 mail/message-list.c:620
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Hoog"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
-#: calendar/gui/calendar-model.c:1574
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:346 mail/message-list.c:619
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normaal"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:347 mail/message-list.c:618
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Laag"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
-#: calendar/gui/e-calendar-table.c:399
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Doorzichtig"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Ondoorzichtig"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
 #: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Niet Gestart"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
 #: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "In Uitvoer"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "Voltooid"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
 #: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:422 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Geannuleerd"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:267
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d-%m-%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:276
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d-%m-%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:802
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1774,24 +2073,28 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:882
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 "De classificering moet 'Openbaar', 'PrivИ', 'Vertrouwelijk', of 'Geen' zijn"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
-#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:322
-#: calendar/gui/e-calendar-table.c:397 mail/mail-account-gui.c:1005
-#: mail/mail-accounts.c:125 mail/mail-accounts.c:176
-#: mail/mail-config.glade.h:52 shell/e-shell-view.c:1394
-#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
-#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Geen"
 
-#: calendar/gui/calendar-model.c:970
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1801,187 +2104,263 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1010
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Het percentage mag niet kleiner zijn dan 0 en niet groter dan 100"
 
-#: calendar/gui/calendar-model.c:1051
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "De prioriteit moet 'Hoog', 'Normaal', 'Laag' of 'Ongedefinieerd' zijn"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1064
+#: calendar/gui/calendar-model.c:1181
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:348
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Ongedefinieerd"
 
-#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "De doorzichtigheid moet 'Doorzichtig', 'Ondoorzichtig' of 'Geen' zijn."
 
-#: calendar/gui/calendar-model.c:1576
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "Herhalend"
 
-#: calendar/gui/calendar-model.c:1578
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Toegewezen"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Nee"
 
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "Kaartweergave"
+
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "Werkweek"
+
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "Defineer Bekijkmogelijkheid"
+
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "Maand"
+
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "De URI die de kalender zal tonen"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarm op %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "Geluidsalarmen"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Herinnering aan uw afspraak op %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "Geaddresseerden"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
-msgstr "Geen samenvatting beschikbaar."
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "Weergave-instellingen"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-message-composer.xml.h:3
-#: ui/evolution-subscribe.xml.h:2 ui/evolution.xml.h:5
-msgid "Close"
-msgstr "Sluiten"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Afspraak bewerken"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Sluimertijd (minuten)"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "Berichten"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Speel een geluid af"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "Start een programma"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "dagen"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "Actualiseer elke "
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "uren"
 
-#: calendar/gui/dialogs/alarm-page.c:255
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "minuten"
+
+#: calendar/gui/dialogs/alarm-page.c:284
 #, fuzzy, c-format
 msgid "%d days"
 msgstr " %d dagen"
 
-#: calendar/gui/dialogs/alarm-page.c:257
+#: calendar/gui/dialogs/alarm-page.c:286
 #, fuzzy
 msgid "1 day"
 msgstr " 1 dag"
 
-#: calendar/gui/dialogs/alarm-page.c:260
+#: calendar/gui/dialogs/alarm-page.c:289
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr " %d weken"
 
-#: calendar/gui/dialogs/alarm-page.c:262
+#: calendar/gui/dialogs/alarm-page.c:291
 #, fuzzy
 msgid "1 week"
 msgstr " 1 week"
 
-#: calendar/gui/dialogs/alarm-page.c:265
+#: calendar/gui/dialogs/alarm-page.c:294
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr " %d uren"
 
-#: calendar/gui/dialogs/alarm-page.c:267
+#: calendar/gui/dialogs/alarm-page.c:296
 #, fuzzy
 msgid "1 hour"
 msgstr " 1 uur"
 
-#: calendar/gui/dialogs/alarm-page.c:270
+#: calendar/gui/dialogs/alarm-page.c:299
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr " %d minuten"
 
-#: calendar/gui/dialogs/alarm-page.c:272
+#: calendar/gui/dialogs/alarm-page.c:301
 #, fuzzy
 msgid "1 minute"
 msgstr " 1 minuut"
 
-#: calendar/gui/dialogs/alarm-page.c:275
+#: calendar/gui/dialogs/alarm-page.c:304
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " %d seconden"
 
-#: calendar/gui/dialogs/alarm-page.c:277
+#: calendar/gui/dialogs/alarm-page.c:306
 #, fuzzy
 msgid "1 second"
 msgstr " 1 seconde"
 
-#: calendar/gui/dialogs/alarm-page.c:302
-#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Speel een geluid af"
 
-#: calendar/gui/dialogs/alarm-page.c:306
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "Show a dialog"
-msgstr "Toon een dialoogvenster"
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "Laat volgende bericht zien"
 
-#: calendar/gui/dialogs/alarm-page.c:310
-#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
 msgstr "Verstuur een e-mail"
 
-#: calendar/gui/dialogs/alarm-page.c:314
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Start een programma"
 
-#: calendar/gui/dialogs/alarm-page.c:332
-msgid " before start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
 msgstr " voor het begin van een afspraak"
 
-#: calendar/gui/dialogs/alarm-page.c:335
-msgid " after start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
 msgstr " na het begin van een afspraak"
 
-#: calendar/gui/dialogs/alarm-page.c:345
-msgid " before end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
 msgstr " voor het eind van een afspraak"
 
-#: calendar/gui/dialogs/alarm-page.c:348
-msgid " after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
 msgstr " na het eind van een afspraak"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #: calendar/gui/dialogs/task-details-page.glade.h:1
 #, fuzzy
 msgid "Basics"
 msgstr "Basis"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 #: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
 #, fuzzy
 msgid "Date/Time:"
 msgstr "Datum & Tijd"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Reminders"
 msgstr "Herinneringen"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "Instellingen..."
-
-#: calendar/gui/dialogs/alarm-page.glade.h:11
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Samenvatting:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_Opties"
+
 #. Automatically generated. Do not edit.
 #: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
 msgid "after"
@@ -2004,15 +2383,11 @@ msgstr "einde van afspraak"
 msgid "hour(s)"
 msgstr "u(u)r(en)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
-msgid "label55"
-msgstr "label55"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:18 mail/mail-config.glade.h:97
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
 msgid "minute(s)"
 msgstr "minu(u)t(en)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:19
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr "begin van afspraak"
 
@@ -2045,29 +2420,29 @@ msgid "60 minutes"
 msgstr "60 minuten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Alarm stopt na"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Geluidsalarmen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "Piep als het alarm venster verschijnt."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "Kalender Instellingen"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Kleuren"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #, fuzzy
@@ -2075,7 +2450,8 @@ msgid "Compress weekends in month view"
 msgstr "Weekeinden comprimeren"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+#, fuzzy
+msgid "Date Navigator"
 msgstr "Datumnavigator instellingen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -2083,192 +2459,282 @@ msgid "Defaults"
 msgstr "Standaardinstellingen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Weergave-instellingen"
+#: mail/mail-config.glade.h:30
+msgid "Display"
+msgstr "Weergave"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:155
-msgid "Due Date"
-msgstr "Verloop Datum"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Maak sluimeren mogelijk voor"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Eind van dag:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Eerste dag van de week:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "Vrij"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:918
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Vrijdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Highlight"
-msgstr "Markeer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today"
-msgstr "Items die vandaag verlopen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Due Today:"
-msgstr "Items die vandaag verlopen:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due"
-msgstr "Items die nog niet zijn verlopen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Items Not Yet Due:"
-msgstr "Items die nog niet zijn verlopen:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "Maa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:914
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Maandag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items"
-msgstr "Verlopen items"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Overdue Items:"
-msgstr "Verlopen items:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: mail/mail-config.glade.h:61
-msgid "Pick a color"
-msgstr "Kies een kleur"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/e-calendar-table.c:158
-msgid "Priority"
-msgstr "Prioriteit"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#, fuzzy
+msgid "Overdue tasks"
+msgstr "Verlopen items"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Herinner me aan alle afspraken"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "Zat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:919
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Zaterdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show"
-msgstr "Weergeven"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #, fuzzy
 msgid "Show appointment end times in week and month views"
 msgstr "Toon afspraak-eindtijden"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Toon weeknummers"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "Begin van dag:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "Zon"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:920
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Zondag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "TaskPad"
-msgstr "TaakBlad"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "Taken"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "Items die vandaag verlopen"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "Don"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: calendar/gui/dialogs/recurrence-page.c:917
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Donderdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "Time"
 msgstr "Functie"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "Time Until Due"
-msgstr "Tijd Tot Verlooptijd"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "Tijddelingen:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Tijdsformaat:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "Time zone:"
 msgstr ""
 "\n"
 "Tijdzone: "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "Din"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/dialogs/recurrence-page.c:915
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Dinsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Visual Alarms"
-msgstr "Visuele Alarmen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "Woe"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: calendar/gui/dialogs/recurrence-page.c:916
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Woensdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-msgid "Work week"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
 msgstr "Werkweek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "minuten voordat ze plaatsvinden."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-#: mail/mail-config.glade.h:99
-msgid "seconds."
-msgstr "seconden."
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "Weet u zeker dat u deze account wilt verwijderen?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "Weet u zeker dat u de %d taken wilt verwijderen?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "Weet u zeker dat u dagboek entry `%s' wilt verwijderen?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "Voltooid"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "Voltooid"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#, fuzzy
+msgid "Due "
+msgstr "Verloop Datum"
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "Afspraak Bewerken"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "Afspraak - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "Taak - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Dagboekelement - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Geen samenvatting"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "Bestand overschrijven?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Er bestaat al een bestand met die naam.\n"
+"Overschrijven?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Opslaan Als..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
 
 #: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
@@ -2312,20 +2778,44 @@ msgstr "Weet u zeker dat u de %d taken wilt verwijderen?"
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Weet u zeker dat u %d dagboek ingangen wilt verwijderen?"
 
-#: calendar/gui/dialogs/event-editor.c:136
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Selecteer een bestand"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Secties:"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Tijdzone: "
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:154
 msgid "Appointment"
 msgstr "Afspraak"
 
-#: calendar/gui/dialogs/event-editor.c:141
+#: calendar/gui/dialogs/event-editor.c:159
 msgid "Reminder"
 msgstr "Herinnering"
 
-#: calendar/gui/dialogs/event-editor.c:146
+#: calendar/gui/dialogs/event-editor.c:164
 msgid "Recurrence"
 msgstr "Herhaling"
 
-#: calendar/gui/dialogs/event-editor.c:151
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
 #, fuzzy
 msgid "Meeting"
 msgstr "Afspraak annuleren"
@@ -2336,7 +2826,7 @@ msgstr "_Gebeurtenis die de gehele dag plaatsvindt"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:151
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Classificatie"
 
@@ -2365,11 +2855,6 @@ msgstr "Sa_menvatting:"
 msgid "_Confidential"
 msgstr "_Vertrouwelijk"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:20
-msgid "_Contacts..."
-msgstr "C_ontacten..."
-
 #: calendar/gui/dialogs/event-page.glade.h:10
 msgid "_End time:"
 msgstr "_Eindtijd:"
@@ -2378,38 +2863,271 @@ msgstr "_Eindtijd:"
 msgid "_Start time:"
 msgstr "_Begintijd:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Groep:"
+
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Papierbron:"
+
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr "Voorzitter"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr "Vereiste Deelnemer"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr "Optionele Deelnemer"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr "Niet-Deelnemer"
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Actie Toevoegen"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr " Accepteer "
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr " Weiger "
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Voorlopig"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Verwijderd"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "In Uitvoer"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Autotelefoon"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Vereiste Deelnemer"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Optionele Deelnemer"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Niet-Deelnemer"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "Verzonden"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "Verwijderen..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
+msgstr "Aanwezige"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
+msgstr "Voltooiingsdatum"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "Verwijderd"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "Verwijderd"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "Manager"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "December"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr "Rol"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Status"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Type"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Coordinator"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Coordinator"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "Nod_ig anderen uit..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Coordinator"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Deze afspraak bevat herhalingen die Evolution niet kan bewerken."
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr "op"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "dag"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr "op de"
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr "e"
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr "gebeurtenissen"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Custom recurrence"
 msgstr "Aangepaste herhaling"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Elke"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Exceptions"
 msgstr "Uitzonderingen"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "Modify"
-msgstr "Aanpassen"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "No recurrence"
 msgstr "Geen herhaling"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Preview"
 msgstr "Voorbeeld"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "Recurrence Rule"
 msgstr "Herhalingsregel"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "Simple recurrence"
 msgstr "Eenvoudige herhaling"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "Aanpassen"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "voor"
@@ -2419,67 +3137,62 @@ msgid "forever"
 msgstr "eeuwig"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:17
-msgid "label21"
-msgstr "label21"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
 msgid "month(s)"
 msgstr "maand(en)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
 msgid "until"
 msgstr "tot"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
 msgid "week(s)"
 msgstr "we(e)k(en)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
 msgid "year(s)"
 msgstr "ja(a)r(en)"
 
-#: calendar/gui/dialogs/recurrence-page.c:398 calendar/gui/print.c:1975
-#: calendar/gui/print.c:1977 calendar/gui/print.c:1978
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: calendar/gui/dialogs/recurrence-page.c:544
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Deze afspraak bevat herhalingen die Evolution niet kan bewerken."
-
-#: calendar/gui/dialogs/recurrence-page.c:887
-msgid "on"
-msgstr "op"
-
-#: calendar/gui/dialogs/recurrence-page.c:913 filter/filter-datespec.c:81
-msgid "day"
-msgstr "dag"
-
-#: calendar/gui/dialogs/recurrence-page.c:1043
-msgid "on the"
-msgstr "op de"
-
-#: calendar/gui/dialogs/recurrence-page.c:1051
-msgid "th"
-msgstr "e"
-
-#: calendar/gui/dialogs/recurrence-page.c:1215
-msgid "occurrences"
-msgstr "gebeurtenissen"
-
 #: calendar/gui/dialogs/save-comp.c:51
 msgid "Do you want to save changes?"
 msgstr "Wilt u de wijzingen opslaan?"
 
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "Date Completed:"
 msgstr "Voltooiingsdatum:"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "Verwijderd"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "Verwijderd"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "Geen"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:118
+#: calendar/gui/dialogs/task-editor.c:130
 msgid "Task"
 msgstr "_Taak"
 
@@ -2508,283 +3221,323 @@ msgstr "_Prioriteit:"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/e-calendar-table.c:150
-msgid "Categories"
-msgstr "CategorieКn"
-
-#: calendar/gui/e-calendar-table.c:152
-msgid "Completion Date"
-msgstr "Voltooiingsdatum"
-
-#: calendar/gui/e-calendar-table.c:153
-msgid "End Date"
-msgstr "Einddatum"
-
-#: calendar/gui/e-calendar-table.c:154
-msgid "Start Date"
-msgstr "Begindatum"
-
-#: calendar/gui/e-calendar-table.c:156
-msgid "Geographical Position"
-msgstr "Geografische Positie"
-
-#: calendar/gui/e-calendar-table.c:157
-msgid "Percent complete"
-msgstr "Percentage voltooid"
-
-#: calendar/gui/e-calendar-table.c:159
-msgid "Summary"
-msgstr "Samenvatting"
-
-#: calendar/gui/e-calendar-table.c:160
-msgid "Transparency"
-msgstr "Transparantie"
-
-#: calendar/gui/e-calendar-table.c:161
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:162
-msgid "Alarms"
-msgstr "Alarmen"
-
-#: calendar/gui/e-calendar-table.c:163
-msgid "Click here to add a task"
-msgstr "Klik hier om een taak toe te voegen"
-
-#: calendar/gui/e-calendar-table.c:367
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:368
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:370
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:371
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:372
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:373
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:737
-msgid "Edit this task"
-msgstr "Bewerk deze taak"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "_Openen"
+
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "K_nippen"
+
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_KopiКren"
+
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "_Plakken"
 
-#: calendar/gui/e-calendar-table.c:739
-msgid "Mark as complete"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
 msgstr "Markeer de taak als voltooid"
 
-#: calendar/gui/e-calendar-table.c:740
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Verwijder deze taak"
 
-#: calendar/gui/e-calendar-table.c:745
-msgid "Mark tasks as complete"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
 msgstr "Markeer de taak als voltooid"
 
-#: calendar/gui/e-calendar-table.c:746 ui/evolution-tasks.xml.h:4
-msgid "Delete selected tasks"
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Verwijder de geselecteerde taken"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:572 calendar/gui/e-week-view.c:306
-#: calendar/gui/print.c:782
-msgid "am"
-msgstr "am"
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "Klik hier om een taak toe te voegen"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:575 calendar/gui/e-week-view.c:309
-#: calendar/gui/print.c:784
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% Vo_ltooid:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Alarmen"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "CategorieКn"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "Voltooid"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "Voltooiingsdatum"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "Verloop Datum"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Einddatum"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "Geografische Positie"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Prioriteit"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Begindatum"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "Samenvatting"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "Taken"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "Transparantie"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minuten delingen"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1325
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1599
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1339
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1352
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:3179 calendar/gui/e-day-view.c:3208
-#: calendar/gui/e-week-view.c:3017 calendar/gui/e-week-view.c:3045
-#: ui/evolution-addressbook.xml.h:10
-msgid "Paste"
-msgstr "Plakken"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "am"
 
-#: calendar/gui/e-day-view.c:3184 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "pm"
+
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Nieuwe afspraak"
 
-#: calendar/gui/e-day-view.c:3186 calendar/gui/e-week-view.c:3024
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "Gebeurtenis die de gehele dag plaatsvindt"
 
-#: calendar/gui/e-day-view.c:3191 calendar/gui/e-week-view.c:3029
-msgid "Go to Today"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
 msgstr "Ga Naar Vandaag"
 
-#: calendar/gui/e-day-view.c:3193 calendar/gui/e-week-view.c:3031
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "Ga Naar Datum"
 
-#: calendar/gui/e-day-view.c:3200 calendar/gui/e-week-view.c:3037
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:12
-msgid "Open"
-msgstr "Openen"
-
-#: calendar/gui/e-day-view.c:3202 calendar/gui/e-week-view.c:3039
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Verwijder deze afspraak"
 
-#: calendar/gui/e-day-view.c:3204 calendar/gui/e-week-view.c:3041
-#: ui/evolution-addressbook.xml.h:5
-msgid "Cut"
-msgstr "Knippen"
-
-#: calendar/gui/e-day-view.c:3206 calendar/gui/e-week-view.c:3043
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail.xml.h:9
-msgid "Copy"
-msgstr "KopiКren"
-
-#: calendar/gui/e-day-view.c:3217 calendar/gui/e-week-view.c:3059
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Maak deze Gebeurtenis Verplaatsbaar"
 
-#: calendar/gui/e-day-view.c:3219 calendar/gui/e-week-view.c:3061
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "Verwijder deze Gebeurtenis"
 
-#: calendar/gui/e-day-view.c:3221
-msgid "Delete all Occurrences"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "Verwijder alle Gebeurtenissen"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minuten delingen"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:165
-msgid "I couldn't update your calendar file!\n"
-msgstr "Kon uw kalender bestand niet updaten!\n"
+#: calendar/gui/e-itip-control.c:697
+#, fuzzy
+msgid "This is a meeting request."
+msgstr "Dit is een email-adres"
 
-#: calendar/gui/e-itip-control.c:171 calendar/gui/e-itip-control.c:377
-msgid "Component successfully updated."
-msgstr "Component successvol geactualiseerd."
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:177
-msgid "There was an error loading the calendar file."
-msgstr "Er is een fout opgetreden tijdens het laden van het kalender bestand."
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:201
-msgid "I couldn't open your calendar file!\n"
-msgstr "Kon uw kalender bestand niet openen!\n"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:325 calendar/gui/e-itip-control.c:396
-msgid "I couldn't load your calendar file!\n"
-msgstr "Kon uw kalender bestand niet laden!\n"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:337
-msgid "I couldn't read your calendar file!\n"
-msgstr "Kon uw kalender bestand niet lezen!\n"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+#, fuzzy
+msgid "The message is not understandable."
+msgstr "Dit bericht is nu niet beschikbaar"
+
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:350
-msgid "This is a reply from someone who was uninvited!"
-msgstr "Dit is een antwoord van iemand die niet was uitgenodigd!"
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:366
-msgid "I couldn't update your calendar store."
-msgstr "Kon uw kalenderopslag niet actualiseren."
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:407
-msgid "I couldn't delete the calendar component!\n"
-msgstr "Ik kon het kalender component niet verwijderen!\n"
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:417
-msgid "Component successfully deleted."
-msgstr "Component successvol verwijderd."
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:566
-msgid "I don't recognize this type of calendar component."
-msgstr "Type kalendercomponent niet herkend."
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:640
-msgid "Add to Calendar"
-msgstr "Toevoegen aan Kalender"
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:674
-msgid " Accept "
-msgstr " Accepteer "
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:675
-msgid " Decline "
-msgstr " Weiger "
+#: calendar/gui/e-itip-control.c:834
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "De map lijkt onherstelbaar beschadigd te zijn."
 
-#: calendar/gui/e-itip-control.c:676
-msgid " Tentative "
-msgstr " Voorlopig"
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:720
-msgid "Update Calendar"
-msgstr "Kalender actualiseren"
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:741
-msgid "Cancel Meeting"
-msgstr "Afspraak annuleren"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr "Kon uw kalender bestand niet updaten!\n"
+
+#: calendar/gui/e-itip-control.c:1015
+#, fuzzy
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "Kon uw kalender bestand niet openen!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -2811,10 +3564,6 @@ msgstr "Bezig met laden Kalender"
 msgid "Loading calendar..."
 msgstr "Bezig met laden kalender..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Coordinator"
-
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Server Bericht:"
@@ -2827,98 +3576,48 @@ msgstr "einddatum"
 msgid "date-start"
 msgstr "begindatum"
 
-#: calendar/gui/e-tasks.c:185 calendar/gui/e-tasks.c:529
-#: calendar/gui/e-tasks.c:562
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "Allen"
 
-#: calendar/gui/e-tasks.c:191
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "Categorie:"
 
-#: calendar/gui/e-tasks.c:337
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kon de taken in `%s' niet laden"
 
-#: calendar/gui/e-tasks.c:349
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "De methode die nodig is om `%s' te laden wordt niet ondersteund"
 
-#: calendar/gui/e-week-view.c:3022 calendar/gui/e-week-view.c:3050
-msgid "New Appointment..."
-msgstr "Nieuwe Afspraak..."
-
-#: calendar/gui/e-week-view.c:3063
-msgid "Delete All Occurrences"
-msgstr "Verwijder alle Gebeurtenissen"
-
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1583
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/gnome-cal.c:215
-msgid "Summary contains"
-msgstr "Bondige inhoud bevat"
-
-#: calendar/gui/gnome-cal.c:216
-msgid "Description contains"
-msgstr "Omschrijving bevat:"
-
-#: calendar/gui/gnome-cal.c:217
-msgid "Comment contains"
-msgstr "Commentaar bevat"
-
-#: calendar/gui/gnome-cal.c:218
-msgid "Has category"
-msgstr "Heeft Categorie:"
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "Nieuwe Afspraak..."
 
-#: calendar/gui/gnome-cal.c:1020
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kon de map in `%s' niet openen"
 
-#: calendar/gui/gnome-cal.c:1031
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "De methode die nodig is om `%s' te openen word niet ondersteund"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Een voorbeeld Bonobo-control dat een kalender toont."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution kalender-samenvatting-component"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution kalender iTip/iMip bekijker"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "Evolution component voor het afhandelen van de kalender."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr "Fabriek voor het Kalender Samenvattings component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "Fabriek voor het Evolution kalender component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr "Fabriek voor het kalender iTip bekijk control"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr "Fabriek voor het voorbeeld Kalender control"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -2940,235 +3639,257 @@ msgid "Go To Date"
 msgstr "Ga Naar Datum"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Ga Naar Vandaag"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Januari"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "Juli"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "Juni"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "Maart"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "Mei"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "November"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "Oktober"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/print.c:448
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Ga Naar Vandaag"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1e"
 
-#: calendar/gui/print.c:448
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2e"
 
-#: calendar/gui/print.c:448
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3e"
 
-#: calendar/gui/print.c:448
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4e"
 
-#: calendar/gui/print.c:448
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5e"
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6e"
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7e"
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8e"
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9e"
 
-#: calendar/gui/print.c:449
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10e"
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11e"
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12e"
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13e"
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14e"
 
-#: calendar/gui/print.c:450
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15e"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16e"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17e"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18e"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19e"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20e"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21e"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22e"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23e"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24ste"
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25e"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26e"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27e"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28e"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29e"
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30e"
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31e"
 
-#: calendar/gui/print.c:513
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Zo"
 
-#: calendar/gui/print.c:513
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Ma"
 
-#: calendar/gui/print.c:513
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Di"
 
-#: calendar/gui/print.c:513
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "Wo"
 
-#: calendar/gui/print.c:514
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Do"
 
-#: calendar/gui/print.c:514
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Vr"
 
-#: calendar/gui/print.c:514
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "Za"
 
-#: calendar/gui/print.c:1844 views/tasks/galview.xml.h:1
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Taken"
 
 #. Day
-#: calendar/gui/print.c:1951
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "Dag van vandaag (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1970 calendar/gui/print.c:1974
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1971
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1982
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Huidige week (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1990
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Huidige maand (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1997
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Huidig jaar (%Y)"
 
-#: calendar/gui/print.c:2212
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Druk Kalender af"
 
-#: calendar/gui/print.c:2299 mail/mail-callbacks.c:1543
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:24
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Afdrukvoorbeeld"
 
-#: calendar/gui/tasks-control.c:112
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Item afdrukken"
+
+#: calendar/gui/print.c:2398
+#, fuzzy
+msgid "Print Setup"
+msgstr "Printerinstellingen"
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "De URI van de te tonen takenmap"
 
@@ -3214,98 +3935,6 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "ZMDWDVZ"
 
-#: calendar/pcs/query.c:218
-msgid "time-now expects 0 arguments"
-msgstr "time-now verwacht 0 argumenten"
-
-#: calendar/pcs/query.c:242
-msgid "make-time expects 1 argument"
-msgstr "make-time verwacht 1 argument"
-
-#: calendar/pcs/query.c:247
-msgid "make-time expects argument 1 to be a string"
-msgstr "make-time verwacht dat argument 1 een string is"
-
-#: calendar/pcs/query.c:255
-msgid "make-time argument 1 must be an ISO 8601 date/time string"
-msgstr "make-time argument 1 moet een ISO-8601 date/time string zijn"
-
-#: calendar/pcs/query.c:281
-msgid "time-add-day expects 2 arguments"
-msgstr "time-add-day verwacht 2 argumenten"
-
-#: calendar/pcs/query.c:286
-msgid "time-add-day expects argument 1 to be a time_t"
-msgstr "time-add-day verwacht dat argument 1 een time_t is"
-
-#: calendar/pcs/query.c:293
-msgid "time-add-day expects argument 2 to be an integer"
-msgstr "time-add-day verwacht dat argument 2 een integer is"
-
-#: calendar/pcs/query.c:318
-msgid "time-day-begin expects 1 argument"
-msgstr "time-day-begin verwacht 1 argument"
-
-#: calendar/pcs/query.c:323
-msgid "time-day-begin expects argument 1 to be a time_t"
-msgstr "time-day-bewgin verwacht dat argument 1 een time_t is"
-
-#: calendar/pcs/query.c:348
-msgid "time-day-end expects 1 argument"
-msgstr "time-dat-end verwacht 1 argument"
-
-#: calendar/pcs/query.c:353
-msgid "time-day-end expects argument 1 to be a time_t"
-msgstr "time-dat-end verwacht dat argument 1 een time_t is"
-
-#: calendar/pcs/query.c:389
-msgid "get-vtype expects 0 arguments"
-msgstr "get-vtype verwacht geen argumenten"
-
-#: calendar/pcs/query.c:472
-msgid "occur-in-time-range? expects 2 arguments"
-msgstr "occur-in-time-range? verwacht 2 argumenten"
-
-#: calendar/pcs/query.c:477
-msgid "occur-in-time-range? expects argument 1 to be a time_t"
-msgstr "occur-in-time-range? verwacht dat argument 1 een time_t is"
-
-#: calendar/pcs/query.c:484
-msgid "occur-in-time-range? expects argument 2 to be a time_t"
-msgstr "occur-in-time-range? verwacht dat argument 2 een time_t is"
-
-#: calendar/pcs/query.c:611
-msgid "contains? expects 2 arguments"
-msgstr "Bevat? verwacht 2 argumenten"
-
-#: calendar/pcs/query.c:616
-msgid "contains? expects argument 1 to be a string"
-msgstr "contains? verwacht dat argument 1 een string is"
-
-#: calendar/pcs/query.c:623
-msgid "contains? expects argument 2 to be a string"
-msgstr "contains? verwacht dat argument 2 een string is"
-
-#: calendar/pcs/query.c:640
-msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
-msgstr ""
-"contains? verwacht dat argument 1 een kleuze is uit "
-"\"any\",\"summary\",\"description\""
-
-#: calendar/pcs/query.c:678
-msgid "has-categories? expects at least 1 argument"
-msgstr "has-categories? verwacht op zijn minst 1 argument"
-
-#: calendar/pcs/query.c:684
-msgid "has-categories? expects all arguments to be strings"
-msgstr "has-categories? verwacht dat alle argumenten strings zijn"
-
-#: calendar/pcs/query.c:932
-msgid "Evaluation of the search expression did not yield a boolean value"
-msgstr "Evaluation of the search expression did not yield a boolean value"
-
 #: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "Ondertekening wordt niet ondersteund door deze sleutel"
@@ -3326,64 +3955,80 @@ msgstr "Het gespecificeerde type word niet ondersteund door deze steutel"
 msgid "Decryption is not supported by this cipher"
 msgstr "Het gespecificeerde type word niet ondersteund door deze sleutel"
 
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
 #: camel/camel-disco-store.c:305
 msgid "You must be working online to complete this operation"
 msgstr "U moet online werken om deze bewerking te voltooien"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "Bezig met synchroniseren map"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr "Kan de spoolmap niet openen"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr "Kan de spoolmap niet verwerken"
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "Ophalen bericht %d(%d%%)"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:680
-#, c-format
-msgid "Failed message %d"
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, fuzzy, c-format
+msgid "Failed on message %d"
 msgstr "Faalde bij bericht %d"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "Kan bericht niet opnemen"
 
-#: camel/camel-filter-driver.c:691 camel/camel-filter-driver.c:801
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "Bezig met synchroniseren map"
 
-#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:806
-msgid "Complete"
-msgstr "Voltooid"
-
-#: camel/camel-filter-driver.c:761
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Bezig met ophalen bericht %d van %d"
 
-#: camel/camel-filter-driver.c:766 camel/camel-filter-driver.c:784
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Faalde op bericht %d van %d"
 
-#: camel/camel-filter-driver.c:883
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fout bij interpreten bestand: %s: %s"
 
-#: camel/camel-filter-driver.c:888
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fout bij uitvoeren filter: %s: %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fout bij uitvoeren filterzoekactie: %s: %s"
@@ -3419,6 +4064,26 @@ msgstr "Bezig met uitvoeren van zoekopdracht op onbekende kop: %s"
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Ongeldig type in bericht-bevat, verwacht een tekenreeks"
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Kon de pijp niet maken: %s"
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Kan map niet verkrijgen: %s: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "Kon niet starten: %s"
+
 #. well, this is really only a programatic error
 #: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
@@ -3442,108 +4107,108 @@ msgstr "Verkrijgen van vergrendeling met fcntl(2) mislukt: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Verkrijgen van vergrendeling met flock(2) mislukt: %s"
 
-#: camel/camel-movemail.c:104
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Kon postbusbestand %s niet controleren: %s"
 
-#: camel/camel-movemail.c:118
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Kon postbusbestand %s niet openen: %s"
 
-#: camel/camel-movemail.c:126
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Kon tijdelijk postbusbestand %s niet openen: %s"
 
-#: camel/camel-movemail.c:151
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Fout bij het lezen van postbusbestand: %s"
-
-#: camel/camel-movemail.c:162
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Fout bij opslaan van tijdelijk postbusbestand: %s"
-
-#: camel/camel-movemail.c:181
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Fout bij opslaan post in tijdelijk bestand %s: %s"
 
-#: camel/camel-movemail.c:211
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Kon de pijp niet maken: %s"
 
-#: camel/camel-movemail.c:223
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Kon niet starten: %s"
 
-#: camel/camel-movemail.c:261
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail programma mislukt: %s"
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Onbekende fout)"
 
-#: camel/camel-movemail.c:492
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Fout bij het lezen van postbusbestand: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Fout bij opslaan van tijdelijk postbusbestand: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Fout bij opslaan van tijdelijk postbusbestand: %s"
 
-#: camel/camel-pgp-context.c:190
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Voer uw %s passphrase voor %s in"
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Voer uw %s passphrase in."
 
-#: camel/camel-pgp-context.c:511
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr "geen plaintext om te signeren"
 
-#: camel/camel-pgp-context.c:518 camel/camel-pgp-context.c:690
-#: camel/camel-pgp-context.c:1057 camel/camel-pgp-context.c:1269
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Geen wachtwoord ingevoerd."
 
-#: camel/camel-pgp-context.c:524 camel/camel-pgp-context.c:696
-#: camel/camel-pgp-context.c:879 camel/camel-pgp-context.c:1064
-#: camel/camel-pgp-context.c:1276
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Kon de pijp naar GPG/PGP niet maken: %s"
 
-#: camel/camel-pgp-context.c:683
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr "geen plaintext voor clearsing"
 
-#: camel/camel-pgp-context.c:873
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr "geen plaintext om te controleren"
 
-#: camel/camel-pgp-context.c:890
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Kon tijdelijk bestand niet maken: %s"
 
-#: camel/camel-pgp-context.c:1047
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr "Geen plaintext om te encrypten"
 
-#: camel/camel-pgp-context.c:1073
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "Geen ontvangers gespecifieerd"
 
-#: camel/camel-pgp-context.c:1261
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr "geen ciphertext om te decoderen."
 
@@ -3577,7 +4242,7 @@ msgid "Connection cancelled"
 msgstr "Verbinding geannuleerd"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kon niet verbinden met %s (poort %d): %s"
@@ -3586,13 +4251,13 @@ msgstr "Kon niet verbinden met %s (poort %d): %s"
 msgid "(unknown host)"
 msgstr "(onbekende machine)"
 
-#: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
-#: camel/camel-remote-store.c:470
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "Operatie geannuleerd"
 
-#: camel/camel-remote-store.c:476
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "Server verbrak onverwacht de verbinding"
 
@@ -3703,7 +4368,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:442
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "Fout aanmeldingsantwoord van server."
 
@@ -3774,7 +4439,7 @@ msgstr "Voor het lezen van post als een zoekopdracht op een verzameling mappen"
 msgid "No provider available for protocol `%s'"
 msgstr "Geen aanbieder beschikbaar voor protocol `%s'"
 
-#: camel/camel-session.c:479
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3821,33 +4486,17 @@ msgstr "Faalde bij bericht %d"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:1020 mail/mail-ops.c:1027
-#: mail/mail-ops.c:1045 mail/mail-ops.c:1046
-msgid "Trash"
-msgstr "Prullenbak"
-
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
-"EMail: %s\n"
-"Gebruiksnaam: %s\n"
-"Organizatie Unit: %s\n"
-"Organizatie: %s\n"
-"Plaats: %s\n"
-"Staat: %s\n"
-"Land: %s"
+"Issuer: %s\n"
+"Onderwerp: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:428 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3862,26 +4511,36 @@ msgstr ""
 "\n"
 "Wil je het alsnog accepteren?"
 
-#: camel/camel-tcp-stream-openssl.c:423
+#: camel/camel-tcp-stream-ssl.c:348
 #, c-format
 msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
 msgstr ""
-"Issuer: %s\n"
-"Onderwerp: %s"
+"EMail: %s\n"
+"Gebruiksnaam: %s\n"
+"Organizatie Unit: %s\n"
+"Organizatie: %s\n"
+"Plaats: %s\n"
+"Staat: %s\n"
+"Land: %s"
 
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "kon URL %s niet verwerken"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Dergelijk bericht %s bestaat niet in %s"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "Een dergelijk bericht bestaat niet: %s"
@@ -3890,68 +4549,75 @@ msgstr "Een dergelijk bericht bestaat niet: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "U kunt geen berichten kopieeren vanuit deze vuilnisbak"
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Kon cache map %s niet openen"
-
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Onverwacht antwoord van IMAP-server: %s"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-commando mislukt: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Onbekende fout"
-
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "Het antwoord van de server eindigde te snel."
 
-#: camel/providers/imap/camel-imap-command.c:489
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Het antwoord van de IMAP-server bevatte geen %s informatie"
 
-#: camel/providers/imap/camel-imap-command.c:526
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "De IMAP-server gaf onverwacht een 'OK' antwoord: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:188
+#: camel/providers/imap/camel-imap-folder.c:192
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kon directory %s niet maken: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:207
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kon samenvatting voor %s niet laden"
 
-#: camel/providers/imap/camel-imap-folder.c:267
+#: camel/providers/imap/camel-imap-folder.c:275
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:415
-msgid "Scanning IMAP folder"
-msgstr "Bezig met scannen IMAP-map"
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "Bezig met het opslaan van berichten"
 
-#: camel/providers/imap/camel-imap-folder.c:1437
-#: camel/providers/imap/camel-imap-folder.c:1673
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "Dit bericht is nu niet beschikbaar"
 
-#: camel/providers/imap/camel-imap-folder.c:1465
-#: camel/providers/imap/camel-imap-folder.c:1706
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Bezig met het opslaan van berichten"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "Kon bericht inhoud niet vinden in FETCH-antwoord."
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:16
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "Kon cache map %s niet openen"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "Controleren voor nieuwe email"
 
@@ -3959,7 +4625,7 @@ msgstr "Controleren voor nieuwe email"
 msgid "Check for new messages in all folders"
 msgstr "Controleer op nieuwe mail in alle mappen"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:599
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Mappen"
 
@@ -3993,28 +4659,28 @@ msgstr ""
 "Deze optie zal bij het verbinden met de IMAP-server het wachtwoord versturen "
 "als platte tekst."
 
-#: camel/providers/imap/camel-imap-store.c:465
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-server %s ondersteunt het gevraagde aanmeldingstype %s niet"
 
-#: camel/providers/imap/camel-imap-store.c:475
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Geen ondersteuning voor aanmeldingstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:499
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVoer het IMAP-wachtwoord voor %s@%s in"
 
-#: camel/providers/imap/camel-imap-store.c:514
-#: camel/providers/smtp/camel-smtp-transport.c:410
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "U heeft geen wachtwoord ingevoerd"
 
-#: camel/providers/imap/camel-imap-store.c:540
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4025,11 +4691,15 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:829 mail/mail-local.c:333
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
 msgid "No such folder %s"
 msgstr "Map `%s' bestaat niet."
 
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
+
 #: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "MH-formaat postbussen"
@@ -4065,6 +4735,7 @@ msgid "For storing local mail in standard Unix spool directories"
 msgstr "Voor het opslaan van lokale post in qmail-maildir-postbussen"
 
 #: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Opslaglocatie %s is geen absoluut pad"
@@ -4104,7 +4775,8 @@ msgstr "Kon samenvattingsbestand van map `%s' niet verwijderen: %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kon indexbestand van map `%s' niet verwijderen: %s"
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kan geen bericht toevoegen aan de korte inhoud: onbekende reden"
 
@@ -4120,6 +4792,7 @@ msgstr "Kan bericht niet toevoegen aan maildir-map: %s: %s"
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4131,6 +4804,7 @@ msgstr ""
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-mbox-folder.c:322
 #: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "Een dergelijk bericht bestaat niet"
 
@@ -4139,7 +4813,7 @@ msgstr "Een dergelijk bericht bestaat niet"
 msgid "Invalid message contents"
 msgstr "Ongeldige berichtinhoud"
 
-#: camel/providers/local/camel-maildir-store.c:101
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4149,14 +4823,14 @@ msgstr ""
 "Kon map `%s' niet openen:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Map `%s' bestaat niet."
 
-#: camel/providers/local/camel-maildir-store.c:112
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4166,23 +4840,23 @@ msgstr ""
 "Kon map `%s' niet maken:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:127
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' is geen maildir-directory."
 
-#: camel/providers/local/camel-maildir-store.c:156
-#: camel/providers/local/camel-maildir-store.c:193
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kon map `%s' niet verwijderen: %s"
 
-#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "geen maildir-directory"
 
-#: camel/providers/local/camel-maildir-store.c:267
+#: camel/providers/local/camel-maildir-store.c:276
 #, fuzzy, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
@@ -4196,11 +4870,13 @@ msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Kon maildir directory path niet openen: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kan map niet verkrijgen: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kon postbus niet openen: %s: %s\n"
@@ -4213,6 +4889,9 @@ msgstr "Kan bericht niet aan mbox-bestand toevoegen: %s: %s"
 #: camel/providers/local/camel-mbox-folder.c:338
 #: camel/providers/local/camel-mbox-folder.c:370
 #: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4222,10 +4901,12 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "De map lijkt onherstelbaar beschadigd te zijn."
 
 #: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Opbouwen bericht mislukt: Beschadigde mailbox?"
 
@@ -4271,36 +4952,45 @@ msgstr "Map `%s' is niet leeg. Niet verwijderd."
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
 #: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "Bezig met samenvatten map"
 
 #: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "Kon map %s niet openen: er zal worden samengevat vanaf positie %ld: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fatale e-mail-interpreatiefout op positie %ld in map %s"
 
 #: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Kon map niet samenvatten: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1601
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Bezig met synchroniseren map"
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Kon map %s niet openen voor genereren van samenvatting: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kon tijdelijke postbus niet openen: %s"
@@ -4309,21 +4999,28 @@ msgstr "Kon tijdelijke postbus niet openen: %s"
 #: camel/providers/local/camel-mbox-summary.c:557
 #: camel/providers/local/camel-mbox-summary.c:746
 #: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Samenvatting en map niet gelijk, zelfs na synchronisatie"
 
 #: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fout bij het schrijven naar tijdelijke postbus: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Fout bij het schrijven naar tijdelijk postbus %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:635
 #: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kon de bronmap %s niet sluiten: %s"
@@ -4338,7 +5035,9 @@ msgstr "Kon de tijdelijke map niet sluiten: %s"
 msgid "Could not rename folder: %s"
 msgstr "Kon de naam van de map niet wijzigen: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Onbekende fout: %s"
@@ -4358,39 +5057,95 @@ msgstr "`%s' is geen directory."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Kon MH-postbus map niet openen: %s: %s"
 
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "Kan bericht niet aan mbox-bestand toevoegen: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "`%s' is geen normaal bestand."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "Map `%s' bestaat niet."
+
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy
+msgid "Spool stores do not have an inbox"
+msgstr "Lokale opslaglocaties hebben geen postbus-in"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Lokaal postbusbestand %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "Kon tijdelijk postbusbestand %s niet openen: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr ""
+"Kon map `%s' niet maken:\n"
+"%s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Voer het NNTP-wachtwoord voor %s@%s in"
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "De server weigerde de gebruikersnaam"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "Versturen van de gebruikersnaam naar de server mislukt"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "De server weigerde de gebruikernaam en/of het wachtwoord"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "Bericht %s kon niet worden gevonden."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "Kon groepenlijst niet van server ophalen."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Fout bij het laden van het groepenlijstbestand voor %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Fout bij het opslaan van het groepenlijstbestand voor %s: %s"
@@ -4405,25 +5160,25 @@ msgstr ""
 "Dit is een provider voor het lezen van en versturen naar USENET "
 "nieuwsgroepen."
 
-#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Kon directory voor nieuwsservers niet openen: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET-Nieuws via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 "Deze optie zal aanmelden bij de NNTP-server met een wachtwoord platte tekst."
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Het .newsrc-bestand kon niet geopend of gemaakt worden voor %s: %s"
@@ -4474,7 +5229,7 @@ msgstr "Laat de berichten op de server achter"
 msgid "Delete after %s day(s)"
 msgstr "Verwijder na %s dag(en)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:58
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4569,7 +5324,7 @@ msgid "No such folder `%s'."
 msgstr "Map `%s' bestaat niet."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4623,7 +5378,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Postaflevering via het sendmail programma"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:70
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4633,122 +5388,122 @@ msgstr ""
 "Voor het afleveren van post doormiddel van het verbinden met een mailhub op "
 "afstand, gebruik makend van SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:168
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "Syntactische fout, commando niet herkend"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntactische fout in parameters of argumenten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Commando niet geОmplementeerd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "Commando-parameter niet geОmplementeerd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr "Systeem-status, of systeem-help-antwoord"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "Helpbericht"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Dienst is gereed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr "Dienst heeft transmissiekanaal gesloten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr "Dienst niet beschikbaar, transmissiekanaal gesloten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr "Postopdracht geslaagd, voltooid"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr "Gebruiker niet lokaal; zal doorsturen naar <doorstuur-pad>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Postopdracht niet uitgevoerd: postbus niet beschikbaar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Opdracht niet uitgevoerd: postbus niet beschikbaar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr "Verzochte actie afgebroken: fout tijdens verwerken"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr "Gebruiker niet lokaal; probeer <doorstuur-pad>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Opdracht niet uitgevoerd: onvoldoende ruimte op systeem"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Postopdracht afgebroken: gebruikt teveel ruimte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Opdracht niet uitgevoerd: postbusnaam niet toegestaan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Start postinvoer; eindig met <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "Transactie mislukt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr "Veranderen van wachtwoord is vereist"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "Aanmeldingsmechanisme te zwak"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Versleuteling vereist voor gewenst aanmeldingsmechanisme"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "Tijdelijke aanmeldingsfout"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "Aanmelding is vereist"
 
-#: camel/providers/smtp/camel-smtp-transport.c:313
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "'Welkom respons'-fout: %s: waarschijnlijk niet-fataal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:356
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "SMTP-server %s ondersteunt het gevraagde aanmeldingstype %s niet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:395
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sVoer het SMTP wachtwoord in voor %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:418
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4759,115 +5514,129 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:534
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Postaflevering via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr "Kan bericht niet versturen: afzender niet gedefiniКerd."
 
-#: camel/providers/smtp/camel-smtp-transport.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan berichten niet versturen: afzender niet geldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "Bezig met versturen bericht"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan bericht niet versturen: Geen ontvangers gespecificeerd."
 
-#: camel/providers/smtp/camel-smtp-transport.c:676
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, fuzzy
+msgid "SMTP Greeting"
+msgstr "Afspraak annuleren"
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Time-out tijdens HELO verzoek: %s: niet-fataal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:695
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "'HELO respons'- fout: %s: niet-fataal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr "Fout bij aanmaken van SASL aanmeldingsobject"
 
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#: camel/providers/smtp/camel-smtp-transport.c:755
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Aanmelding"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Time-out tijdens AUTH-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:782
 msgid "AUTH request failed."
 msgstr "AUTH verzoek faalde"
 
-#: camel/providers/smtp/camel-smtp-transport.c:809
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr "Fout aanmeldingsantwoord van server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:835
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Time-out tijdens 'MAIL FROM'-verzoek: %s: bericht niet verzonden"
 
-#: camel/providers/smtp/camel-smtp-transport.c:854
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Fout bij 'MAIL FROM'-respons: %s: bericht niet verzonden"
 
-#: camel/providers/smtp/camel-smtp-transport.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Time-out tijdens 'RCPT TO'-verzoek: %s: bericht niet verzonden"
 
-#: camel/providers/smtp/camel-smtp-transport.c:898
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Fout bij 'RCPT TO'-respons: %s: bericht niet verzonden"
 
-#: camel/providers/smtp/camel-smtp-transport.c:929
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Time-out tijdens DATA-verzoek: %s: bericht niet verstuurd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:948
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Fout bij DATA-respons: %s: bericht niet verstuurd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Time-out tijdens het versturen van DATA: bericht afgebroken: %s: bericht "
 "niet verstuurd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Fout bij DATA-respons: bericht afgebroken: %s: bericht niet verstuurd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Time-out tijdens RSET-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1043
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Fout bij RSET-respons: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Time-out tijdens QUIT-verzoek: %s: niet-fataal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Fout bij QUIT-respons: %s: niet-fataal"
@@ -4897,7 +5666,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:124
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "bijlage"
 
@@ -4926,33 +5695,108 @@ msgid "MIME type:"
 msgstr "MIME type:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer.c:633
-#, c-format
+#: composer/e-msg-composer-hdrs.c:328
+msgid "Click here for the address book"
+msgstr "Klik hier voor het adresboek"
+
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:359
+msgid "From:"
+msgstr "Van:"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:365
+msgid "Reply-To:"
+msgstr "Antwoordadres:"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:376
+msgid "Subject:"
+msgstr "Onderwerp:"
+
+#: composer/e-msg-composer-hdrs.c:390
+msgid "To:"
+msgstr "Aan:"
+
+#: composer/e-msg-composer-hdrs.c:391
+msgid "Enter the recipients of the message"
+msgstr "Geef de geadresseerden"
+
+#: composer/e-msg-composer-hdrs.c:394
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:395
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Geef de adressen die een kopie van het bericht moeten krijgen"
+
+#: composer/e-msg-composer-hdrs.c:398
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: composer/e-msg-composer-hdrs.c:399
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"Geef de adressen die een kopie van het bericht moeten krijgen zonder dat ze "
+"op de geadresseerden-lijst van het bericht verschijnen."
+
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Voeg een bestand toe als bijlage"
+
+#: composer/e-msg-composer.c:670
+#, fuzzy, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
 "%s"
 msgstr ""
-"Kon handtekeningsbestand %s niet openen:\n"
+"Kon bestand `%s' niet openen:\n"
 "%s"
 
-#: composer/e-msg-composer.c:806
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr "Fout bij openen bestand: %s"
+
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Opslaan als..."
 
-#: composer/e-msg-composer.c:817
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "Waarschuwing"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fout bij opslaan bestand: %s"
 
-#: composer/e-msg-composer.c:837
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fout bij openen bestand: %s"
 
-#: composer/e-msg-composer.c:909
+#: composer/e-msg-composer.c:997
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -4960,12 +5804,53 @@ msgstr ""
 "Kan de drafts map voor die account niet openen.\n"
 "Wilt u gebruik maken van de standaardmap?"
 
-#: composer/e-msg-composer.c:971 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:228
-msgid "Evolution"
-msgstr "Evolution"
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Fout bij opslaan bestand: %s"
+
+#: composer/e-msg-composer.c:1055
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "Kon bericht niet van POP server %s halen: %s"
+
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"Kon uitvoerbestand niet maken: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"Kon uitvoerbestand niet maken: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"Fout bij opslaan berichten in: %s:\n"
+" %s"
 
-#: composer/e-msg-composer.c:977
+#: composer/e-msg-composer.c:1173
+#, fuzzy
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+"Evolution heeft Pine mailbestanden gevonden.\n"
+"Wilt u deze importeren naar Evolution?"
+
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4975,102 +5860,31 @@ msgstr ""
 "\n"
 "Wilt u de wijzingen opslaan?"
 
-#: composer/e-msg-composer.c:1002
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Bestand openen"
 
-#: composer/e-msg-composer.c:1158
-msgid "That file does not exist."
-msgstr "Het bestand bestaat niet."
-
-#: composer/e-msg-composer.c:1168
-msgid "That is not a regular file."
-msgstr "Het is geen gewoon bestand."
-
-#: composer/e-msg-composer.c:1178
-msgid "That file exists but is not readable."
-msgstr "Het bestand bestaat maar is niet leesbaar."
-
-#: composer/e-msg-composer.c:1188
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Het bestand is toegankelijk maar open(2) mislukte."
-
-#: composer/e-msg-composer.c:1210
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"Het bestand is zeer groot (groter dan 100K).\n"
-"Weet u zeker dat u deze wilt invoegen?"
-
-#: composer/e-msg-composer.c:1231
-msgid "An error occurred while reading the file."
-msgstr "Een fout trad op tijdens het openen van het bestand."
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "Tekstbestand invoegen..."
 
-#: composer/e-msg-composer.c:1594 composer/e-msg-composer.c:1983
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Stel een nieuw bericht op"
 
-#: composer/e-msg-composer.c:2077
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr ""
 "Kon het dialoog venster voor het opstellen van een nieuw bericht niet "
 "aanmaken."
 
-#: composer/e-msg-composer-hdrs.c:324
-msgid "Click here for the address book"
-msgstr "Klik hier voor het adresboek"
-
-#.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:355
-msgid "From:"
-msgstr "Van:"
-
-#.
-#. * Reply-To:
-#.
-#: composer/e-msg-composer-hdrs.c:361
-msgid "Reply-To:"
-msgstr "Antwoordadres:"
-
-#.
-#. * Subject:
-#.
-#: composer/e-msg-composer-hdrs.c:372
-msgid "Subject:"
-msgstr "Onderwerp:"
-
-#: composer/e-msg-composer-hdrs.c:386
-msgid "To:"
-msgstr "Aan:"
-
-#: composer/e-msg-composer-hdrs.c:387
-msgid "Enter the recipients of the message"
-msgstr "Geef de geadresseerden"
-
-#: composer/e-msg-composer-hdrs.c:390
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:391
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Geef de adressen die een kopie van het bericht moeten krijgen"
-
-#: composer/e-msg-composer-hdrs.c:394
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:395
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Geef de adressen die een kopie van het bericht moeten krijgen zonder dat ze "
-"op de geadresseerden-lijst van het bericht verschijnen."
-
-#: composer/evolution-composer.c:369
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -5079,7 +5893,7 @@ msgstr ""
 "mislukt, want u heeft nog geen identiteitsgegevens geconfigureerd in het "
 "mail-component."
 
-#: composer/evolution-composer.c:384
+#: composer/evolution-composer.c:374
 msgid "Cannot initialize Evolution's composer."
 msgstr "Kan de berichtenopsteller van Evolution niet initialiseren."
 
@@ -5096,40 +5910,56 @@ msgid "calendar information"
 msgstr "kalenderinformatie"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:64 e-util/e-time-utils.c:106
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%d-%m-%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:77 e-util/e-time-utils.c:187
-#: e-util/e-time-utils.c:312
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:80 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:304
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:83 e-util/e-time-utils.c:194
-#: e-util/e-time-utils.c:309 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
-#: e-util/e-time-utils.c:301 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
 msgid "%H:%M"
 msgstr "%H:%M"
 
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d-%m-%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %d-%m-%Y"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
+
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:258
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -5137,77 +5967,65 @@ msgstr "%a %d-%m-%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:263
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d-%m-%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:272
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d-%m-%Y %I:%M:%S %p"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "jaar"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "jaren"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "maand"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "maanden"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "week"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "weken"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "dagen"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "uur"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "uren"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "minuut"
 
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "minuten"
-
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "seconde"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "seconden"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Oops. Je bent vergeten een datum te kiezen."
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Oops. U hebt een ongeldige datum gekozen."
 
-#: filter/filter-datespec.c:276
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -5217,7 +6035,7 @@ msgstr ""
 "de tijd die het is op het moment dat de filter gestart\n"
 "wordt, of een vfolder wordt geopend."
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5225,7 +6043,7 @@ msgstr ""
 "De datum van het bericht zal vergeleken worden met\n"
 "de tijd die u hier invoert."
 
-#: filter/filter-datespec.c:339
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5236,28 +6054,36 @@ msgstr ""
 "\"een week geleden\", bijvoorbeeld."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "de huidige tijd"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "Een tijd die u specificeert"
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "Een tijd relatief aan de huidige tijd"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Vergelijk tegen"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "nu"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<klik hier om een datum te selecteren>"
 
@@ -5282,8 +6108,8 @@ msgstr ""
 "Oops, u bent vergeten een map te kiezen.\n"
 "Ga terug en specificeer een geldige map om mail in af te leveren."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:690
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Selecteer Map"
 
@@ -5295,46 +6121,6 @@ msgstr "Voer een Map-URI in"
 msgid "<click here to select a folder>"
 msgstr "<klik hier om een map te selecteren>"
 
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Filters Bewerken"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "Bewerk VMappen"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Inkomend"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Uitgaand"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr "Virtuele Mappen"
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr "alleen specifieke mappen"
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr "VMap-bronnen"
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr "met alle actieve niet-lokale mappen"
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr "met alle lokale en actieve niet-lokale mappen"
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr "met alle lokale folders"
-
 #: filter/filter-input.c:193
 #, c-format
 msgid ""
@@ -5356,36 +6142,88 @@ msgstr "Regel naam: "
 msgid "Untitled"
 msgstr "Geen Titel"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "Als"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Acties uitvoeren"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "als aan alle criteria wordt voldaan"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "als aan een van de criteria wordt voldaan"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "Criteria toevoegen"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "inkomend"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "uitgaand"
 
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Toevoegen"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Bewerken"
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Filters Bewerken"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "Bewerk VMappen"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "Inkomend"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "Uitgaand"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr "Virtuele Mappen"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr "alleen specifieke mappen"
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "VMap-bronnen"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "met alle actieve niet-lokale mappen"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "met alle lokale en actieve niet-lokale mappen"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "met alle lokale folders"
+
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
+#, fuzzy
+msgid "Assign Color"
 msgstr "Geef Kleur"
 
 #: filter/libfilter-i18n.h:4
@@ -5461,89 +6299,91 @@ msgid "Expression"
 msgstr "Expressie"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "Doorsturen naar Adres"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "Belangrijk"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "is"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "is groter dan"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "is kleiner dan"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "is niet"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Mailinglijst"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Berichtinhoud"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Berichtkop"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Bericht werd ontvangen"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Bericht werd verzonden"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Verplaats naar Map"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr "op of na"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr "op of voor"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Gelezen"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Geadresseerden"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Overeenkomende Regex"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Beantwoord aan"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Score"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Afzender"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Stel Status in"
 
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Grootte"
+
 #: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "klinkt als"
@@ -5560,15 +6400,12 @@ msgstr "Specifieke kop"
 msgid "starts with"
 msgstr "begint met"
 
-#: filter/libfilter-i18n.h:49
-msgid "Status"
-msgstr "Status"
-
 #: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Stop met Verwerken"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:776
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Onderwerp"
 
@@ -5596,29 +6433,23 @@ msgstr "Regel bewerken"
 msgid "Score Rules"
 msgstr "Bewerk Scoreregel"
 
-#: importers/elm-importer.c:512 importers/evolution-gnomecard-importer.c:238
-#: importers/netscape-importer.c:780 importers/pine-importer.c:646
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
 #: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
-#: shell/importer/intelligent.c:190
+#: shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Importeer"
 
-#: importers/elm-importer.c:517 importers/netscape-importer.c:785
-#: importers/pine-importer.c:651
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
 msgid "Mail"
 msgstr "Post"
 
-#: importers/elm-importer.c:521
-msgid "Elm Aliases"
-msgstr "Elm-Aliassen"
-
-#: importers/elm-importer.c:528 importers/evolution-gnomecard-importer.c:250
-#: importers/netscape-importer.c:807 importers/pine-importer.c:668
-#: shell/importer/intelligent.c:195
-msgid "Don't ask me again"
-msgstr "Dit bericht niet meer weergeven."
-
-#: importers/elm-importer.c:561
+#: importers/elm-importer.c:498
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -5626,15 +6457,15 @@ msgstr ""
 "Evolution heeft Elm mailbestand gevonden\n"
 "Wilt u deze importeren naar Evolution?"
 
-#: importers/elm-importer.c:579
+#: importers/elm-importer.c:527
 msgid "Elm mail"
 msgstr "Elm-mail"
 
-#: importers/evolution-gnomecard-importer.c:243 importers/pine-importer.c:661
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
 msgid "Addressbook"
 msgstr "Adresboek"
 
-#: importers/evolution-gnomecard-importer.c:275
+#: importers/evolution-gnomecard-importer.c:253
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5642,19 +6473,11 @@ msgstr ""
 "Evolution heeft GnomeCard bestanden geovnden.\n"
 "Wilt u deze importeren naar Evolution?"
 
-#: importers/netscape-importer.c:790 importers/pine-importer.c:656
+#: importers/netscape-importer.c:824
 msgid "Settings"
 msgstr "Instellingen:"
 
-#: importers/netscape-importer.c:795 mail/mail-callbacks.c:1455
-msgid "Filters"
-msgstr "Filters"
-
-#: importers/netscape-importer.c:800
-msgid "Addressbooks"
-msgstr "Adresboeken"
-
-#: importers/netscape-importer.c:847
+#: importers/netscape-importer.c:849
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5662,7 +6485,7 @@ msgstr ""
 "Evolution heeft Netscape mailbestanden gevonden.\n"
 "Wilt u deze importeren naar Evolution?"
 
-#: importers/pine-importer.c:705
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -5670,183 +6493,209 @@ msgstr ""
 "Evolution heeft Pine mailbestanden gevonden.\n"
 "Wilt u deze importeren naar Evolution?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 msgid "Pine mail"
 msgstr "Pine mail"
 
-#: mail/component-factory.c:624
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "Evolution-component voor het afhandelen van post"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr "Evolution bericht-opsteller."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr "Evolution post-samenvattingscomponent."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr "Evolution postmap-weergavecomponent."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr "Evolution postmap-factorycomponent."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr "Fabriek voor de Evolution opsteller."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr "Fabriek voor het Evolution post component."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr "Fabriek voor het post-samenvattingscomponent."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+msgid "Mail configuration interface"
+msgstr "Mail configuratie interface"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "_Eigenschappen..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "De bestandseigenschappen wijzigen"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan het Evolution Mail-component niet initialiseren."
 
-#: mail/component-factory.c:750
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr "Kan opslag niet registreren met shell"
 
-#: mail/folder-browser.c:521
+#: mail/folder-browser-ui.c:254
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Eigenschappen voor \"%s\""
+
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr "Eigenschappen"
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Kon tijdelijke directory niet maken: %s"
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "Sla op als VMap"
 
-#: mail/folder-browser.c:847
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr "VMap op _Onderwerp"
 
-#: mail/folder-browser.c:850
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "VMap op Afze_nder"
 
-#: mail/folder-browser.c:853
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "VMap op _Geadresseerden"
 
-#: mail/folder-browser.c:856
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr "VFolder op Mailing_Lijst"
 
-#: mail/folder-browser.c:862
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "Filter op Onderwerp"
 
-#: mail/folder-browser.c:865
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "Filter op Afzen_der"
 
-#: mail/folder-browser.c:868
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "Filter op Geadresseerden"
 
-#: mail/folder-browser.c:871
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr " Filter op Mailinglijst"
 
-#: mail/folder-browser.c:880
-msgid "_Open"
-msgstr "_Openen"
-
-#: mail/folder-browser.c:882
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Laatste"
 
-#: mail/folder-browser.c:884 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:125 ui/evolution-tasks.xml.h:11
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "_Opslaan Als..."
 
-#: mail/folder-browser.c:886 ui/evolution-tasks.xml.h:10
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "_Afdrukken"
 
-#: mail/folder-browser.c:891 ui/evolution-mail.xml.h:124
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "Afzender beantwoorden"
 
-#: mail/folder-browser.c:893
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
 #, fuzzy
-msgid "_Reply to _List"
+msgid "Reply to _List"
 msgstr "Iedereen Be_antwoorden"
 
-#: mail/folder-browser.c:895 ui/evolution-mail.xml.h:78
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "Iedereen Be_antwoorden"
 
-#: mail/folder-browser.c:897
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "_Doorsturen"
 
-#: mail/folder-browser.c:900
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Markeer Als Gelezen"
 
-#: mail/folder-browser.c:902
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Markeer Als Ongelezen"
 
-#: mail/folder-browser.c:907
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "Belangrijk"
+
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Markeer Als Ongelezen"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "_Verplaatsen naar Map..."
 
-#: mail/folder-browser.c:909
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "_KopiКren naar Map..."
 
-#: mail/folder-browser.c:913 ui/evolution-mail.xml.h:128
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "_Herstellen"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:923
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Adresboek Toevoegen"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Filters Toepassen"
 
-#: mail/folder-browser.c:927
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "Creeer Regel Van Bericht"
 
-#: mail/folder-browser.c:1066
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "Filter op Mailinglijst"
 
-#: mail/folder-browser.c:1067
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "VFolder op Mailinglijst"
 
-#: mail/folder-browser.c:1069
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter op Mailinglijst (%s)"
 
-#: mail/folder-browser.c:1070
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VMap op Mailinglijst (%s)"
 
-#: mail/folder-browser-factory.c:211
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Eigenschappen voor \"%s\""
-
-#: mail/folder-browser-factory.c:213
-msgid "Properties"
-msgstr "Eigenschappen"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "Evolution-component voor het afhandelen van post"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Evolution bericht-opsteller."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Evolution post-samenvattingscomponent."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Evolution postmap-weergavecomponent."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Evolution postmap-factorycomponent."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Fabriek voor de Evolution opsteller."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Fabriek voor het Evolution post component."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "Fabriek voor het post-samenvattingscomponent."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Mail configuration interface"
-msgstr "Mail configuratie interface"
-
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr "Fabriek voor het importeren van mbox bestanden naar Evolution"
@@ -5898,37 +6747,69 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
 msgid "You have not filled in all of the required information."
 msgstr "U heeft niet alle informatie ingevuld die nodig is."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:154
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Evolution Accountbewerker"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Evolution Accountbewerker"
 
-#: mail/mail-accounts.c:126 mail/mail-accounts.c:177
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "Handtekeningbestand:"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Dit bericht is nog niet verstuurd.\n"
+"\n"
+"Wilt u de wijzingen opslaan?"
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr " (standaard)"
 
-#: mail/mail-accounts.c:209
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "Uitzetten."
 
-#: mail/mail-accounts.c:211 mail/mail-config.glade.h:35
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "Aanzetten"
 
-#: mail/mail-accounts.c:299 mail/mail-accounts.c:303
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "Weet u zeker dat u deze account wilt verwijderen?"
 
-#: mail/mail-accounts.c:463 mail/mail-accounts.c:467
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Verwijderen"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "Stel dit in als standaardaccount"
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr "Weet u zeker dat u dit nieuws-account wilt verwijderen?"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:650
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Evolution Accountbeheer"
 
@@ -5956,7 +6837,7 @@ msgstr "%s mailinglijst"
 msgid "Add Filter Rule"
 msgstr "Filterregel Toevoegen"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5968,7 +6849,7 @@ msgstr ""
 "of ontvangen.\n"
 "Wil u nu e-mail nu configureren?"
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5976,7 +6857,7 @@ msgstr ""
 "U dient een identiteit te configuren\n"
 "voordat u post kunt versturen."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5984,11 +6865,11 @@ msgstr ""
 "U moet een post-transport configureren\n"
 "voordat u e-mail kunt versturen."
 
-#: mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr "Er is geen post-transportmethode ingesteld"
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5996,38 +6877,46 @@ msgstr ""
 "Dit bericht heeft geen onderwerp.\n"
 "Weet u zeker dat u het wilt versturen?"
 
-#: mail/mail-callbacks.c:308
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 "De geadresseerde moeten worden gespecificeerd om dit bericht te versturen."
 
-#: mail/mail-callbacks.c:351
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr "U moet een account configureren voordat u deze e-mail kunt versturen."
 
-#: mail/mail-callbacks.c:605
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "Op %s, %s schreef:"
 
-#: mail/mail-callbacks.c:825
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Doorgestuurd bericht:\n"
 
-#: mail/mail-callbacks.c:919
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "Verplaats bericht(en) naar"
 
-#: mail/mail-callbacks.c:921
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Kopieer bericht(en) naar"
 
-#: mail/mail-callbacks.c:1087
+#: mail/mail-callbacks.c:1374
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Weet u zeker dat u alle %d berichten wilt bewerken?"
 
-#: mail/mail-callbacks.c:1109
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6035,7 +6924,7 @@ msgstr ""
 "U kunt alleen berichten bewerken die opgeslagen zijn\n"
 "in de Kladmap."
 
-#: mail/mail-callbacks.c:1143
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6043,36 +6932,24 @@ msgstr ""
 "U kunt alleen berichten bewerken die opgeslagen zijn\n"
 "in de Kladmap."
 
-#: mail/mail-callbacks.c:1155
+#: mail/mail-callbacks.c:1442
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Weet u zeker dat alle %d berichten wilt herversturen?"
 
-#: mail/mail-callbacks.c:1176
+#: mail/mail-callbacks.c:1463
 msgid "No Message Selected"
 msgstr "Geen bericht geselecteerd"
 
-#: mail/mail-callbacks.c:1210 mail/mail-display.c:94
-msgid "Overwrite file?"
-msgstr "Bestand overschrijven?"
-
-#: mail/mail-callbacks.c:1214 mail/mail-display.c:98
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Er bestaat al een bestand met die naam.\n"
-"Overschrijven?"
-
-#: mail/mail-callbacks.c:1258
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Bericht Opslaan Als..."
 
-#: mail/mail-callbacks.c:1260
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Berichten Opslaan Als..."
 
-#: mail/mail-callbacks.c:1445
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6081,24 +6958,24 @@ msgstr ""
 "Fout bij het laden van filterinformatie:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1503
+#: mail/mail-callbacks.c:1776
+msgid "Filters"
+msgstr "Filters"
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Bericht Afdrukken"
 
-#: mail/mail-callbacks.c:1550
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "Afdrukken van bericht mislukt"
 
-#: mail/mail-callbacks.c:1645
+#: mail/mail-callbacks.c:1966
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "Weet u zeker dat alle %d berichten in een appart scherm wilt weergeven?"
 
-#: mail/mail-config.c:1376 mail/mail-config.c:1379
-msgid "Connecting to server..."
-msgstr "Verbinden met server....."
-
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -6144,10 +7021,14 @@ msgstr ""
 "word alleengebruik als 'show' naam."
 
 #. set window title
-#: mail/mail-config-druid.c:445
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr "Evolution Accountwizard"
 
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
+msgstr "Verbinden met server....."
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr "Detecteer ondersteunde types..."
@@ -6157,58 +7038,63 @@ msgid " color"
 msgstr "Kleuren"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Ondertekening wordt niet ondersteund door deze sleutel"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Account"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Accountinformatie"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "Accountbeheer"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Accounts"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:11
 msgid "Always load images off the net"
 msgstr "Altijd plaatjes van buiten het netwerk laden"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Bijlage"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Aanmelding"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Aanmeldingstype:"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "Automatisch controleren op nieuwe post elke"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:18
 msgid "Composer"
 msgstr "Opstellen"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6224,221 +7110,279 @@ msgstr ""
 "\n"
 "Klik op \"Voltooien\" om uw instellingen op te slaan."
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "Standaard"
 
-#: mail/mail-config.glade.h:25
-msgid "Default \"Forward\" style is: "
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Default Forward style is: "
 msgstr "Standaard doorsturen stijl is:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Default character set: "
 msgstr "Standaard doorsturen stijl is:"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:29
-msgid "Display"
-msgstr "Weergave"
-
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Klaar"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Klad"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Klad map"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "Bewerken..."
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "E-mailadres:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "Aanzetten"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Volledige Naam:"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:41
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "Handtekeningbestand:"
+
+#: mail/mail-config.glade.h:43
 msgid "Highlight citations with"
 msgstr "Highligt citaten met"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Identiteit"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:47
 msgid "In HTML mail"
 msgstr "in HTML email"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:48
 msgid "Inline"
 msgstr "Ingebonden"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:50
 msgid "Load images if sender is in addressbook"
 msgstr "Plaatjes laden als de afzender in het adresboek voorkomt"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "Postconfiguratie"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Mailbox Formaat"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "Stel dit in als standaardaccount"
 
-#: mail/mail-config.glade.h:48
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "Markeer berichten als \"Gelezen\" na: "
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "LDAP Server"
+
+#: mail/mail-config.glade.h:59
 msgid "Never load images off the net"
 msgstr "Nooi plaatjes van het net afhalen"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "Nieuws"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "Optionele Informatie"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organisatie:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:65
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "Locatie van PGP:"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "Kies een kleur"
+
+#: mail/mail-config.glade.h:71
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Prompt when sending messages with an empty subject"
+msgstr "Creeer een regel om de berichten met dit onderwerp te filteren"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "Kan bericht niet versturen: Geen ontvangers gespecificeerd."
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr "Qmail-maildir"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:75
 msgid "Quoted"
 msgstr "Geciteerd"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "Berichten aan het ontvangen"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "Berichten aan het ontvangen"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "Ontvang opties"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "Vereisde informatie"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:83
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Security"
 msgstr "_Beveiliging"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "Selecteer lokatie PGP"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "Stuur post standaard in HTML-formaat."
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "Berichten aan het versturen"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "Bezig met versturen Post"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "Verzonden"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr "Verzonden en kladberichten"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "Verzonden berichtenmap"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Serverconfiguratie"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Servertype: "
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Server vereist aanmelding"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Handtekeningbestand:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "Bronnen"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Geen informatie"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Bronnen"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "Speciale Mappen"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr "Standaard Unix mailboxbestand"
 
-#: mail/mail-config.glade.h:88
-msgid "Type"
-msgstr "Type"
-
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "Deze server vereist een beveiligde verbinding (SSL)"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Gebruikersnaam:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6448,221 +7392,235 @@ msgstr ""
 "\n"
 "Klik op \"Volgende\" om te beginnen."
 
-#: mail/mail-config.glade.h:96 ui/evolution-message-composer.xml.h:47
-#: ui/evolution-subscribe.xml.h:10 ui/evolution.xml.h:48
-msgid "_Edit"
-msgstr "B_ewerken..."
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
+msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:113
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-crypto.c:59
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr "seconden."
+
+#: mail/mail-crypto.c:60
 msgid "Could not create a PGP signature context."
 msgstr "Kon geen PHP signature context maken"
 
-#: mail/mail-crypto.c:84
+#: mail/mail-crypto.c:86
 msgid "Could not create a PGP verification context."
 msgstr "Kon geen PGP verificatie context maken"
 
-#: mail/mail-crypto.c:113
+#: mail/mail-crypto.c:116
 msgid "Could not create a PGP encryption context."
 msgstr "Kon geen PGP encryptie context maken."
 
-#: mail/mail-crypto.c:138
+#: mail/mail-crypto.c:142
 msgid "Could not create a PGP decryption context."
 msgstr "Kon geen PGP decryptie context maken"
 
-#: mail/mail-crypto.c:173
+#: mail/mail-crypto.c:177
 msgid "Could not create a S/MIME signature context."
 msgstr "Kon geen S/MIME ondertekening context maken"
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:209
 #, fuzzy
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Kon geen S/MIME encryptie context maken"
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:240
 msgid "Could not create a S/MIME encryption context."
 msgstr "Kon geen S/MIME encryptie context maken"
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:271
 #, fuzzy
 msgid "Could not create a S/MIME envelope context."
 msgstr "Kon geen S/MIME encryptie context maken"
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:301
 #, fuzzy
 msgid "Could not create a S/MIME decode context."
 msgstr "Kon geen S/MIME decryptie context maken"
 
-#: mail/mail-display.c:198
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Bijlage Opslaan"
 
-#: mail/mail-display.c:238
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Kon tijdelijke directory niet maken: %s"
-
-#: mail/mail-display.c:299
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Opslaan op Schijf..."
 
-#: mail/mail-display.c:301
-#, c-format
-msgid "Open in %s..."
-msgstr "Openen in %s..."
-
-#: mail/mail-display.c:303
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "Geef Ingebonden Weer"
 
-#: mail/mail-display.c:338
-msgid "External Viewer"
-msgstr "Extern Weergave Programma"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "Openen in %s..."
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Geef Ingebonden Weer (via %s)"
 
-#: mail/mail-display.c:365
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Verbergen"
 
-#: mail/mail-display.c:990
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "Extern Weergave Programma"
+
+#: mail/mail-display.c:1048
 msgid "Loading message content"
 msgstr "Bezig met laden berichtinhoud"
 
-#: mail/mail-display.c:1283
-msgid "Open link in browser"
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
 msgstr "Open link in browser"
 
-#: mail/mail-display.c:1285
-msgid "Save as (FIXME)"
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "Kopieer locatie (FIXME)"
+
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
 msgstr "Sla op als (FIXME)"
 
-#: mail/mail-display.c:1287
-msgid "Copy location (FIXME)"
-msgstr "Kopieer locatie (FIXME)"
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "Opslaan als..."
+
+#: mail/mail-folder-cache.c:170
+#, fuzzy, c-format
+msgid "%d new"
+msgstr " %d minuten"
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr " %d seconden"
 
-#: mail/mail-format.c:532
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s bijlage"
 
-#: mail/mail-format.c:580
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kon MIME bericht niet verwerken. Laat zien als source"
 
-#: mail/mail-format.c:649
+#: mail/mail-format.c:746
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:765
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "E-mailadres:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Van"
 
-#: mail/mail-format.c:768
+#: mail/mail-format.c:867
 msgid "Reply-To"
 msgstr "Antwoordadres:"
 
-#: mail/mail-format.c:771
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Aan"
 
-#: mail/mail-format.c:774
+#: mail/mail-format.c:873
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:1096
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "Geen GPG/PGP programma geconfigureerd"
 
-#: mail/mail-format.c:1111
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "Versleutelde berichten worden niet weergegeven"
 
-#: mail/mail-format.c:1117
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Versleuteld bericht"
 
-#: mail/mail-format.c:1118
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Klik op het pictogram om te ontsleutelen."
 
-#: mail/mail-format.c:1174
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Dit bericht is digitaal ondertekend en is authentiek."
 
-#: mail/mail-format.c:1182
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Dit bericht is digitaal ondertekend, maar er kan niet worden aangetoond dat "
 "het authentiek is."
 
-#: mail/mail-format.c:1833
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Verwijzing naar FTP site (%s)"
 
-#: mail/mail-format.c:1845
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Verwijzing naar lokaal bestand (%s) geldig bij site \"%s\""
 
-#: mail/mail-format.c:1849
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Verwijzing naar lokaal bestand (%s)"
 
-#: mail/mail-format.c:1883
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Verwijzing naar FTP site (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Verwijzing naar onbekende externe gegevens (\"%s\" type)"
 
-#: mail/mail-format.c:1888
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr "Misvormd extern-berichtgedeelte"
 
-#: mail/mail-local.c:504
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "Bezig met openen '%s'"
 
-#: mail/mail-local.c:784
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Bezig met veranderen mapformaat van \"%s\" naar \"%s\""
 
-#: mail/mail-local.c:788
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Verander map van \"%s\" naar \"%s\" formaat"
-
-#: mail/mail-local.c:811
-msgid "Reconfiguring folder"
-msgstr "Map wordt geherconfigureerd"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:840
-msgid "Closing current folder"
-msgstr "Huidige map wordt gesloten"
-
-#: mail/mail-local.c:872
-msgid "Renaming old folder and opening"
-msgstr "Naam oude map wordt gewijzigd en map geopend"
-
-#: mail/mail-local.c:890
-msgid "Creating new folder"
-msgstr "Bezig met aanmaken van nieuwe map"
-
-#: mail/mail-local.c:904
-msgid "Copying messages"
-msgstr "Bezig met het kopiКren van berichten"
-
-#: mail/mail-local.c:921
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6671,7 +7629,7 @@ msgstr ""
 "Kan map-metainfo niet opslaan: deze map kan waarschijnlijk niet\n"
 "meer worden geopend: %s"
 
-#: mail/mail-local.c:960
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6679,12 +7637,17 @@ msgstr ""
 "Als deze map niet meer kan worden geopend, dan is\n"
 "het wellicht noodzakelijk om deze handmatig te repareren."
 
-#: mail/mail-local.c:1046
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "U kunt geen berichten kopieeren vanuit deze vuilnisbak"
+
+#: mail/mail-local.c:1011
 #, c-format
 msgid "Reconfigure %s"
 msgstr "Configureer %s"
 
-#: mail/mail-mt.c:190
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6693,7 +7656,7 @@ msgstr ""
 "Fout tijdens '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6702,120 +7665,104 @@ msgstr ""
 "Fout tijden het uitvoeren van bewerking:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:880
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Bezig"
 
-#: mail/mail-mt.c:862
-msgid "Evolution progress"
-msgstr "Evolution voortgang"
-
-#: mail/mail-ops.c:607
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Bezig met verzenden \"%s\""
 
-#: mail/mail-ops.c:611
-msgid "Sending message"
-msgstr "Bezig met versturen bericht"
-
-#: mail/mail-ops.c:726
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Bezig met verzenden bericht %d van %d"
 
-#: mail/mail-ops.c:745
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "faalde op bericht %d van %d"
 
-#: mail/mail-ops.c:747 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "Voltooid."
 
-#: mail/mail-ops.c:833
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Bezig met opslaan bericht in map"
 
-#: mail/mail-ops.c:908
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Bezig met verplaatsen van berichten naar %s"
 
-#: mail/mail-ops.c:908
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Bezig met het kopiКren van berichten naar %s"
 
-#: mail/mail-ops.c:925
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Bezig met verplaatsen"
 
-#: mail/mail-ops.c:928
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Bezig met kopiКren"
 
-#: mail/mail-ops.c:1005
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Bezig met scannen van mappen in \"%s\""
 
-#: mail/mail-ops.c:1167
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "Prullenbak"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "Doorgestuurde berichten"
 
-#: mail/mail-ops.c:1208 mail/mail-ops.c:1346
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "Bezig met openen map %s"
 
-#: mail/mail-ops.c:1275
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr "Bezig met openen van opslag %s"
 
-#: mail/mail-ops.c:1414
+#: mail/mail-ops.c:1436
 #, c-format
 msgid "Removing folder %s"
 msgstr "verwijderen map %s"
 
-#: mail/mail-ops.c:1498
-#, c-format
-msgid "Moving folder %s to %s"
-msgstr "Verplaatsen map %s naar %s"
-
-#: mail/mail-ops.c:1500
-#, c-format
-msgid "Copying folder %s to %s"
-msgstr "Kopieeren map %s naar %s"
-
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1568
 msgid "Refreshing folder"
 msgstr "Map wordt ververest"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "Bezig met legen map"
 
-#: mail/mail-ops.c:1738
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Bezig met ophalen bericht %s"
 
-#: mail/mail-ops.c:1805
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Bezig met ophalen berichten"
 
-#: mail/mail-ops.c:1815
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Bezig met ophalen bericht %d van %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1889
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Bezig met het opslaan van berichten"
 
-#: mail/mail-ops.c:1968
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6824,12 +7771,7 @@ msgstr ""
 "Kon uitvoerbestand niet maken: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1981
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Bezig met opslaan bericht %d van %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1995
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6838,11 +7780,11 @@ msgstr ""
 "Fout bij opslaan berichten in: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2069
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "Bezig met opslaan bijlage"
 
-#: mail/mail-ops.c:2084
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6851,12 +7793,12 @@ msgstr ""
 "Kan uitvoerbestand niet maken: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2112
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kon gegevens niet wegschrijven: %s"
 
-#: mail/mail-ops.c:2179
+#: mail/mail-ops.c:2101
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbreken van %s"
@@ -6865,214 +7807,174 @@ msgstr "Verbreken van %s"
 msgid "(Untitled Message)"
 msgstr "(Naamloos)"
 
-#: mail/mail-search.c:268
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Naamloos)"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "Bericht"
+
+#: mail/mail-search.c:284
 msgid "Find in Message"
 msgstr "Vind in bericht"
 
-#: mail/mail-search.c:298
+#: mail/mail-search.c:314
 msgid "Case Sensitive"
 msgstr "Hoofdlettergevoelig"
 
-#: mail/mail-search.c:299
+#: mail/mail-search.c:315
 msgid "Search Forward"
 msgstr "Zoek doorgestuurde"
 
-#: mail/mail-search.c:316
+#: mail/mail-search.c:332
 msgid "Find:"
 msgstr "Zoek:"
 
-#: mail/mail-search.c:319
+#: mail/mail-search.c:335
 msgid "Matches:"
 msgstr "Klopt:"
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "_Zoeken"
-
-#: mail/mail-send-recv.c:138
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "annuleren ..."
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "Versturen en ontvangen van berichten"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "Aan het ontvangen"
 
-#: mail/mail-send-recv.c:285
+#: mail/mail-send-recv.c:302
 msgid "Updating..."
 msgstr "Aan het Actualiseren ..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
 msgid "Waiting..."
 msgstr "Aan het Wachten ..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "Aan het Verzenden"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "Geannuleerd."
 
-#: mail/mail-tools.c:157
+#: mail/mail-session.c:171
+msgid "User canceled operation."
+msgstr "Gebruiker heeft operatie afgebroken."
+
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Kon tijdelijke mbox `%s' niet maken: %s"
 
-#: mail/mail-tools.c:205
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (doorgestuurd bericht)"
-
-#: mail/mail-tools.c:215
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (geen onderwerp)"
-
-#: mail/mail-tools.c:232
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Doorgestuurd bericht - %s"
 
-#: mail/mail-tools.c:234
-msgid "Forwarded message (no subject)"
-msgstr "Doorgestuurd bericht (geen onderwerp)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Doorgestuurde berichten"
 
-#: mail/mail-tools.c:447
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Doorgestuurd Bericht-----<br><b>Van:</b> %s<br><b>Aan:</b> "
-"%s<br><b>Onderwerp:</b> %s<br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Doorgestuurde berichten"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "VMappen"
 
-#: mail/mail-vfolder.c:438
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Nieuwe VMap"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:197 ui/evolution-mail.xml.h:76
-msgid "Reply"
-msgstr "Beantwoorden"
-
-#: mail/message-browser.c:197
-msgid "Reply to the sender of this message"
-msgstr "Beantwoord dit bericht"
-
-#: mail/message-browser.c:200 ui/evolution-mail.xml.h:77
-msgid "Reply to All"
-msgstr "Iedereen beantwoorden"
-
-#: mail/message-browser.c:200
-msgid "Reply to all recipients of this message"
-msgstr "Stuur antwoord naar alle geadresseerden van dit bericht"
-
-#: mail/message-browser.c:203 ui/evolution-mail.xml.h:39
-msgid "Forward"
-msgstr "Doorsturen"
-
-#: mail/message-browser.c:203
-msgid "Forward this message"
-msgstr "Dit bericht doorsturen"
-
-#: mail/message-browser.c:208
-msgid "Print the selected message"
-msgstr "Druk dit bericht af"
-
-#: mail/message-browser.c:211
-msgid "Delete this message"
-msgstr "Verwijder dit bericht"
-
-#: mail/message-browser.c:216 ui/evolution-mail.xml.h:70
-msgid "Previous"
-msgstr "Vorige"
-
-#: mail/message-browser.c:216
-msgid "Previous message"
-msgstr "Vorige bericht"
-
-#: mail/message-browser.c:219 ui/evolution-calendar.xml.h:18
-#: ui/evolution-mail.xml.h:63
-msgid "Next"
-msgstr "Volgende"
-
-#: mail/message-browser.c:219
-msgid "Next message"
-msgstr "Volgende bericht"
-
-#: mail/message-list.c:608
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "Ongelezen"
 
-#: mail/message-list.c:609
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "Gelezen"
 
-#: mail/message-list.c:610
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Beantwoord"
 
-#: mail/message-list.c:611
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "Meerdere Ongelezen Berichten"
 
-#: mail/message-list.c:612
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "Meerdere Berichten"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "Laagste"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "Laag"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "Hoog"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "Hoogste"
 
-#: mail/message-list.c:872
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:879
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "Vandaag %l:%M %p"
 
-#: mail/message-list.c:888
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "Gisteren %l:%M %p"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:910
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/mail-session.c:161
-msgid "User canceled operation."
-msgstr "Gebruiker heeft operatie afgebroken."
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Bezig met het opslaan van berichten"
+
+#: mail/message-list.etspec.h:2
+msgid "Flagged"
+msgstr "Gevlagd"
+
+#: mail/message-list.etspec.h:4
+msgid "Received"
+msgstr "Ontvangen"
+
+#: mail/message-list.etspec.h:7
+msgid "Size"
+msgstr "Grootte"
 
-#: mail/subscribe-dialog.c:76
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Map"
 
@@ -7100,15 +8002,1456 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Bezig met afmelden van map \"%s\""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "Beheer Postbusabonnementen..."
 
-#: shell/e-setup.c:124 shell/e-setup.c:197
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr "Evolution-component voor de samenvatting."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr "Fabriek voor het Evolution-samenvattingscomponent."
+
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Kan het Samenvattingscomponent van Evolution niet initializeren"
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+msgid "Appointments"
+msgstr "Afspraken"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "Toon afspraken"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%I:%M%p"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%a %l:%M %p"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Samenvatting"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "Evolution"
+
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
+msgstr "Er is een fout opgetreden tijdens het laden van het kalender bestand."
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Fout bij laden van kalender</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "Toon taken"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "Secties:"
+
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A, %e %B, %Y"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "Afdrukken van bericht mislukt"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): kon Bonobo niet initializeren"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "Wissen"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+#, fuzzy
+msgid "Invalid"
+msgstr "Ingebonden"
+
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "Variable"
+msgstr "Uitzetten."
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "Opmerkingen"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "Aa_ntekeningen:"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "Plakken"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "Bronnen"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "maand"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "Laagste"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Test"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "Laagste"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "Weergeven"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "Radio"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Drifting rain"
+msgstr "Omschrijving bevat:"
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "Opnieuw Zoeken"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "nu"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Moderate snow"
+msgstr "Actualiseer nu"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+#, fuzzy
+msgid "Drifting snow grains"
+msgstr "Omschrijving bevat:"
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "Post"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "Toon een dialoogvenster"
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "Primaire E-mail"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "Berichten aan het ontvangen"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Shallow small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Showers of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown precipitation"
+msgstr "Onbekende aanmeldingsstatus"
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Light precipitation"
+msgstr "Highligt citaten met"
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "Onbekende fout"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "Uitnodigingen voor de bijeenkomst"
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "Mjfr."
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "Staand"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Drifting mist"
+msgstr "Mailinglijst"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "Dit venster sluiten"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "Score"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "Toon taken"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "Dit venster sluiten"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "Versturen"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "Kop"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "dagen"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "Augustus"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Raging tornado"
+msgstr "Dingen te doen"
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Thunderous tornado"
+msgstr "Dingen te doen"
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "Beantwoord"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Selecteer Map"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "Alle Aanwezigen"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Geef mappen weer die beginnen met:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "Weergave-instellingen"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "Weergave"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "Vrijdag"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+#, fuzzy
+msgid "News Feed Settings"
+msgstr "Instellingen:"
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr " 1 dag"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "maand"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr " 1 week"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr ""
+"Plan\n"
+"Tijd"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Toon taken"
+
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "Koppen"
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "Toon taken"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "Taken"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
+msgstr ""
+"\n"
+"  Eenheid:  "
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Overige"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "Selectie wissen"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "April"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "De Evolution schil."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "Details"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "Afspraak annuleren"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Speciale Mappen"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Evolution-installatie"
 
-#: shell/e-setup.c:128
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -7116,29 +9459,25 @@ msgstr ""
 "Deze nieuwe versie van Evolution moet enkele extra bestanden installeren\n"
 "in uw persoonlijke Evolution-directory"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Klik op \"OK\" om de bestanden te installeren, of \"Annuleren\" om af te "
 "breken."
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "Kon bestanden niet correct actualiseren"
 
-#: shell/e-setup.c:172 shell/e-setup.c:240
-msgid "Evolution files successfully installed."
-msgstr "Evolution bestanden succesvol geОnstalleerd."
-
-#: shell/e-setup.c:201
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Het lijkt erop dat dit de eerste keer is dat u Evolution start."
 
-#: shell/e-setup.c:202
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "Klik op \"OK\" om de Evolution-bestanden te installeren in"
 
-#: shell/e-setup.c:221
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -7149,16 +9488,14 @@ msgstr ""
 "%s\n"
 "Fout: %s"
 
-#: shell/e-setup.c:236
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"Kan de bestanden niet kopiКren naar\n"
+"An error occurred in copying files into\n"
 "`%s'."
+msgstr "Een fout trad op tijdens het openen van het bestand."
 
-#: shell/e-setup.c:303
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7169,7 +9506,7 @@ msgstr ""
 "Verplaats het om de installatie van de Evolution\n"
 "bestanden af te maken."
 
-#: shell/e-setup.c:317
+#: shell/e-setup.c:322
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -7178,7 +9515,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:342
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7189,39 +9526,56 @@ msgstr ""
 "Verplaats het om de installatie van de Evolution\n"
 "bestanden af te maken."
 
-#: shell/e-shell.c:391
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Kan de lokale opslag niet opzetten -- %s"
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "Kan map niet verkrijgen: %s: %s"
 
-#: shell/e-shell.c:1256
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"Kan de bestanden niet kopiКren naar\n"
+"`%s'."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
 msgstr ""
-"Oops!  De weergave voor `%s' is onverwacht gestopt.  :-(\n"
-"Dit betekent waarschijnlijk dat het %s component is gecrasht"
 
-#: shell/e-shell-folder-commands.c:239
+#: shell/e-shell-folder-commands.c:270
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "specificeer een map om map \"%s\" naar te kopieeren:"
 
-#: shell/e-shell-folder-commands.c:244
+#: shell/e-shell-folder-commands.c:275
 msgid "Copy folder"
 msgstr "Kopieer naar Map"
 
-#: shell/e-shell-folder-commands.c:281
+#: shell/e-shell-folder-commands.c:313
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Specificeer een map om map \"%s\" naartoe te verplaatsen:"
 
-#: shell/e-shell-folder-commands.c:286
+#: shell/e-shell-folder-commands.c:318
 msgid "Move folder"
 msgstr "Verplaats naar Map"
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "Verwijder deze map"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "Weet u zeker dat u de taak `%s' wilt verwijderen?"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "verwijderen map %s"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -7230,15 +9584,15 @@ msgstr ""
 "Kan de gespecificeerde map niet aanmaken:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "De opgegeven mapnaam is niet geldig."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Nieuwe map maken"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -7246,11 +9600,11 @@ msgstr ""
 "Het type van de geselecteerde map is niet geldig\n"
 "voor de opdracht."
 
-#: shell/e-shell-folder-selection-dialog.c:328
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Nieuw..."
 
-#: shell/e-shell-folder-title-bar.c:468 shell/e-shell-folder-title-bar.c:469
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Naamloos)"
 
@@ -7359,51 +9713,19 @@ msgstr "Selecteer een doelmap voor deze belangrijke data"
 msgid "Closing connections..."
 msgstr "Verbindeingen ophangen...."
 
-#: shell/e-shell-view.c:167
-msgid "(No folder displayed)"
-msgstr "(Geen map weergegeven)"
-
-#. Special case for My Evolution
-#: shell/e-shell-view.c:1383
-#, fuzzy
-msgid "My Evolution"
-msgstr "Evolution"
-
-#: shell/e-shell-view.c:1400
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1402
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell-view.c:1440
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr "Evolution is nu online.  Klik op dit button om ofline te werken"
-
-#: shell/e-shell-view.c:1447
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution is in bezig offline te gaan."
-
-#: shell/e-shell-view.c:1453
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr "Evolution is nu offline. Klik op deze knop on online te werken."
-
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy kon niet worden gevonden in het $PATH."
 
-#: shell/e-shell-view-menu.c:185
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy kon niet worden gestart."
 
-#: shell/e-shell-view-menu.c:230
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:232
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -7413,35 +9735,89 @@ msgstr ""
 "programma's voor post, planning en contactbeheer\n"
 "in de GNOME werkomgeving."
 
-#: shell/e-shell-view-menu.c:465
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Ga naar map..."
 
-#: shell/e-shell-view-menu.c:466
+#: shell/e-shell-view-menu.c:438
 msgid "Select the folder that you want to open"
 msgstr "Selecteer de map die je wilt openen"
 
-#: shell/e-shell-view-menu.c:652
-msgid "Work online"
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Maakt een nieuwe snelkoppelingsgroep aan"
+
+#: shell/e-shell-view-menu.c:584
+#, fuzzy
+msgid "Select the folder you want the shortcut to point to:"
+msgstr "Selecteer de map die je wilt openen"
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
 msgstr "Werk met netwerk"
 
-#: shell/e-shell-view-menu.c:664 shell/e-shell-view-menu.c:676
-msgid "Work offline"
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
 msgstr "Werk zonder netwerk"
 
-#: shell/e-shortcuts.c:382
-msgid "Error saving shortcuts."
-msgstr "Fout bij opslaan van snelkoppelingen."
+#: shell/e-shell-view.c:175
+msgid "(No folder displayed)"
+msgstr "(Geen map weergegeven)"
+
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1411
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
+
+#: shell/e-shell-view.c:1413
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr "Evolution is nu online.  Klik op dit button om ofline te werken"
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution is in bezig offline te gaan."
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr "Evolution is nu offline. Klik op deze knop on online te werken."
+
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Kan de lokale opslag niet opzetten -- %s"
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shell.c:1311
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"Oops!  De weergave voor `%s' is onverwacht gestopt.  :-(\n"
+"Dit betekent waarschijnlijk dat het %s component is gecrasht"
+
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Nieuwe snelkoppelingsgroep aanmaken"
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Groep:"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -7450,110 +9826,204 @@ msgstr ""
 "Wil u echt de groep `%s' verwijderen\n"
 "van de snelkoppelingsbalk?"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "Niet verwijderen"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "Verwijder deze snelkoppelingsgroep"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "Verwijder deze snelkoppelingsgroep"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "_Kleine Pictogrammen"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Toont de snelkoppelingen als kleine pictogrammen"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "_Grote Pictogrammen"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Toont de snelkoppelingen als grote pictogrammen"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_Nieuwe Groep..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Maakt een nieuwe snelkoppelingsgroep aan"
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "Deze Groep _Verwijderen..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Verwijder deze snelkoppelingsgroep"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "Deze Groep _Verwijderen..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "Verwijder deze snelkoppelingsgroep"
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "_Verberg de Snelkoppelingsbalk"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Verberg de snelkoppelingenbalk"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "Activeren"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "Verwijder deze snelkoppelingsgroep"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "Verwijder deze snelkoppelingsgroep"
+
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Openen"
+
+#: shell/e-shortcuts-view.c:474
+#, fuzzy
+msgid "Open the folder linked to this shortcut"
+msgstr "Open deze map in een nieuw venster"
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr "Open in Nieuw Venster"
+
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Open het geselecteerde bericht in een nieuw venster"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "Hernoemen..."
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
-msgstr "Activeer deze snelkoppeling"
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "Verwijder deze snelkoppelingsgroep"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Verwijder deze snelkoppeling van de snelkoppelingenbalk"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:585
+msgid "Error saving shortcuts."
+msgstr "Fout bij opslaan van snelkoppelingen."
+
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "_Snelkoppelingsbalk"
+
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "C_ontacten...."
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Geen naam)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Geen fout"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Generieke fout"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "Een folder met die naam bestaat reeds"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "Het gespecificeerde foldertype is niet geldig"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "I/O fout"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "Niet genoeg ruimte vrij om de folder te maken"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "De opgegeven folder is niet gevonden"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "Functie niet geОmplementeerd voor deze opslag"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "Operatie niet toegestaan"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "Operatie niet ondersteund"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "Het gespecificeerde type word niet ondersteund door deze opslag"
 
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
+
+#: shell/e-task-widget.c:173
+#, fuzzy
+msgid "%s (%d%% complete)"
+msgstr "% Vo_ltooid:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "Verbindeingen ophangen...."
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "Computernaam:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Mapnaam:"
@@ -7566,10 +10036,6 @@ msgstr "Maptype:"
 msgid "Specify where to create the folder:"
 msgstr "Specificeer waar de map gemaakt moet worden:"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "De Evolution schil."
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -7594,31 +10060,35 @@ msgstr ""
 "Deze wizard helpt u bij het importeren\n"
 "van externe bestanden in Evolution."
 
-#: shell/importer/intelligent.c:187
+#: shell/importer/intelligent.c:191
 msgid "Importers"
 msgstr "Importeerders"
 
-#: shell/importer/intelligent.c:193
+#: shell/importer/intelligent.c:197
 #, fuzzy
 msgid "Don't import"
 msgstr "Niet verwijderen"
 
-#: shell/main.c:82
-#, no-c-format
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr "Dit bericht niet meer weergeven."
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
@@ -7642,7 +10112,7 @@ msgstr ""
 "We hopen dat u de vruchten van ons harde werk waardeert, en we wachten met\n"
 "smart op uw bijdragen!\n"
 
-#: shell/main.c:107
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7650,27 +10120,29 @@ msgstr ""
 "Bedankt\n"
 "Het Evolution-Team\n"
 
-#: shell/main.c:138
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "Kan de Evolution-schil niet initialiseren."
 
-#: shell/main.c:184
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "Sluit splash screen uit"
 
-#: shell/main.c:185
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr "Zend de debug uitvoor van alle componenten naar een bestand"
 
-#: shell/main.c:217
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan het Bonobo-componentensysteem niet initializeren"
 
-#: ui/evolution-addressbook.xml.h:1
-msgid "C_ut"
-msgstr "K_nippen"
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "KopiКren"
 
-#: ui/evolution-addressbook.xml.h:3
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
 msgstr "Kopieer de selectie"
 
@@ -7678,54 +10150,66 @@ msgstr "Kopieer de selectie"
 msgid "Create new contact"
 msgstr "Nieuw contact maken"
 
-#: ui/evolution-addressbook.xml.h:6
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "Nieuw contact maken"
+
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Knippen"
+
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
 msgid "Cut the selection"
 msgstr "Knip de selectie"
 
-#: ui/evolution-addressbook.xml.h:8
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Verwijder geselecteerde contacten"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Nieuw contact"
 
 #: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New list"
+msgstr "Nieuws"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Plakken"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Plak het klembord"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:69
-msgid "Previews the message to be printed"
-msgstr "Geeft een afdrukvoorbeeld van het bericht"
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
+msgstr "Geeft een afdrukvoorbeeld van de kalender"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:17
 msgid "Print selected contacts"
 msgstr "Druk geselecteerde contacten af"
 
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:18
 msgid "Select All"
 msgstr "Alles Selecteren"
 
-#: ui/evolution-addressbook.xml.h:17
-msgid "Select everything"
-msgstr "Selecteer alles"
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "Geef alle contacten weer"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Stoppen"
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Stop met Laden"
 
-#: ui/evolution-addressbook.xml.h:20
-msgid "View All"
-msgstr "Allen Weergeven"
-
-#: ui/evolution-addressbook.xml.h:21
-msgid "View all contacts"
-msgstr "Geef alle contacten weer"
-
 #: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "_Adresboekbronnen"
@@ -7735,177 +10219,222 @@ msgid "_Contact"
 msgstr "C_ontacten...."
 
 #: ui/evolution-addressbook.xml.h:24
-msgid "_Copy"
-msgstr "_KopiКren"
-
-#: ui/evolution-addressbook.xml.h:25
-msgid "_Paste"
-msgstr "_Plakken"
+#, fuzzy
+msgid "_Contact Group"
+msgstr "C_ontacten...."
 
-#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "_Afdrukken..."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "_Zoek naar contacten"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 msgid "_Select All"
 msgstr "Alles _Selecteren"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:44
-#: ui/evolution.xml.h:64
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_Gereedschap"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 Dagen"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Instellingen Wijzigen"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a new all day Event"
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "Creeer een nieuw 'hele dag' Event"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Maak een nieuwe afspraak"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Maak een nieuwe kalender"
+msgid "Create a new appointment"
+msgstr "Maak een nieuwe afspraak"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "Dag"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Ga naar"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Ga terug in de tijd"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Ga vooruit in de tijd"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "Ga Naar Datum"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
-msgstr "Ga Naar Vandaag"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Ga naar een specifieke datum"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Ga naar het heden"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "Maand"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr "Nieuwe Ka_lender"
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "Open Kalender"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "Vorige"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Nieuwe afspraak"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Geeft een afdrukvoorbeeld van de kalender"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Druk Kalender af"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Druk deze Kalender af"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:19
-msgid "Save As"
-msgstr "Opslaan Als"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "Vereisde informatie"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "Kalender bewaren als iets anders"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Toon 1 dag"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Toon 1 maand"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Toon 1 week"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Toon de werkweek"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
-msgid "Today"
-msgstr "Vandaag"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "Werkweek"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "Week"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "_Afspraak"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "Postinstellingen..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "Dag"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "Maand"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution.xml.h:58
-msgid "_New"
-msgstr "_Nieuw"
-
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "Open Ka_lender"
-
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "Week"
 
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Sluiten"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "Deze afspraak sluiten"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "Verwijder deze afspraak"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "Hoofdgereedschapsbalk"
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "Geeft een afdrukvoorbeeld van het bericht"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "Afdruk_voorbeeld"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "Printerinstellingen"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Item afdrukken"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "Afdrukken..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "Opslaan en Sluiten"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "Bewaar de afspraak en sluit dit venster"
+
+#: ui/evolution-comp-editor.xml.h:17
+#, fuzzy
+msgid "Save this item to disk"
+msgstr "Verander de weergave in %s"
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr "Stel de pagina instellingen in voor de huidige printer"
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "_Acties"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "_Bestand"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Verwijder dit item"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "Verwijderen..."
 
@@ -7917,24 +10446,12 @@ msgstr "Help"
 msgid "Print En_velope..."
 msgstr "En_velop Afdrukken..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-task-editor.xml.h:6
-msgid "Print this item"
-msgstr "Item afdrukken"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-task-editor.xml.h:7
-msgid "Print..."
-msgstr "Afdrukken..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-message-composer.xml.h:20
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Opslaan _Als..."
 
-#: ui/evolution-contact-editor.xml.h:9
-msgid "Save and Close"
-msgstr "Opslaan en Sluiten"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Bewaar dit contact en sluit het dialoogvenster"
@@ -7951,76 +10468,75 @@ msgstr "Zie help"
 msgid "Send _message to contact..."
 msgstr "Stuur _bericht aan contact..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:16
-#: ui/evolution-message-composer.xml.h:48 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor.xml.h:10 ui/evolution.xml.h:49
-msgid "_File"
-msgstr "_Bestand"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-message-composer.xml.h:55
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Opslaan"
 
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "Verwijder dit item"
+
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "Bewaar deze taak en sluit het dialoogvenster"
+
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "Stu_ur contact naar ander..."
+
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "Stuur _bericht aan contact..."
+
 #: ui/evolution-event-editor.xml.h:1
 #, fuzzy
 msgid "Cancel Mee_ting"
 msgstr "Afspraak annuleren"
 
-#: ui/evolution-event-editor.xml.h:2
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
 #, fuzzy
-msgid "Cancel then meeting for this item"
+msgid "Cancel the meeting for this item"
 msgstr "Verander de eigenschappen van deze map"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
 #, fuzzy
 msgid "Forward as i_Calendar"
 msgstr "Doorsturen als v_Calendar (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:2
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
 #, fuzzy
 msgid "Forward this item via email"
 msgstr "Dit bericht doorsturen"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
 msgid "Obtain the latest meeting information"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor.xml.h:3
-#, fuzzy
-msgid "Preview the printed item"
-msgstr "Geeft een afdrukvoorbeeld van het bericht"
-
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor.xml.h:4
-msgid "Print Pre_view"
-msgstr "Afdruk_voorbeeld"
-
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:5
-#, fuzzy
-msgid "Print S_etup"
-msgstr "Printerinstellingen"
-
-#: ui/evolution-event-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:6
 #, fuzzy
 msgid "Re_fresh Meeting"
 msgstr ""
 "Verzoek\n"
 "Bijeenkomst"
 
-#: ui/evolution-event-editor.xml.h:12
+#: ui/evolution-event-editor.xml.h:7
 msgid "Schedule _Meeting"
 msgstr "_Bijeenkomst Plannen"
 
-#: ui/evolution-event-editor.xml.h:13
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
 #, fuzzy
 msgid "Schedule a meeting for this item"
 msgstr "Bijeenkomst plannen"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor.xml.h:8
-msgid "Setup the page settings for your current printer"
-msgstr "Stel de pagina instellingen in voor de huidige printer"
-
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor.xml.h:9
-#: ui/evolution.xml.h:42
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Actions"
 msgstr "_Acties"
 
@@ -8029,486 +10545,607 @@ msgstr "_Acties"
 msgid "Customise My Evolution"
 msgstr "%s - Evolution %s"
 
-#: ui/evolution-mail.xml.h:1
-msgid "Apply filter rules to the selected messages"
-msgstr "Pas filter regels toe op geselecteerde berichten"
-
-#: ui/evolution-mail.xml.h:2
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ui/evolution-mail.xml.h:3
+#: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Stop de huidige email operatie"
 
-#: ui/evolution-mail.xml.h:4
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "Opstellen"
+
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Stel een nieuw bericht op"
+
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
+msgstr "Creeer of bewerk een emailaccount of andere voorkeuren"
+
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr "Creeer of bewerk regels om nieuwe berichten te filteren"
+
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr "Creeer of bewerk definities van virtuele mappen"
+
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr "Leeg Prullenbak"
+
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "Wachtwoorden _Vergeten"
+
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr "Vergeet de onthouden wachtwoorden zodat ze opnieuw gevraagd worden.."
+
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
+msgstr "Beheer Postbusabonnementen..."
+
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr "Open een venster om een emailbericht op te stellen"
+
+#: ui/evolution-mail-global.xml.h:13
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Verwijder alle verwijderde berichten permanent uit alle mappen"
+
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send / Receive"
+msgstr "Verstuur en Ontvang"
+
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "Post in de wachtrij versturen en nieuwe post ophalen"
+
+#: ui/evolution-mail-global.xml.h:16
+#, fuzzy
+msgid "Show message preview window"
+msgstr "Laat berichten in normale stijl zien"
+
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "Abboneer of zegt abbo op op de mappen op de server"
+
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
+msgstr "_Virtuele-Mapbewerker..."
+
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
+msgstr "_Filters..."
+
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr "_Bericht versturen"
+
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "Postinstellingen..."
+
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "Voorbeeld"
+
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
+msgstr "Verstuur en Ontvang"
+
+#: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Verander de eigenschappen van deze map"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose"
-msgstr "Opstellen"
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "Verberg geselecteerde"
+
+#: ui/evolution-mail-list.xml.h:5
+#, fuzzy
+msgid "Cut selected messages"
+msgstr "Druk dit bericht af"
+
+#: ui/evolution-mail-list.xml.h:6
+#, fuzzy
+msgid "Hide S_elected Messages"
+msgstr "Verberg geselecteerde"
+
+#: ui/evolution-mail-list.xml.h:7
+#, fuzzy
+msgid "Hide _Deleted Messages"
+msgstr "Verberg verwijderde"
+
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
+msgstr "Doorgestuurde berichten"
+
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
+"Verberg de weggegooide berichten in plaats van ze te laten zien met een "
+"streep erdoor"
+
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "Markeer Als Gelezen"
+
+#: ui/evolution-mail-list.xml.h:11
+msgid "Mark all visible messages as read"
+msgstr "Markeer alle zichtbare berichten als gelezen"
+
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "Plak het klembord"
+
+#: ui/evolution-mail-list.xml.h:14
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Verwijder alle verwijderde berichen permanent uit deze map"
+
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "_Alles Selecteren"
+
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "Selecteer _Gerelateerde Berichten"
+
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr "Selecteer alle en alleen de berichten die nu niet zijn geselecteerd"
+
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
+"Selecteer alle berichten in dezelfde thread als het geselecteerde bericht"
+
+#: ui/evolution-mail-list.xml.h:19
+msgid "Select all visible messages"
+msgstr "Selecteer alle zichtbare berichten"
+
+#: ui/evolution-mail-list.xml.h:20
+#, fuzzy
+msgid "Show _All"
+msgstr "Allen Weergeven"
+
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr "Laat berichten zien de tijdelijk zijn verborgen"
+
+#: ui/evolution-mail-list.xml.h:22
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Verberg tijdelijk alle berichten die al zijn gelezen"
+
+#: ui/evolution-mail-list.xml.h:23
+msgid "Temporarily hide the selected messages"
+msgstr "Verberg tijdelijk de geselecteerde berichten"
+
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "Berichtenlijst met Weergave van Relateerde Berichten"
+
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "_Wissen"
+
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Map"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "Selectie _Inverteren"
+
+#: ui/evolution-mail-list.xml.h:28
+msgid "_Properties..."
+msgstr "_Eigenschappen..."
+
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "Berichtenlijst met Weergave van Relateerde Berichten"
+
+#: ui/evolution-mail-message.xml.h:1
+msgid "Apply filter rules to the selected messages"
+msgstr "Pas filter regels toe op geselecteerde berichten"
 
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail-message.xml.h:2
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Stuur antwoord naar alle geadresseerden van dit bericht"
 
-#: ui/evolution-mail.xml.h:7
+#: ui/evolution-mail-message.xml.h:3
 #, fuzzy
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Beantwoord dit bericht"
 
-#: ui/evolution-mail.xml.h:8
+#: ui/evolution-mail-message.xml.h:4
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Beantwoord dit bericht"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail-message.xml.h:6
 msgid "Copy selected messages to another folder"
 msgstr "Kopieer het bericht naar een andere map"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail-message.xml.h:7
 msgid "Create _Virtual Folder From Message"
 msgstr "Maak VMap Van Bericht"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail-message.xml.h:8
 msgid "Create a rule to filter messages from this sender"
 msgstr "Creeer een regel om de berichten van deze afzender te filteren"
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail-message.xml.h:9
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Creeer een regel om de berichten van deze afzenders te filteren"
 
-#: ui/evolution-mail.xml.h:14
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Creeer een regel om de berichten naar deze emaillijst te filteren"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages with this subject"
 msgstr "Creeer een regel om de berichten met dit onderwerp te filteren"
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a virtual folder for these recipients"
 msgstr "Creeer een Virtueele map voor deze ontvangers"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a virtual folder for this mailing list"
 msgstr "Creer een virtueele map voor deze emaillijst"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a virtual folder for this sender"
 msgstr "Creeer een virtuele map voor deze afzender"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for this subject"
 msgstr "Creeer een virtuele map voor dit onderwerp"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Create or edit mail accounts and other preferences"
-msgstr "Creeer of bewerk een emailaccount of andere voorkeuren"
-
-#: ui/evolution-mail.xml.h:21
-msgid "Create or edit rules for filtering new mail"
-msgstr "Creeer of bewerk regels om nieuwe berichten te filteren"
-
-#: ui/evolution-mail.xml.h:22
-msgid "Create or edit virtual folder definitions"
-msgstr "Creeer of bewerk definities van virtuele mappen"
-
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail-message.xml.h:17
 msgid "Display the next important message"
 msgstr "Laat het volgende belangrijke bericht zien"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail-message.xml.h:18
 msgid "Display the next message"
 msgstr "Laat volgende bericht zien"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail-message.xml.h:19
 msgid "Display the next unread message"
 msgstr "Laat het volgende ongelezen bericht zien"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail-message.xml.h:20
 msgid "Display the next unread thread"
 msgstr "Laat de volgende ongelezen draad zien"
 
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the previous important message"
 msgstr "Laat het vorige belangrijke bericht zien"
 
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the previous message"
 msgstr "Laat het vorige bericht zien"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the previous unread message"
 msgstr "Laat het vorige ongelezen bericht zien"
 
-#: ui/evolution-mail.xml.h:31
-msgid "Empty _Trash"
-msgstr "Leeg Prullenbak"
-
-#: ui/evolution-mail.xml.h:32
-msgid "Filter on Mailing _List"
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "Filter op Mailinglijst"
 
-#: ui/evolution-mail.xml.h:33
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "Filter op _Afzender"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "Filter op _Geadresseerden"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "Filter op _Onderwerp"
 
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail-message.xml.h:28
 msgid "Force images in HTML mail to be loaded"
 msgstr "Forceer het laden van plaatjes in HTML email"
 
-#: ui/evolution-mail.xml.h:37
-msgid "Forget _Passwords"
-msgstr "Wachtwoorden _Vergeten"
-
-#: ui/evolution-mail.xml.h:38
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "Vergeet de onthouden wachtwoorden zodat ze opnieuw gevraagd worden.."
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "Doorsturen"
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "Doorsturen Als"
 
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail-message.xml.h:31
 msgid "Forward _Attached"
 msgstr "Stuur door als bijvoegsel"
 
-#: ui/evolution-mail.xml.h:42
+#: ui/evolution-mail-message.xml.h:32
 msgid "Forward _Inline"
 msgstr "Ingebonden doorsturen"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail-message.xml.h:33
 msgid "Forward _Quoted"
 msgstr "Geciteerd doorsturen"
 
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail-message.xml.h:34
 msgid "Forward the selected message in the body of a new message"
 msgstr "Stuur het geselecteerde bericht door in de body van een nieuw bericht"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail-message.xml.h:35
 msgid "Forward the selected message quoted like a reply"
 msgstr "Stuur het bericht geciteerd door alsof het een antwoord is"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:36
 msgid "Forward the selected message to someone"
 msgstr "Stuur het bericht door naar iemand"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Stuur het bericht door naar iemand als bijlage"
 
-#: ui/evolution-mail.xml.h:48
-#, fuzzy
-msgid "Hide S_elected Messages"
-msgstr "Verberg geselecteerde"
-
-#: ui/evolution-mail.xml.h:49
-#, fuzzy
-msgid "Hide _Deleted Messages"
-msgstr "Verberg verwijderde"
-
-#: ui/evolution-mail.xml.h:50
-#, fuzzy
-msgid "Hide _Read messages"
-msgstr "Doorgestuurde berichten"
-
-#: ui/evolution-mail.xml.h:51
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-"Verberg de weggegooide berichten in plaats van ze te laten zien met een "
-"streep erdoor"
-
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail-message.xml.h:39
 msgid "Load _Images"
 msgstr "Laad Plaatjes"
 
-#: ui/evolution-mail.xml.h:53
-msgid "Manage _Subscriptions..."
-msgstr "Beheer Postbusabonnementen..."
-
-#: ui/evolution-mail.xml.h:54
-msgid "Mar_k As Read"
-msgstr "Markeer Als Gelezen"
-
-#: ui/evolution-mail.xml.h:55
-msgid "Mark All as R_ead"
-msgstr "Markeer Als Gelezen"
-
-#: ui/evolution-mail.xml.h:56
-msgid "Mark As U_nread"
-msgstr "Markeer Als _Ongelezen"
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "Belangrijk"
 
-#: ui/evolution-mail.xml.h:57
-msgid "Mark all visible messages as read"
-msgstr "Markeer alle zichtbare berichten als gelezen"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
+msgstr "Markeer Als Ongelezen"
 
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "Markeer het geselecteerde bericht alsof het gelezen is"
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "Markeer het geselecteerde bericht om te verwijderen"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "Markeer het geselecteerde bericht alsof het niet gelezen is"
 
-#: ui/evolution-mail.xml.h:60
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Markeer het geselecteerde bericht om te verwijderen"
+
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages for deletion"
 msgstr "Markeer het geselecteerde bericht om te verwijderen"
 
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Verplaatsen"
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "Verplaats de geselecteerde berichten naar een andere map"
 
-#: ui/evolution-mail.xml.h:64
-msgid "Open a window for composing a mail message"
-msgstr "Open een venster om een emailbericht op te stellen"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "Volgende"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Volgende bericht"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Volgende bericht"
 
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Selecteer _Gerelateerde Berichten"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Volgende bericht"
+
+#: ui/evolution-mail-message.xml.h:56
 msgid "Open the selected message in a new window"
 msgstr "Open het geselecteerde bericht in een nieuw venster"
 
-#: ui/evolution-mail.xml.h:66
+#: ui/evolution-mail-message.xml.h:57
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 "Open het geselecteerde bericht in de opsteller om het opnieuw te zenden"
 
-#: ui/evolution-mail.xml.h:67
-msgid "Permanently remove all deleted messages from all folders"
-msgstr "Verwijder alle verwijderde berichten permanent uit alle mappen"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "Geeft een afdrukvoorbeeld van het bericht"
 
-#: ui/evolution-mail.xml.h:68
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "Verwijder alle verwijderde berichen permanent uit deze map"
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "Vorige"
+
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Vorige bericht"
+
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Vorige bericht"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Vorige bericht"
 
-#: ui/evolution-mail.xml.h:72
+#: ui/evolution-mail-message.xml.h:64
 msgid "Print Message..."
 msgstr "Bericht afdrukken..."
 
-#: ui/evolution-mail.xml.h:73
+#: ui/evolution-mail-message.xml.h:65
 msgid "Print Preview..."
 msgstr "Afdrukvoorbeeld..."
 
-#: ui/evolution-mail.xml.h:74
-msgid "Print message to the printer"
-msgstr "Bericht afdrukken naar de printer"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "Bericht Afdrukken"
 
-#: ui/evolution-mail.xml.h:75
-msgid "Redirect (FIXME: implement me)"
-msgstr "Omleiden (FIXME: implementeer mij)"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "Beantwoorden"
 
-#: ui/evolution-mail.xml.h:79
-#, fuzzy
-msgid "Reply to _List"
-msgstr "Iedereen Be_antwoorden"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "Iedereen beantwoorden"
 
-#: ui/evolution-mail.xml.h:80
+#: ui/evolution-mail-message.xml.h:71
 msgid "S_earch Message"
 msgstr "Zoek bericht"
 
-#: ui/evolution-mail.xml.h:81
+#: ui/evolution-mail-message.xml.h:72
 msgid "Save the message as a text file"
 msgstr "Sla bericht op als tekstbestand"
 
-#: ui/evolution-mail.xml.h:82
+#: ui/evolution-mail-message.xml.h:73
 msgid "Search for text in the body of the displayed message"
 msgstr "Zoek voor tekst in de body van het weergegeven bericht"
 
-#: ui/evolution-mail.xml.h:83 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "_Alles Selecteren"
-
-#: ui/evolution-mail.xml.h:84
-msgid "Select _Thread"
-msgstr "Selecteer _Gerelateerde Berichten"
-
-#: ui/evolution-mail.xml.h:85
-msgid "Select all and only the messages that are not currently selected"
-msgstr "Selecteer alle en alleen de berichten die nu niet zijn geselecteerd"
-
-#: ui/evolution-mail.xml.h:86
-msgid "Select all messages in the same thread as the selected message"
-msgstr ""
-"Selecteer alle berichten in dezelfde thread als het geselecteerde bericht"
-
-#: ui/evolution-mail.xml.h:87
-msgid "Select all visible messages"
-msgstr "Selecteer alle zichtbare berichten"
-
-#: ui/evolution-mail.xml.h:88
-msgid "Send / Receive"
-msgstr "Verstuur en Ontvang"
-
-#: ui/evolution-mail.xml.h:89
-msgid "Send queued mail and retrieve new mail"
-msgstr "Post in de wachtrij versturen en nieuwe post ophalen"
-
-#: ui/evolution-mail.xml.h:90
+#: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:91
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Show Full _Headers"
 msgstr "Koppen"
 
-#: ui/evolution-mail.xml.h:92
-#, fuzzy
-msgid "Show _All"
-msgstr "Allen Weergeven"
-
-#: ui/evolution-mail.xml.h:93
+#: ui/evolution-mail-message.xml.h:76
 msgid "Show message in the normal style"
 msgstr "Laat berichten in normale stijl zien"
 
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail-message.xml.h:77
 msgid "Show message with all email headers"
 msgstr "Laat berichten zien met alle email headers"
 
-#: ui/evolution-mail.xml.h:95
-msgid "Show messages that have been temporarily hidden"
-msgstr "Laat berichten zien de tijdelijk zijn verborgen"
-
-#: ui/evolution-mail.xml.h:96
+#: ui/evolution-mail-message.xml.h:78
 msgid "Show the raw email source of the message"
 msgstr "Laat de ruwe emailbron van het bericht zien"
 
-#: ui/evolution-mail.xml.h:97
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "Abboneer of zegt abbo op op de mappen op de server"
-
-#: ui/evolution-mail.xml.h:98
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Verberg tijdelijk alle berichten die al zijn gelezen"
-
-#: ui/evolution-mail.xml.h:99
-msgid "Temporarily hide the selected messages"
-msgstr "Verberg tijdelijk de geselecteerde berichten"
-
-#: ui/evolution-mail.xml.h:100
-msgid "Threaded Message list"
-msgstr "Berichtenlijst met Weergave van Relateerde Berichten"
-
-#: ui/evolution-mail.xml.h:101
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "Maak verwijderen ongedaan van de geselecteerde berichten"
 
-#: ui/evolution-mail.xml.h:102
+#: ui/evolution-mail-message.xml.h:80
 msgid "VFolder on Mailing _List..."
 msgstr "VMap op Mailinglijst"
 
-#: ui/evolution-mail.xml.h:103
+#: ui/evolution-mail-message.xml.h:81
 msgid "VFolder on Se_nder..."
 msgstr "VMap op Afze_nder"
 
-#: ui/evolution-mail.xml.h:104
+#: ui/evolution-mail-message.xml.h:82
 msgid "VFolder on _Recipients..."
 msgstr "VMap op Geadresseerden"
 
-#: ui/evolution-mail.xml.h:105
+#: ui/evolution-mail-message.xml.h:83
 msgid "VFolder on _Subject..."
 msgstr "VMap op Onderwerp"
 
-#: ui/evolution-mail.xml.h:106
-msgid "Virtual Folder _Editor..."
-msgstr "_Virtuele-Mapbewerker..."
-
-#: ui/evolution-mail.xml.h:107
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "Filters _Toepassen"
 
-#: ui/evolution-mail.xml.h:108
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Copy to Folder"
 msgstr "Kopieer naar Map"
 
-#: ui/evolution-mail.xml.h:109
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "Maak Filter Van Bericht"
 
-#: ui/evolution-mail.xml.h:111
-msgid "_Expunge"
-msgstr "_Wissen"
-
-#: ui/evolution-mail.xml.h:112
-msgid "_Filters..."
-msgstr "_Filters..."
-
-#: ui/evolution-mail.xml.h:113 ui/evolution.xml.h:50
-msgid "_Folder"
-msgstr "_Map"
-
-#: ui/evolution-mail.xml.h:114
+#: ui/evolution-mail-message.xml.h:88
 msgid "_Forward Message"
 msgstr "Bericht Doorsturen"
 
-#: ui/evolution-mail.xml.h:115 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "Selectie _Inverteren"
-
-#: ui/evolution-mail.xml.h:116
-msgid "_Mail Message"
-msgstr "_Bericht versturen"
-
-#: ui/evolution-mail.xml.h:117
-msgid "_Mail Settings..."
-msgstr "Postinstellingen..."
-
-#: ui/evolution-mail.xml.h:118
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "_Message Display"
 msgstr "Berichten"
 
-#: ui/evolution-mail.xml.h:119
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Move to Folder"
 msgstr "Verplaats naar Map"
 
-#: ui/evolution-mail.xml.h:120
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "_Normal Display"
 msgstr "Weergave"
 
-#: ui/evolution-mail.xml.h:121
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Open Message"
 msgstr "Open Bericht"
 
-#: ui/evolution-mail.xml.h:122 ui/evolution.xml.h:60
-msgid "_Properties..."
-msgstr "_Eigenschappen..."
-
-#: ui/evolution-mail.xml.h:123
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Re-send Message"
 msgstr "Bericht Opnieuw Versturen"
 
-#: ui/evolution-mail.xml.h:126
-msgid "_Send / Receive"
-msgstr "Verstuur en Ontvang"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Dit venster sluiten"
 
-#: ui/evolution-mail.xml.h:127
-#, fuzzy
-msgid "_Threaded Message List"
-msgstr "Berichtenlijst met Weergave van Relateerde Berichten"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr "Gereedschapsbalken _Aanpassen"
+
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "Aanpassen"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "Gereedschapsbalken aanpassen"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "_Sluiten"
+
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "Weerga_ve"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Bijlage invoegen"
 
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Voeg een bestand toe als bijlage"
-
-#: ui/evolution-message-composer.xml.h:4
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Huidig bestand sluiten"
 
@@ -8533,50 +11170,57 @@ msgid "HTML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "Tekstbestand invoegen..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Voeg een bestand bij het bericht"
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Tekstbestand invoegen..."
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Bestand openen"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "Versleutelen met PGP"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "Signeren met PGP"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
 msgstr "Versleutelen met S/MIME"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr "S/MIME Ondertekening"
 
-#: ui/evolution-message-composer.xml.h:18 widgets/misc/e-filter-bar.c:241
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
 msgid "Save"
 msgstr "Opslaan"
 
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save _Draft"
-msgstr "Kla_d Opslaan"
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Opslaan Als"
 
 #: ui/evolution-message-composer.xml.h:22
-msgid "Save in _folder... (FIXME)"
-msgstr "Opslaan in _map... (FIXME)"
+msgid "Save _Draft"
+msgstr "Kla_d Opslaan"
 
 #: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Opslaan in _map..."
 
 #: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save the current file"
 msgstr "Huidig bestand opslaan"
 
@@ -8649,102 +11293,136 @@ msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Schakel Antwoordadres-weergave aan/uit"
 
 #: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "Bestand bijvoegen..."
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "_Bcc-veld"
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "_Cc-veld"
 
-#: ui/evolution-message-composer.xml.h:44 ui/evolution.xml.h:44
-msgid "_Close"
-msgstr "_Sluiten"
-
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
 msgid "_Debug"
 msgstr "_Debug"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
 msgstr "Verwijder Alles"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "_Van-veld"
 
-#: ui/evolution-message-composer.xml.h:50 ui/evolution.xml.h:53
-msgid "_Help"
-msgstr "_Help"
-
 #: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Invoegen"
 
 #: ui/evolution-message-composer.xml.h:52
-msgid "_Insert text file... (FIXME)"
-msgstr "Voeg tekstbestand _in... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:53
 msgid "_Open..."
 msgstr "_Openen..."
 
-#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "Antwoordadres-veld:"
 
-#: ui/evolution-message-composer.xml.h:56
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "_Beveiliging"
 
-#: ui/evolution-message-composer.xml.h:57 ui/evolution.xml.h:65
-msgid "_View"
-msgstr "Weerga_ve"
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "_Help"
 
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Neem abonnement op deze map"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Map"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Lijst Verversen"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Lijst of Mappen Verversen"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Beeindig abonnement op deze map"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Abonneren"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Afmelden"
 
+#: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Task"
+msgstr "Annuleren"
+
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "Verwijder deze taak"
+
+#: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Re_fresh Task"
+msgstr "Lijst Verversen"
+
 #: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "Copy selected task"
+msgstr "Verwijder de geselecteerde taken"
+
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Nieuwe taak aanmaken"
 
 #: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "Verwijder de geselecteerde taken"
+
+#: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
+msgstr "Verwijder de geselecteerde taken"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Nieuwe Taak"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "Plak het klembord"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Bewaar taak als iets anders"
 
-#: ui/evolution-tasks.xml.h:8
-msgid "Tasks Preferences..."
-msgstr "Taakvoorkeuren..."
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "Postinstellingen..."
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_Taak"
 
@@ -8760,211 +11438,194 @@ msgstr "Voeg toe aan Snelkoppelingsbalk"
 msgid "Change the name of this folder"
 msgstr "Verander de naam van deze map"
 
-#: ui/evolution.xml.h:4
-msgid "Change the properties for this folder"
-msgstr "Verander de eigenschappen van deze map"
-
 #: ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Dit venster sluiten"
-
-#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Kopieer deze map"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:7
 msgid "Create _New Folder..."
 msgstr "_Nieuwe map aanmaken..."
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:8
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Creeer een verbinding naar deze map op de snelkoppelingsbalk"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:9
 msgid "Create a new folder"
 msgstr "Maak een nieuwe map aan"
 
-#: ui/evolution.xml.h:11
-msgid "Customi_ze Toolbars..."
-msgstr "Gereedschapsbalken _Aanpassen"
-
-#: ui/evolution.xml.h:12
-msgid "Customize"
-msgstr "Aanpassen"
-
 #: ui/evolution.xml.h:13
-msgid "Customize toolbars"
-msgstr "Gereedschapsbalken aanpassen"
-
-#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "Delete this folder"
 msgstr "Verwijder deze map"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Toon een andere map"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_Afsluiten"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:16
 msgid "Evolution _FAQ"
 msgstr "Evolution FAQ"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "Evolution Venster"
 
-#: ui/evolution.xml.h:19
-msgid "Evolution bar _shortcut"
-msgstr "Evolutionbalk _snelkoppeling"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Programma verlaten"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "_Beginnen"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Importeer een extern bestandsformaat"
 
-#: ui/evolution.xml.h:23
-msgid "Main toolbar"
-msgstr "Hoofdgereedschapsbalk"
-
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:22
 msgid "Move this folder to another place"
 msgstr "Verplaats deze map naar een andere plaats"
 
-#: ui/evolution.xml.h:25
-msgid "Open in New Window"
-msgstr "Open in Nieuw Venster"
-
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Open in Nieuw Venster"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Open deze map in een nieuw venster"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Toon informatie over Evolution"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Bug-Report Insturen"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "_Bug Report Insturen"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "Bug Report insturen met Bug Buddy."
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 msgid "Toggle"
 msgstr "Verander"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Toont de mappenbalk"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Toont de snelkoppelingenbalk"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Schakel offline werken aan of uit"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "Gebruik van de Cont_actbeheerder"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "Gebruik van de _Kalender"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "Gebruik van het _Mailcomponent"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "View the selected folder"
 msgstr "Toon de geselecteerde map"
 
-#: ui/evolution.xml.h:40
-msgid "Work Offline"
-msgstr "Werk zonder netwerk"
-
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "_Over Evolution..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:41
 msgid "_Appointment (FIXME)"
 msgstr "_Afspraak (FIXME)"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:43
 msgid "_Contact (FIXME)"
 msgstr "_Contact (FIXME)"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "KopiКren...."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "_Mappenbalk"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Ga naar Map..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "_Importeer bestand..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "_Index"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "_Bericht versturen"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_Move..."
 msgstr "Verplaatsen..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Nieuw"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "_Nieuwe Map"
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "Hernoemen..."
 
-#: ui/evolution.xml.h:62
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "_Snelkoppelingsbalk"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "_Snelkoppelingsbalk"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Task (FIXME)"
 msgstr "_Taak (FIXME)"
 
-#: ui/evolution.xml.h:66
+#: ui/evolution.xml.h:64
 msgid "_Work Offline"
 msgstr "Werk zonder netwerk"
 
+#: ui/my-evolution.xml.h:1
+#, fuzzy
+msgid "Change the settings for My Evolution"
+msgstr "Verander de eigenschappen van deze map"
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "Postinstellingen..."
+
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "adreskaart"
@@ -8997,9 +11658,12 @@ msgstr "Berichten"
 msgid "With Category"
 msgstr "Op Categorie:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "Voorlopig"
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B, %Y"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
@@ -9073,13 +11737,6 @@ msgstr "_Einde bijeenkomst:"
 msgid "All Attendees"
 msgstr "Alle Aanwezigen"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B, %Y"
-
 #: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "_Huidige Weergave"
@@ -9090,52 +11747,128 @@ msgstr "Defineer Bekijkmogelijkheid"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:422
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "MDWDVZZ"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Nu"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Vandaag"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "De datum moet ingevoerd worden in het formaat: %s"
 
+#: widgets/misc/e-charset-picker.c:59
+#, fuzzy
+msgid "Baltic"
+msgstr "Basis"
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "week"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "Prullenbak"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "Transactie mislukt"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "Nieuws"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Onbekende fout: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+#, fuzzy
+msgid "Enter the character set to use"
+msgstr "Standaard doorsturen stijl is:"
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "Overige"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Contacten Bewerken"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "Bewaar zoekopdracht"
 
-#: widgets/misc/e-filter-bar.c:239
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "Uitgebreid zoeken"
 
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "Opslaan Als..."
-
 #: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Allen Weergeven"
 
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Bewerken..."
-
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Uitgebreid..."
@@ -9189,47 +11922,375 @@ msgstr "init_corba(): kon Gnome niet initializeren"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kon Bonobo niet initializeren"
 
-#~ msgid "%A, %e %B %Y"
-#~ msgstr "%A, %e %B, %Y"
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "Instellingen Wijzigen"
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "Taakvoorkeuren..."
 
-#~ msgid "Appointments"
-#~ msgstr "Afspraken"
+#~ msgid "???"
+#~ msgstr "???"
 
-#~ msgid "%I:%M%p"
-#~ msgstr "%I:%M%p"
+#~ msgid "C_ontacts..."
+#~ msgstr "C_ontacten..."
 
-#~ msgid "<b>Error loading calendar</b>"
-#~ msgstr "<b>Fout bij laden van kalender</b>"
+#~ msgid "_Company:"
+#~ msgstr "_Bedrijf:"
 
-#~ msgid "<b>Error loading calendar:<br>Method not supported"
-#~ msgstr "<b>Fout bij laden kalender:<br>Methode niet ondersteund"
+#~ msgid "Find..."
+#~ msgstr "Zoek..."
 
-#~ msgid "Show appointments"
-#~ msgstr "Toon afspraken"
+#~ msgid "label26"
+#~ msgstr "label26"
 
-#~ msgid "Show tasks"
-#~ msgstr "Toon taken"
+#~ msgid "Open calendar"
+#~ msgstr "Open kalender"
 
-#~ msgid "Things to do"
-#~ msgstr "Dingen te doen"
+#~ msgid "Save calendar"
+#~ msgstr "Kalender opslaan"
 
-#~ msgid "Edit Task"
-#~ msgstr "Taak Bewerken"
+#~ msgid "Settings..."
+#~ msgstr "Instellingen..."
+
+#~ msgid "label55"
+#~ msgstr "label55"
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "Alarm stopt na"
+
+#~ msgid "Colors"
+#~ msgstr "Kleuren"
 
-#~ msgid "Appointment - %s"
-#~ msgstr "Afspraak - %s"
+#~ msgid "Enable snoozing for"
+#~ msgstr "Maak sluimeren mogelijk voor"
 
-#~ msgid "Task - %s"
-#~ msgstr "Taak - %s"
+#~ msgid "Highlight"
+#~ msgstr "Markeer"
 
-#~ msgid "Journal entry - %s"
-#~ msgstr "Dagboekelement - %s"
+#~ msgid "Items Due Today:"
+#~ msgstr "Items die vandaag verlopen:"
 
-#~ msgid "No summary"
-#~ msgstr "Geen samenvatting"
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Items die nog niet zijn verlopen"
 
-#~ msgid "Attendee"
-#~ msgstr "Aanwezige"
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Items die nog niet zijn verlopen:"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "Verlopen items:"
+
+#~ msgid "TaskPad"
+#~ msgstr "TaakBlad"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Tijd Tot Verlooptijd"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Visuele Alarmen"
+
+#~ msgid "Work week"
+#~ msgstr "Werkweek"
+
+#~ msgid "label21"
+#~ msgstr "label21"
+
+#~ msgid "Percent complete"
+#~ msgstr "Percentage voltooid"
+
+#~ msgid "Edit this task"
+#~ msgstr "Bewerk deze taak"
+
+#~ msgid "Go to Today"
+#~ msgstr "Ga Naar Vandaag"
+
+#~ msgid "Delete all Occurrences"
+#~ msgstr "Verwijder alle Gebeurtenissen"
+
+#~ msgid "Component successfully updated."
+#~ msgstr "Component successvol geactualiseerd."
+
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "Kon uw kalender bestand niet laden!\n"
+
+#~ msgid "I couldn't read your calendar file!\n"
+#~ msgstr "Kon uw kalender bestand niet lezen!\n"
+
+#~ msgid "This is a reply from someone who was uninvited!"
+#~ msgstr "Dit is een antwoord van iemand die niet was uitgenodigd!"
+
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "Kon uw kalenderopslag niet actualiseren."
+
+#~ msgid "I couldn't delete the calendar component!\n"
+#~ msgstr "Ik kon het kalender component niet verwijderen!\n"
+
+#~ msgid "Component successfully deleted."
+#~ msgstr "Component successvol verwijderd."
+
+#~ msgid "I don't recognize this type of calendar component."
+#~ msgstr "Type kalendercomponent niet herkend."
+
+#~ msgid "Add to Calendar"
+#~ msgstr "Toevoegen aan Kalender"
+
+#~ msgid " Tentative "
+#~ msgstr " Voorlopig"
+
+#~ msgid "Update Calendar"
+#~ msgstr "Kalender actualiseren"
+
+#~ msgid "Summary contains"
+#~ msgstr "Bondige inhoud bevat"
+
+#~ msgid "Comment contains"
+#~ msgstr "Commentaar bevat"
+
+#~ msgid "Has category"
+#~ msgstr "Heeft Categorie:"
+
+#~ msgid "time-now expects 0 arguments"
+#~ msgstr "time-now verwacht 0 argumenten"
+
+#~ msgid "make-time expects 1 argument"
+#~ msgstr "make-time verwacht 1 argument"
+
+#~ msgid "make-time expects argument 1 to be a string"
+#~ msgstr "make-time verwacht dat argument 1 een string is"
+
+#~ msgid "make-time argument 1 must be an ISO 8601 date/time string"
+#~ msgstr "make-time argument 1 moet een ISO-8601 date/time string zijn"
+
+#~ msgid "time-add-day expects 2 arguments"
+#~ msgstr "time-add-day verwacht 2 argumenten"
+
+#~ msgid "time-add-day expects argument 1 to be a time_t"
+#~ msgstr "time-add-day verwacht dat argument 1 een time_t is"
+
+#~ msgid "time-add-day expects argument 2 to be an integer"
+#~ msgstr "time-add-day verwacht dat argument 2 een integer is"
+
+#~ msgid "time-day-begin expects 1 argument"
+#~ msgstr "time-day-begin verwacht 1 argument"
+
+#~ msgid "time-day-begin expects argument 1 to be a time_t"
+#~ msgstr "time-day-bewgin verwacht dat argument 1 een time_t is"
+
+#~ msgid "time-day-end expects 1 argument"
+#~ msgstr "time-dat-end verwacht 1 argument"
+
+#~ msgid "time-day-end expects argument 1 to be a time_t"
+#~ msgstr "time-dat-end verwacht dat argument 1 een time_t is"
+
+#~ msgid "get-vtype expects 0 arguments"
+#~ msgstr "get-vtype verwacht geen argumenten"
+
+#~ msgid "occur-in-time-range? expects 2 arguments"
+#~ msgstr "occur-in-time-range? verwacht 2 argumenten"
+
+#~ msgid "occur-in-time-range? expects argument 1 to be a time_t"
+#~ msgstr "occur-in-time-range? verwacht dat argument 1 een time_t is"
+
+#~ msgid "occur-in-time-range? expects argument 2 to be a time_t"
+#~ msgstr "occur-in-time-range? verwacht dat argument 2 een time_t is"
+
+#~ msgid "contains? expects 2 arguments"
+#~ msgstr "Bevat? verwacht 2 argumenten"
+
+#~ msgid "contains? expects argument 1 to be a string"
+#~ msgstr "contains? verwacht dat argument 1 een string is"
+
+#~ msgid "contains? expects argument 2 to be a string"
+#~ msgstr "contains? verwacht dat argument 2 een string is"
+
+#~ msgid ""
+#~ "contains? expects argument 1 to be one of \"any\", \"summary\", "
+#~ "\"description\""
+#~ msgstr ""
+#~ "contains? verwacht dat argument 1 een kleuze is uit "
+#~ "\"any\",\"summary\",\"description\""
+
+#~ msgid "has-categories? expects at least 1 argument"
+#~ msgstr "has-categories? verwacht op zijn minst 1 argument"
+
+#~ msgid "has-categories? expects all arguments to be strings"
+#~ msgstr "has-categories? verwacht dat alle argumenten strings zijn"
+
+#~ msgid "Evaluation of the search expression did not yield a boolean value"
+#~ msgstr "Evaluation of the search expression did not yield a boolean value"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Bezig met scannen IMAP-map"
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kon handtekeningsbestand %s niet openen:\n"
+#~ "%s"
+
+#~ msgid "That file does not exist."
+#~ msgstr "Het bestand bestaat niet."
+
+#~ msgid "That is not a regular file."
+#~ msgstr "Het is geen gewoon bestand."
+
+#~ msgid "That file exists but is not readable."
+#~ msgstr "Het bestand bestaat maar is niet leesbaar."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "Het bestand is toegankelijk maar open(2) mislukte."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "Het bestand is zeer groot (groter dan 100K).\n"
+#~ "Weet u zeker dat u deze wilt invoegen?"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Doorsturen naar Adres"
+
+#~ msgid "Elm Aliases"
+#~ msgstr "Elm-Aliassen"
+
+#~ msgid "Addressbooks"
+#~ msgstr "Adresboeken"
+
+#, fuzzy
+#~ msgid "_Reply to _List"
+#~ msgstr "Iedereen Be_antwoorden"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "Verander map van \"%s\" naar \"%s\" formaat"
+
+#~ msgid "Reconfiguring folder"
+#~ msgstr "Map wordt geherconfigureerd"
+
+#~ msgid "Closing current folder"
+#~ msgstr "Huidige map wordt gesloten"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Naam oude map wordt gewijzigd en map geopend"
+
+#~ msgid "Creating new folder"
+#~ msgstr "Bezig met aanmaken van nieuwe map"
+
+#~ msgid "Copying messages"
+#~ msgstr "Bezig met het kopiКren van berichten"
+
+#~ msgid "Evolution progress"
+#~ msgstr "Evolution voortgang"
+
+#~ msgid "Moving folder %s to %s"
+#~ msgstr "Verplaatsen map %s naar %s"
+
+#~ msgid "Copying folder %s to %s"
+#~ msgstr "Kopieeren map %s naar %s"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Bezig met ophalen bericht %d van %d (uid \"%s\")"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Bezig met opslaan bericht %d van %d (uid \"%s\")"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (doorgestuurd bericht)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Fwd: (geen onderwerp)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Doorgestuurd bericht (geen onderwerp)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Doorgestuurd Bericht-----<br><b>Van:</b> %s<br><b>Aan:</b> "
+#~ "%s<br><b>Onderwerp:</b> %s<br>"
+
+#~ msgid "Reply to the sender of this message"
+#~ msgstr "Beantwoord dit bericht"
+
+#~ msgid "Reply to all recipients of this message"
+#~ msgstr "Stuur antwoord naar alle geadresseerden van dit bericht"
+
+#~ msgid "Forward this message"
+#~ msgstr "Dit bericht doorsturen"
+
+#~ msgid "Delete this message"
+#~ msgstr "Verwijder dit bericht"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Evolution bestanden succesvol geОnstalleerd."
+
+#~ msgid "Activate"
+#~ msgstr "Activeren"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "Activeer deze snelkoppeling"
+
+#~ msgid "Select everything"
+#~ msgstr "Selecteer alles"
+
+#~ msgid "View All"
+#~ msgstr "Allen Weergeven"
+
+#~ msgid "5 Days"
+#~ msgstr "5 Dagen"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Maak een nieuwe kalender"
+
+#~ msgid "Day"
+#~ msgstr "Dag"
+
+#~ msgid "New _Event"
+#~ msgstr "Nieuwe Ka_lender"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Open Kalender"
+
+#~ msgid "Prev"
+#~ msgstr "Vorige"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Kalender bewaren als iets anders"
+
+#~ msgid "Week"
+#~ msgstr "Week"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "Open Ka_lender"
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "Markeer Als Gelezen"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Markeer Als _Ongelezen"
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Bericht afdrukken naar de printer"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "Omleiden (FIXME: implementeer mij)"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Opslaan in _map... (FIXME)"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "Voeg tekstbestand _in... (FIXME)"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Evolutionbalk _snelkoppeling"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>Fout bij laden kalender:<br>Methode niet ondersteund"
+
+#~ msgid "Edit Task"
+#~ msgstr "Taak Bewerken"
 
 #~ msgid "Attendee address"
 #~ msgstr "Adres aanwezige"
@@ -9244,18 +12305,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ "Annuleer\n"
 #~ "Bijeenkomst"
 
-#~ msgid "Chair"
-#~ msgstr "Voorzitter"
-
-#~ msgid "Meeting Invitations"
-#~ msgstr "Uitnodigingen voor de bijeenkomst"
-
-#~ msgid "Non-Participant"
-#~ msgstr "Niet-Deelnemer"
-
-#~ msgid "Optional Participant"
-#~ msgstr "Optionele Deelnemer"
-
 #~ msgid "Organizer: "
 #~ msgstr "CoЖrdinator: "
 
@@ -9266,25 +12315,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ "Publiceren\n"
 #~ "Gebeurtenis"
 
-#~ msgid "RSVP"
-#~ msgstr "RSVP"
-
-#~ msgid "Required Participant"
-#~ msgstr "Vereiste Deelnemer"
-
-#~ msgid "Role"
-#~ msgstr "Rol"
-
-#~ msgid ""
-#~ "Schedule\n"
-#~ "Time"
-#~ msgstr ""
-#~ "Plan\n"
-#~ "Tijd"
-
-#~ msgid "Edit Appointment"
-#~ msgstr "Afspraak Bewerken"
-
 #~ msgid "Appointment Basics"
 #~ msgstr "Afspraak Basisgegevens:"
 
@@ -9361,9 +12391,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "%H:%M%n"
 #~ msgstr "%H:%M%n"
 
-#~ msgid "Cannot initialize Evolution's Executive Summary component."
-#~ msgstr "Kan het Samenvattingscomponent van Evolution niet initializeren"
-
 #~ msgid ""
 #~ "Cannot open the HTML file:\n"
 #~ "%s"
@@ -9396,9 +12423,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Send an email to %s"
 #~ msgstr "Verstuur een bericht naar %s"
 
-#~ msgid "Change the view to %s"
-#~ msgstr "Verander de weergave in %s"
-
 #~ msgid "Run %s"
 #~ msgstr "Start %s"
 
@@ -9439,12 +12463,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ "waarschijnlijk aan dat u Bonobo gecompileerd hebt tegen GOAD in plaats van "
 #~ "OAF."
 
-#~ msgid "Evolution component for the executive summary."
-#~ msgstr "Evolution-component voor de samenvatting."
-
-#~ msgid "Factory for the Evolution executive summary component."
-#~ msgstr "Fabriek voor het Evolution-samenvattingscomponent."
-
 #~ msgid "Factory for the RDF summary."
 #~ msgstr "Fabriek voor de RDF-samenvatting."
 
@@ -9466,12 +12484,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Update automatically"
 #~ msgstr "Actualiseer automatisch"
 
-#~ msgid "Update now"
-#~ msgstr "Actualiseer nu"
-
-#~ msgid "Update every "
-#~ msgstr "Actualiseer elke "
-
 #~ msgid "PGP"
 #~ msgstr "PGP"
 
@@ -9481,18 +12493,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Incomplete message written on pipe!"
 #~ msgstr "Onafgemaakt bericht naar pijp geschreven!"
 
-#~ msgid "Mail Summary"
-#~ msgstr "Samenvatting"
-
-#~ msgid "Flagged"
-#~ msgstr "Gevlagd"
-
-#~ msgid "Received"
-#~ msgstr "Ontvangen"
-
-#~ msgid "Size"
-#~ msgstr "Grootte"
-
 #~ msgid "About this application"
 #~ msgstr "Over deze applicatie"
 
@@ -9511,21 +12511,9 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Chec_k Names (FIXME)"
 #~ msgstr "Contro_leer Namen (FIXME)"
 
-#~ msgid "Clear"
-#~ msgstr "Wissen"
-
-#~ msgid "Clear the selection"
-#~ msgstr "Selectie wissen"
-
-#~ msgid "Close this appointment"
-#~ msgstr "Deze afspraak sluiten"
-
 #~ msgid "Cop_y to Folder... (FIXME)"
 #~ msgstr "Kopieer naar Map... (FIXME)"
 
-#~ msgid "Delete this appointment"
-#~ msgstr "Verwijder deze afspraak"
-
 #~ msgid "Dump XML"
 #~ msgstr "XML Dumpen"
 
@@ -9547,9 +12535,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "In_complete Task (FIXME)"
 #~ msgstr "On_voltooide Taak (FIXME)"
 
-#~ msgid "Modify the file's properties"
-#~ msgstr "De bestandseigenschappen wijzigen"
-
 #~ msgid "N_ext"
 #~ msgstr "V_olgende"
 
@@ -9559,9 +12544,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Print S_etup..."
 #~ msgstr "Afdrukin_stellingen..."
 
-#~ msgid "Save the appointment and close the dialog box"
-#~ msgstr "Bewaar de afspraak en sluit dit venster"
-
 #~ msgid "Schedule some sort of a meeting"
 #~ msgstr "Een bijeenkomst plannen"
 
@@ -9628,9 +12610,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Find"
 #~ msgstr "Zoek"
 
-#~ msgid "Find Again"
-#~ msgstr "Opnieuw Zoeken"
-
 #~ msgid "Meeting Re_quest (FIXME)"
 #~ msgstr "Ve_rzoek Bijeenkomst (FIXME)"
 
@@ -9655,9 +12634,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "S_kip Occurrence (FIXME)"
 #~ msgstr "Sla Gebeurtenis over (FIXME)"
 
-#~ msgid "Save the task and close the dialog box"
-#~ msgstr "Bewaar deze taak en sluit het dialoogvenster"
-
 #~ msgid "Search again for the same string"
 #~ msgstr "Probeer dezelfde tekenreeks nogmaals te vinden"
 
diff --git a/po/nn.po b/po/nn.po
index 7229692951..3a0077cfa9 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-0.11\n"
-"POT-Creation-Date: 2001-07-13 15:51+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2000-09-07 20:17+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian (Nynorsk)\n"
@@ -22,209 +22,209 @@ msgstr ""
 msgid "Imports VCard files into Evolution."
 msgstr "mellombels feil i namneoppslag"
 
-#: addressbook/backend/ebook/e-card.c:3606
+#: addressbook/backend/ebook/e-card.c:3605
 #, fuzzy
 msgid "Card: "
 msgstr "Teikn"
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3607
 #, fuzzy
 msgid ""
 "\n"
 "Name: "
 msgstr "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3613
+#: addressbook/backend/ebook/e-card.c:3612
 #, fuzzy
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr "Etterstaving"
 
-#: addressbook/backend/ebook/e-card.c:3627
+#: addressbook/backend/ebook/e-card.c:3626
 #, fuzzy
 msgid ""
 "\n"
 "Birth Date: "
 msgstr "Start-dato:"
 
-#: addressbook/backend/ebook/e-card.c:3638
+#: addressbook/backend/ebook/e-card.c:3637
 #, fuzzy
 msgid ""
 "\n"
 "Address:"
 msgstr "Adresse"
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3644
 #, fuzzy
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr "ZIP/Postnummer"
 
-#: addressbook/backend/ebook/e-card.c:3646
+#: addressbook/backend/ebook/e-card.c:3645
 #, fuzzy
 msgid ""
 "\n"
 "  Country:     "
 msgstr "Land:"
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3671
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3674
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3698
+#: addressbook/backend/ebook/e-card.c:3697
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr "E-post 2"
 
-#: addressbook/backend/ebook/e-card.c:3701
+#: addressbook/backend/ebook/e-card.c:3700
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:"
 msgstr "E-post 2"
 
-#: addressbook/backend/ebook/e-card.c:3720
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3726
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3738
+#: addressbook/backend/ebook/e-card.c:3737
 #, fuzzy
 msgid ""
 "\n"
 "Business Role: "
 msgstr "Firma"
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3750
 #, fuzzy
 msgid ""
 "\n"
 "  Name:  "
 msgstr "Navn:"
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3755
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3758
 #, fuzzy
 msgid ""
 "\n"
 "Categories: "
 msgstr "Kategoriar"
 
-#: addressbook/backend/ebook/e-card.c:3760
+#: addressbook/backend/ebook/e-card.c:3759
 #, fuzzy
 msgid ""
 "\n"
@@ -241,25 +241,25 @@ msgstr "Kommentar:"
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3773
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3776
+#: addressbook/backend/ebook/e-card.c:3775
 #, fuzzy
 msgid ""
 "\n"
 "Public Key: "
 msgstr "Praksis"
 
-#: addressbook/backend/ebook/e-card.c:4038
+#: addressbook/backend/ebook/e-card.c:4037
 #, fuzzy
 msgid "Multiple VCards"
 msgstr "&Fleire spelarar"
 
-#: addressbook/backend/ebook/e-card.c:4046
+#: addressbook/backend/ebook/e-card.c:4045
 #, fuzzy, c-format
 msgid "VCard for %s"
 msgstr "Kort 1:"
@@ -269,9 +269,9 @@ msgstr "Kort 1:"
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikkje initiere Bonobo"
@@ -285,15 +285,15 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 #, fuzzy
 msgid "Could not start wombat server"
 msgstr "Kunne ikkje starta underprosess."
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 #, fuzzy
 msgid "Could not start wombat"
 msgstr "Kunne ikkje starta %1."
@@ -375,7 +375,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-config.c:165
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:63
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
 msgid "Password"
 msgstr ""
 
@@ -410,13 +410,14 @@ msgstr ""
 msgid "FIXME Bind DN Help text here"
 msgstr ""
 
+#. Remember the password?
 #: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
 msgid "Remember this password"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Host:"
 msgstr "time/timar"
@@ -458,7 +459,7 @@ msgid "Advanced LDAP Options"
 msgstr "Avanserte kISDN-val"
 
 #: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:69
 msgid "Path:"
 msgstr "Sti:"
 
@@ -471,38 +472,38 @@ msgstr ""
 msgid "Create path if it doesn't exist."
 msgstr "Fila finst ikkje\n"
 
-#: addressbook/gui/component/addressbook-config.c:662
+#: addressbook/gui/component/addressbook-config.c:663
 #, fuzzy
 msgid "Edit Addressbook"
 msgstr "KDE adressebok"
 
-#: addressbook/gui/component/addressbook-config.c:664
+#: addressbook/gui/component/addressbook-config.c:665
 #, fuzzy
 msgid "Add Addressbook"
 msgstr "KDE adressebok"
 
-#: addressbook/gui/component/addressbook-config.c:682
+#: addressbook/gui/component/addressbook-config.c:683
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:53 my-evolution/e-summary-preferences.c:886
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr "Navn:"
 
-#: addressbook/gui/component/addressbook-config.c:689
+#: addressbook/gui/component/addressbook-config.c:692
 msgid "FIXME Name help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:691
+#: addressbook/gui/component/addressbook-config.c:694
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2
 msgid "Description:"
 msgstr "Skildring:"
 
-#: addressbook/gui/component/addressbook-config.c:692
+#: addressbook/gui/component/addressbook-config.c:695
 msgid "FIXME Description help text here"
 msgstr ""
 
@@ -526,26 +527,25 @@ msgid "URI"
 msgstr "URL"
 
 #: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:11
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:108
 #, fuzzy
 msgid "_Add"
 msgstr "Legg til"
 
 #: addressbook/gui/component/addressbook-config.glade.h:6
-#: mail/mail-config.glade.h:104 ui/evolution-comp-editor.xml.h:20
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:47
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution.xml.h:46
 #, fuzzy
 msgid "_Edit"
 msgstr "Rediger"
 
-#: addressbook/gui/component/addressbook-storage.c:99
+#: addressbook/gui/component/addressbook-storage.c:118
 #, fuzzy
 msgid "Other Contacts"
 msgstr "Slett kolonne"
@@ -585,7 +585,7 @@ msgstr ""
 "Sjekk at eininga finst og at du har\n"
 "skrivetilgang til ho."
 
-#: addressbook/gui/component/addressbook.c:554 calendar/gui/gnome-cal.c:218
+#: addressbook/gui/component/addressbook.c:554
 msgid "Any field contains"
 msgstr ""
 
@@ -607,31 +607,22 @@ msgstr "SpЬrjinga inneheld"
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * card.
-#.
-#: addressbook/gui/component/e-address-popup.c:178
-msgid "(none)"
-msgstr "(ingen)"
-
 #: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
-#: addressbook/gui/contact-editor/e-contact-editor.c:1476
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
 msgid "Primary Email"
 msgstr "PrimФr e-post"
 
 #: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1477
-#: addressbook/gui/widgets/e-addressbook-view.c:727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
 #, fuzzy
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1478
-#: addressbook/gui/widgets/e-addressbook-view.c:728
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
 #, fuzzy
 msgid "Email 3"
 msgstr "E-post 3"
@@ -664,7 +655,7 @@ msgstr ""
 
 #: addressbook/gui/component/e-address-popup.c:946
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:339
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
 #, fuzzy
 msgid "Add to Contacts"
 msgstr "Slett kolonne"
@@ -694,10 +685,13 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:156
-#: addressbook/gui/component/select-names/e-select-names.c:618
+#: addressbook/gui/component/select-names/e-select-names.c:630
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
 #: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:272 shell/e-shortcuts-view.c:475
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
 msgid "Remove"
 msgstr "Fjern"
 
@@ -711,6 +705,15 @@ msgstr "Fjern"
 msgid "Send HTML Mail?"
 msgstr "&Send e-post"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Endra skrift"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #, fuzzy
 msgid "Message Recipients"
@@ -738,163 +741,158 @@ msgid "_Search"
 msgstr "SЬk"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "Legg til"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "Anni_versary:"
 msgstr "Merkedag"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "B_usiness"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 #, fuzzy
 msgid "Business _Fax"
 msgstr "Firma-fax"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 #: calendar/gui/dialogs/event-page.glade.h:2
 #: calendar/gui/dialogs/task-page.glade.h:3
 #, fuzzy
 msgid "Ca_tegories..."
 msgstr "Kategoriar ..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 #, fuzzy
 msgid "Contact Editor"
 msgstr "Comment=X-redigering"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
 #: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Detaljar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 #, fuzzy
 msgid "File As:"
 msgstr "Arkiver som"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Generelt"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Ny telefontype"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "No_tater:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
 #, fuzzy
 msgid "Organi_zation:"
 msgstr "Organisasjon:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Telefontypar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Web page address:"
 msgstr "&WINS-adresse:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "_Address..."
 msgstr "Adresse"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "_Assistant's name:"
 msgstr "&Namn pЕ assistent:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #, fuzzy
 msgid "_Birthday:"
 msgstr "FЬdselsdag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 #, fuzzy
 msgid "_Business"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: calendar/gui/dialogs/event-page.glade.h:9
 #: calendar/gui/dialogs/task-page.glade.h:20
 #, fuzzy
 msgid "_Contacts..."
 msgstr "&Innhald ..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1196
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1290
-#: mail/mail-config.glade.h:103 ui/evolution-mail-message.xml.h:78
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 #, fuzzy
 msgid "_Delete"
 msgstr "Slett"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "_Department:"
 msgstr "Avdeling:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #, fuzzy
 msgid "_Full Name..."
 msgstr "Fullt namn"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #, fuzzy
 msgid "_Home"
 msgstr "Heim"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "_Job title:"
 msgstr "Jobb-tittel"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "Na_mn pЕ sjef:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_Mobil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "Kalle_namn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "_Office:"
 msgstr "K&ontor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "_Profession:"
 msgstr "&Yrke:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "_Spouse:"
 msgstr "Ektefelle"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "_This is the mailing address"
 msgstr "Rediger e-post-adresser"
@@ -904,102 +902,102 @@ msgstr "Rediger e-post-adresser"
 msgid "Delete Contact?"
 msgstr "Slett kolonne"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1434
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #, fuzzy
 msgid "Assistant"
 msgstr "Namn pЕ assistent"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1435
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1436
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 #, fuzzy
 msgid "Business 2"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1437
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Firma-fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1438
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Ring tilbake"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1439
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 #, fuzzy
 msgid "Car"
 msgstr "Teikn"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1440
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1441
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Heim"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 #, fuzzy
 msgid "Home 2"
 msgstr "Heim"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1443
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Heime-faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1444
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1445
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 #, fuzzy
 msgid "Mobile"
 msgstr "Mobil:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1446
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: mail/mail-config.glade.h:59
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Anna"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1447
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Alternativ faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1448
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "PersonsЬkjar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1449
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 #, fuzzy
 msgid "Primary"
 msgstr "Privat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1450
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 #, fuzzy
 msgid "Radio"
 msgstr "Tilfeldig"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1451
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1452
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 #, fuzzy
 msgid "TTY/TDD"
 msgstr "TTY/TDD-telefon"
@@ -1014,7 +1012,7 @@ msgid "Edit Full"
 msgstr "Rediger fil"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 #, fuzzy
 msgid "Full Name"
 msgstr "Fullt namn"
@@ -1193,7 +1191,7 @@ msgid "Add Anyway"
 msgstr "Legg til &ny"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 #, fuzzy
 msgid "Duplicate Contact Detected"
 msgstr "Lag kopi av side"
@@ -1216,27 +1214,27 @@ msgstr ""
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
-msgid "Change Anyway"
-msgstr "Endra vinkel"
-
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
-#, fuzzy
 msgid "Changed Contact:"
 msgstr "Endra skrift"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 #, fuzzy
 msgid "Conflicting Contact:"
 msgstr "Koplar til: "
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+#, fuzzy
+msgid "_Change Anyway"
+msgstr "Endra vinkel"
+
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:242
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "SЬk"
 
@@ -1388,9 +1386,9 @@ msgstr "Sender ei melding til ein nettverksspelar"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
 #: addressbook/gui/widgets/e-addressbook-view.c:604
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-mail-message.xml.h:53
-#: ui/evolution-tasks.xml.h:9 ui/my-evolution.xml.h:2
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Skriv ut"
 
@@ -1402,9 +1400,10 @@ msgstr "Private meldingar"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
 #: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:27
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-mail-message.xml.h:16 ui/evolution-tasks.xml.h:5
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Slett"
 
@@ -1420,7 +1419,7 @@ msgid "Success"
 msgstr "Vellukka"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
@@ -1429,7 +1428,7 @@ msgstr "Ukjend feil"
 msgid "Repository offline"
 msgstr "depot i vcs"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:475
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
 msgid "Permission denied"
 msgstr "Nekta tilgang"
 
@@ -1485,147 +1484,147 @@ msgid "Error removing list"
 msgstr "Feil ved fjerning av oppsett"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
 #, fuzzy
 msgid "Error removing card"
 msgstr "Feil ved fjerning av oppsett"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:700
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 #, fuzzy
 msgid "* Click here to add a contact *"
 msgstr "Trykk her for Е leggja til ein ny virtuell vert."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr "Arkiver som"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 #, fuzzy
 msgid "Email"
 msgstr "E-post 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "PrimФr telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 #, fuzzy
 msgid "Assistant Phone"
 msgstr "Telefon til assistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "Firma-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 #, fuzzy
 msgid "Callback Phone"
 msgstr "Ring tilbake"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 #, fuzzy
 msgid "Company Phone"
 msgstr "Hovudtelefon til firmaet"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "Heime-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 #, fuzzy
 msgid "Organization"
 msgstr "Organisasjon:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "Firma-adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "Heime-adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "Bil-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "Firma-telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "Heime-telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "Alternativ telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 #, fuzzy
 msgid "TTY"
 msgstr "TTY/TDD-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "Alternativ adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:729
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 #, fuzzy
 msgid "Department"
 msgstr "Avdeling:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 #, fuzzy
 msgid "Office"
 msgstr "K&ontor:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 #, fuzzy
 msgid "Title"
 msgstr "Tittel:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 #, fuzzy
 msgid "Profession"
 msgstr "&Yrke:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 #, fuzzy
 msgid "Manager"
 msgstr "PersonsЬkjar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 #, fuzzy
 msgid "Nickname"
 msgstr "Kallenamn:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 #, fuzzy
 msgid "Spouse"
 msgstr "Ektefelle"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 #, fuzzy
 msgid "Note"
 msgstr "Ingen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 msgid "Done."
 msgstr "Ferdig."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1114
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
 #, fuzzy
 msgid "Removing cards..."
 msgstr "&Suspender ..."
@@ -1675,7 +1674,8 @@ msgid "Dimensions:"
 msgstr "Dimensjonar"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Skrifttype ..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1827,20 +1827,25 @@ msgstr "Type:"
 msgid "Width:"
 msgstr "Breidd:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Skrifttype ..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 #, fuzzy
 msgid "Error while communicating with calendar server"
 msgstr "Feil ved tilkopling til tenar."
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 #, fuzzy
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -1882,6 +1887,11 @@ msgstr "ьydelagd oppsettfil."
 msgid "Factory for the sample Calendar control"
 msgstr "ьydelagd oppsettfil."
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "ьydelagd oppsettfil."
+
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
 msgstr ""
@@ -2001,138 +2011,160 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: calendar/gui/calendar-commands.c:278
-msgid "File not found"
-msgstr "Fann ikkje fil"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%1 bit %2 %3"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:302
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
 #, fuzzy
-msgid "Open calendar"
-msgstr "Feil ved opning"
+msgid "%a %d %b %Y"
+msgstr "%1 bit %2 %3"
+
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:344
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
 #, fuzzy
-msgid "Save calendar"
-msgstr "Ny kalender"
+msgid "%B %Y"
+msgstr "%1 %2"
 
-#: calendar/gui/calendar-commands.c:596
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:989
-#: calendar/gui/e-calendar-table.c:346
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 #, fuzzy
 msgid "Public"
 msgstr "Praksis"
 
-#: calendar/gui/calendar-model.c:386 calendar/gui/calendar-model.c:991
-#: calendar/gui/e-calendar-table.c:347
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:389 calendar/gui/calendar-model.c:993
-#: calendar/gui/e-calendar-table.c:348
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 #, fuzzy
 msgid "Confidential"
 msgstr "Eksponentiell"
 
-#: calendar/gui/calendar-model.c:392 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
 #: calendar/gui/dialogs/alarm-page.c:385
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: calendar/gui/calendar-model.c:489
+#: calendar/gui/calendar-model.c:497
 #, fuzzy
 msgid "N"
 msgstr "Nr"
 
-#: calendar/gui/calendar-model.c:489
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:491
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:491
+#: calendar/gui/calendar-model.c:499
 #, fuzzy
 msgid "W"
 msgstr "RW"
 
-#: calendar/gui/calendar-model.c:529 calendar/gui/calendar-model.c:1174
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
 #: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:368 mail/message-list.c:625
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 #, fuzzy
 msgid "High"
 msgstr "HЬgd"
 
-#: calendar/gui/calendar-model.c:531 calendar/gui/calendar-model.c:1176
-#: calendar/gui/calendar-model.c:1699
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:369 mail/message-list.c:624
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:533 calendar/gui/calendar-model.c:1178
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:370 mail/message-list.c:623
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 #, fuzzy
 msgid "Low"
 msgstr "Senk"
 
-#: calendar/gui/calendar-model.c:569 calendar/gui/calendar-model.c:1230
-#: calendar/gui/e-calendar-table.c:422
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 #, fuzzy
 msgid "Transparent"
 msgstr "Gjennomsiktig "
 
-#: calendar/gui/calendar-model.c:572 calendar/gui/calendar-model.c:1232
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 #, fuzzy
 msgid "Opaque"
 msgstr "Opna"
 
-#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1284
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
 #: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:442
+#: calendar/gui/e-calendar-table.c:403
 #, fuzzy
 msgid "Not Started"
 msgstr "Starta"
 
-#: calendar/gui/calendar-model.c:729 calendar/gui/calendar-model.c:1286
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
 #: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:443
+#: calendar/gui/e-calendar-table.c:404
 #, fuzzy
 msgid "In Progress"
 msgstr "Framgong:"
 
-#: calendar/gui/calendar-model.c:732 calendar/gui/calendar-model.c:1288
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "Ferdig"
 
-#: calendar/gui/calendar-model.c:735 calendar/gui/calendar-model.c:1290
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
 #: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:445 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Avbroten"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:885 e-util/e-time-utils.c:267
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:888 e-util/e-time-utils.c:276
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:893
+#: calendar/gui/calendar-model.c:901
 #, fuzzy, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2140,65 +2172,70 @@ msgid ""
 "%s"
 msgstr "Ein bandindeks mЕ vera valt i treet."
 
-#: calendar/gui/calendar-model.c:973
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:987 calendar/gui/calendar-model.c:1228
-#: calendar/gui/calendar-model.c:1282
-#: calendar/gui/dialogs/e-timezone-dialog.c:197
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
 #: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:345 calendar/gui/e-calendar-table.c:420
-#: mail/mail-account-gui.c:1360 mail/mail-accounts.c:129
-#: mail/mail-accounts.c:380 mail/mail-config.glade.h:56
-#: shell/e-shell-view.c:1406 widgets/misc/e-cell-date-edit.c:240
-#: widgets/misc/e-dateedit.c:439 widgets/misc/e-dateedit.c:1369
-#: widgets/misc/e-dateedit.c:1484
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:1078
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1118
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1159
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1172
+#: calendar/gui/calendar-model.c:1181
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:371
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1213
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1701
+#: calendar/gui/calendar-model.c:1710
 #, fuzzy
 msgid "Recurring"
 msgstr "Repetering"
 
-#: calendar/gui/calendar-model.c:1703
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 #, fuzzy
 msgid "No"
 msgstr "&No"
@@ -2287,7 +2324,7 @@ msgstr "Terminalprogram:"
 msgid "With these arguments:"
 msgstr "KЬyr %s med desse arguenta:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:81
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
 #, fuzzy
 msgid "days"
 msgstr " dag"
@@ -2297,12 +2334,12 @@ msgstr " dag"
 msgid "extra times every"
 msgstr "Oppdater kvart"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:82
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
 #, fuzzy
 msgid "hours"
 msgstr "time/timar"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
 msgid "minutes"
 msgstr "minutt"
 
@@ -2408,7 +2445,7 @@ msgstr "KBasic"
 #: calendar/gui/dialogs/alarm-page.glade.h:2
 #: calendar/gui/dialogs/recurrence-page.glade.h:3
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-itip-control.c:297
+#: calendar/gui/e-itip-control.c:298
 #, fuzzy
 msgid "Date/Time:"
 msgstr "Dato/tid"
@@ -2422,7 +2459,7 @@ msgstr "PЕminning:"
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:10
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-itip-control.c:286 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
 #, fuzzy
 msgid "Summary:"
 msgstr "Samandrag:"
@@ -2457,7 +2494,7 @@ msgstr "&Slett avtale"
 msgid "hour(s)"
 msgstr "time/timar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:105
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
 #, fuzzy
 msgid "minute(s)"
 msgstr "minutt"
@@ -2506,8 +2543,7 @@ msgid "Beep when alarm windows appear."
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: my-evolution/my-evolution.glade.h:6 shell/e-shortcuts.c:1014
-#: ui/evolution-calendar.xml.h:4
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 #, fuzzy
 msgid "Calendar"
 msgstr "Skriv ut alle"
@@ -2546,7 +2582,7 @@ msgid "Defaults"
 msgstr "Standard"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Display"
 msgstr "Vis"
@@ -2565,7 +2601,7 @@ msgid "Fri"
 msgstr "Fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:978
+#: calendar/gui/dialogs/recurrence-page.c:969
 #, fuzzy
 msgid "Friday"
 msgstr "Fredag"
@@ -2575,7 +2611,7 @@ msgid "Mon"
 msgstr "MЕn"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:974
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "MЕndag"
 
@@ -2599,7 +2635,7 @@ msgid "Sat"
 msgstr "Lau"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:979
+#: calendar/gui/dialogs/recurrence-page.c:970
 #, fuzzy
 msgid "Saturday"
 msgstr "Laurdag"
@@ -2624,7 +2660,7 @@ msgid "Sun"
 msgstr "Sun"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:980
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Sundag"
 
@@ -2643,7 +2679,7 @@ msgid "Thu"
 msgstr "Tor"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:977
+#: calendar/gui/dialogs/recurrence-page.c:968
 #, fuzzy
 msgid "Thursday"
 msgstr "Torsdag"
@@ -2672,7 +2708,7 @@ msgid "Tue"
 msgstr "Tys"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:975
+#: calendar/gui/dialogs/recurrence-page.c:966
 #, fuzzy
 msgid "Tuesday"
 msgstr "Tysdag"
@@ -2682,7 +2718,7 @@ msgid "Wed"
 msgstr "Ons"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:976
+#: calendar/gui/dialogs/recurrence-page.c:967
 #, fuzzy
 msgid "Wednesday"
 msgstr "Onsdag"
@@ -2766,31 +2802,31 @@ msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
 #: calendar/gui/dialogs/comp-editor-util.c:154
-#: calendar/gui/e-itip-control.c:582 calendar/gui/print.c:2115
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
 #, fuzzy
 msgid " to "
 msgstr " til:"
 
 #: calendar/gui/dialogs/comp-editor-util.c:158
-#: calendar/gui/e-itip-control.c:586 calendar/gui/print.c:2119
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
 #, fuzzy
 msgid " (Completed "
 msgstr "Ferdig"
 
 #: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:588 calendar/gui/print.c:2121
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
 #, fuzzy
 msgid "Completed "
 msgstr "Ferdig"
 
 #: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:593 calendar/gui/print.c:2126
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
 #, fuzzy
 msgid " (Due "
 msgstr " Slett "
 
 #: calendar/gui/dialogs/comp-editor-util.c:167
-#: calendar/gui/e-itip-control.c:595 calendar/gui/print.c:2128
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
 #, fuzzy
 msgid "Due "
 msgstr "Forfall"
@@ -2820,13 +2856,13 @@ msgstr ""
 msgid "No summary"
 msgstr "oppsummering"
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1462
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
 #: mail/mail-display.c:98
 #, fuzzy
 msgid "Overwrite file?"
 msgstr "Overskriv filer"
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1466
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
 #: mail/mail-display.c:102
 #, fuzzy
 msgid ""
@@ -2835,7 +2871,7 @@ msgid ""
 msgstr "Ei fil med det namnet finst alt. Vil du skriva over den?"
 
 #: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+#: widgets/misc/e-filter-bar.h:101
 #, fuzzy
 msgid "Save As..."
 msgstr "Lagra som ..."
@@ -2981,12 +3017,136 @@ msgstr "Slutt-tid:"
 msgid "_Start time:"
 msgstr "Start-tid:"
 
-#: calendar/gui/dialogs/meeting-page.c:614
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Gruppenamn:"
+
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Kjelder"
+
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+#, fuzzy
+msgid "Chair"
+msgstr "Teikn"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+#, fuzzy
+msgid "Required Participant"
+msgstr "Tenarinformasjon"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+#, fuzzy
+msgid "Optional Participant"
+msgstr "Personleg informasjon"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Vel ikon"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Accepted"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr "Slett"
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Mellombels"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Slett"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "Framgong:"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Bil-telefon"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Tenarinformasjon"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Personleg informasjon"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Non-Participants"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:891
 #, fuzzy
 msgid "Sent By:"
 msgstr "Sende byte"
 
-#: calendar/gui/dialogs/meeting-page.c:1191
+#: calendar/gui/dialogs/meeting-page.c:1442
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "F&jern rad ..."
@@ -3029,14 +3189,14 @@ msgid "Role"
 msgstr "Mobil:"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:50
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
 #: mail/message-list.etspec.h:8
 #, fuzzy
 msgid "Status"
 msgstr "Status:"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:96
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
 #: shell/glade/e-active-connection-dialog.glade.h:5
 #, fuzzy
 msgid "Type"
@@ -3064,36 +3224,36 @@ msgstr "Andre ..."
 msgid "_Other Organizer"
 msgstr "Planleggjar"
 
-#: calendar/gui/dialogs/recurrence-page.c:434 calendar/gui/print.c:1839
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
 #: calendar/gui/print.c:1841 calendar/gui/print.c:1842
 #, fuzzy
 msgid "%a %b %d %Y"
 msgstr "%1 bit %2 %3"
 
-#: calendar/gui/dialogs/recurrence-page.c:582
+#: calendar/gui/dialogs/recurrence-page.c:584
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:947
+#: calendar/gui/dialogs/recurrence-page.c:938
 #, fuzzy
 msgid "on"
 msgstr "MЕn"
 
-#: calendar/gui/dialogs/recurrence-page.c:973 filter/filter-datespec.c:81
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
 msgid "day"
 msgstr "dagen"
 
-#: calendar/gui/dialogs/recurrence-page.c:1103
+#: calendar/gui/dialogs/recurrence-page.c:1094
 #, fuzzy
 msgid "on the"
 msgstr "MЕnad"
 
-#: calendar/gui/dialogs/recurrence-page.c:1111
+#: calendar/gui/dialogs/recurrence-page.c:1102
 #, fuzzy
 msgid "th"
 msgstr "4."
 
-#: calendar/gui/dialogs/recurrence-page.c:1281
+#: calendar/gui/dialogs/recurrence-page.c:1274
 #, fuzzy
 msgid "occurrences"
 msgstr "gong(ar)"
@@ -3201,7 +3361,7 @@ msgid "No one"
 msgstr "Ingen"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:894
+#: my-evolution/e-summary-preferences.c:889
 #, fuzzy
 msgid "URL:"
 msgstr "URL:"
@@ -3240,109 +3400,110 @@ msgstr "Prioritet:"
 msgid "_Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-calendar-table.c:390
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:391
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:392
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:393
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:394
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:395
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:396
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:397
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:399
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:400
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:886
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
 #, fuzzy
-msgid "Edit this task"
-msgstr "&Endra avtale ..."
+msgid "_Open"
+msgstr "Opna ..."
 
-#: calendar/gui/e-calendar-table.c:887 calendar/gui/e-calendar-table.c:897
-#: calendar/gui/e-day-view.c:3332 calendar/gui/e-week-view.c:3170
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-calendar.xml.h:10
-#: ui/evolution-mail-list.xml.h:4
-msgid "Cut"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+#, fuzzy
+msgid "C_ut"
 msgstr "Klipp ut"
 
-#: calendar/gui/e-calendar-table.c:888 calendar/gui/e-calendar-table.c:898
-#: calendar/gui/e-day-view.c:3334 calendar/gui/e-week-view.c:3172
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-calendar.xml.h:5
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:5
-msgid "Copy"
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+#, fuzzy
+msgid "_Copy"
 msgstr "Kopier"
 
-#: calendar/gui/e-calendar-table.c:889 calendar/gui/e-calendar-table.c:899
-#: calendar/gui/e-day-view.c:3307 calendar/gui/e-day-view.c:3336
-#: calendar/gui/e-week-view.c:3146 calendar/gui/e-week-view.c:3174
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:26
-#: ui/evolution-mail-list.xml.h:12
-msgid "Paste"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+#, fuzzy
+msgid "_Paste"
 msgstr "Lim inn"
 
-#: calendar/gui/e-calendar-table.c:891
+#: calendar/gui/e-calendar-table.c:861
 #, fuzzy
-msgid "Mark as complete"
+msgid "_Mark as Complete"
 msgstr "Marker alle som l&esne"
 
-#: calendar/gui/e-calendar-table.c:892
+#: calendar/gui/e-calendar-table.c:863
 #, fuzzy
-msgid "Delete this task"
+msgid "_Delete this Task"
 msgstr "Slett denne adressa"
 
-#: calendar/gui/e-calendar-table.c:901
+#: calendar/gui/e-calendar-table.c:866
 #, fuzzy
-msgid "Mark tasks as complete"
+msgid "_Mark Tasks as Complete"
 msgstr "Marker alle som l&esne"
 
-#: calendar/gui/e-calendar-table.c:902 ui/evolution-tasks.xml.h:6
+#: calendar/gui/e-calendar-table.c:868
 #, fuzzy
-msgid "Delete selected tasks"
+msgid "_Delete Selected Tasks"
 msgstr "Slett den valte oppgЕva"
 
-#: calendar/gui/e-calendar-table.c:1259
+#: calendar/gui/e-calendar-table.c:1137
 #, fuzzy
 msgid "Click here to add a task"
 msgstr "Trykk her for Е leggja til ein ny virtuell vert."
@@ -3362,8 +3523,8 @@ msgstr "Alarm"
 msgid "Categories"
 msgstr "Kategoriar"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:696
-#: camel/camel-filter-driver.c:808
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
 #, fuzzy
 msgid "Complete"
 msgstr "Ferdig"
@@ -3427,13 +3588,6 @@ msgstr ""
 msgid "%A %d %B"
 msgstr ""
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:289 calendar/gui/e-day-view.c:1344
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr ""
-
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
 #: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
@@ -3454,152 +3608,146 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3312 ui/evolution-calendar.xml.h:21
+#: calendar/gui/e-day-view.c:3306
 #, fuzzy
-msgid "New Appointment"
+msgid "New _Appointment"
 msgstr "&Vis avtale ..."
 
-#: calendar/gui/e-day-view.c:3314 calendar/gui/e-week-view.c:3153
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
 #, fuzzy
-msgid "New All Day Event"
+msgid "New All Day _Event"
 msgstr "Ny &hending ..."
 
-#: calendar/gui/e-day-view.c:3319 calendar/gui/e-week-view.c:3158
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
 #, fuzzy
-msgid "Go to Today"
+msgid "Go to _Today"
 msgstr "GЕ til &i dag"
 
-#: calendar/gui/e-day-view.c:3321 calendar/gui/e-week-view.c:3160
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
 #, fuzzy
-msgid "Go to Date..."
+msgid "_Go to Date..."
 msgstr "&GЕ til side ..."
 
-#: calendar/gui/e-day-view.c:3328 calendar/gui/e-week-view.c:3166
-#: shell/e-shortcuts-view.c:468 ui/evolution-calendar.xml.h:24
-#: ui/evolution-message-composer.xml.h:12
-#, fuzzy
-msgid "Open"
-msgstr "Opna ..."
-
-#: calendar/gui/e-day-view.c:3330 calendar/gui/e-week-view.c:3168
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
 #, fuzzy
-msgid "Delete this Appointment"
+msgid "_Delete this Appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/e-day-view.c:3345 calendar/gui/e-week-view.c:3188
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
 #, fuzzy
-msgid "Make this Occurrence Movable"
+msgid "Make this Occurrence _Movable"
 msgstr "Se&nd avtale"
 
-#: calendar/gui/e-day-view.c:3347 calendar/gui/e-week-view.c:3190
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
 #, fuzzy
-msgid "Delete this Occurrence"
+msgid "Delete this _Occurrence"
 msgstr "Erstatt denne fЬrekomsten?"
 
-#: calendar/gui/e-day-view.c:3349
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
 #, fuzzy
-msgid "Delete all Occurrences"
+msgid "Delete _All Occurrences"
 msgstr "Slettar klassen"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:694
 #, fuzzy
 msgid "This is an event that can be added to your calendar."
 msgstr "Dette er ei topptekstramme - ho kan ikkje slettast."
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:697
 #, fuzzy
 msgid "This is a meeting request."
 msgstr "Dette er ei repeterande hending."
 
-#: calendar/gui/e-itip-control.c:655
+#: calendar/gui/e-itip-control.c:700
 #, fuzzy
 msgid "This is one or more additions to a current meeting."
 msgstr ""
 "Dette er fЬrste nivЕ\n"
 "i denne samlinga."
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:703
 #, fuzzy
 msgid "This is a request for the latest event information."
 msgstr "Dette er ei fЬrehandsvising av det valte bakgrunnsbiletet."
 
-#: calendar/gui/e-itip-control.c:661
+#: calendar/gui/e-itip-control.c:706
 #, fuzzy
 msgid "This is a reply to a meeting request."
 msgstr "Dette er ei repeterande hending."
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:709
 #, fuzzy
 msgid "This is an event cancellation."
 msgstr ""
 "Dette er det siste nivЕet\n"
 "i denne samlinga."
 
-#: calendar/gui/e-itip-control.c:667 calendar/gui/e-itip-control.c:707
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 #, fuzzy
 msgid "The message is not understandable."
 msgstr "Meldinga har ingen sendar"
 
-#: calendar/gui/e-itip-control.c:692
+#: calendar/gui/e-itip-control.c:737
 msgid "This is an task that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:740
 #, fuzzy
 msgid "This is a task request."
 msgstr "Dette er ei repeterande hending."
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:743
 #, fuzzy
 msgid "This is a request for the latest task information."
 msgstr "Dette er ei fЬrehandsvising av det valte bakgrunnsbiletet."
 
-#: calendar/gui/e-itip-control.c:701
+#: calendar/gui/e-itip-control.c:746
 #, fuzzy
 msgid "This is a reply to a task request."
 msgstr ""
 "Dette er ein katalog og inga fil:\n"
 "%s"
 
-#: calendar/gui/e-itip-control.c:704
+#: calendar/gui/e-itip-control.c:749
 #, fuzzy
 msgid "This is an task cancellation."
 msgstr "Dette er inga lokal fil.\n"
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:771
 #, fuzzy
 msgid "This is freebusy information."
 msgstr "Skriv avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:729
+#: calendar/gui/e-itip-control.c:774
 #, fuzzy
 msgid "This is a request for freebusy information."
 msgstr "PrЬv ╚%s --help╩ for meir informasjon\n"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:777
 msgid "This is a reply to a freebusy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:755
+#: calendar/gui/e-itip-control.c:834
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:853
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "Meldinga har ingen sendar"
 
-#: calendar/gui/e-itip-control.c:792
+#: calendar/gui/e-itip-control.c:877
 msgid "The information contained in this attachment was not valid"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:883
+#: calendar/gui/e-itip-control.c:989
 #, fuzzy
 msgid "I couldn't update your calendar file!\n"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/gui/e-itip-control.c:908
+#: calendar/gui/e-itip-control.c:1015
 #, fuzzy
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
@@ -3647,22 +3795,22 @@ msgstr ""
 msgid "date-start"
 msgstr " start"
 
-#: calendar/gui/e-tasks.c:184 calendar/gui/e-tasks.c:521
-#: calendar/gui/e-tasks.c:554
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:190
+#: calendar/gui/e-tasks.c:252
 #, fuzzy
 msgid "Category:"
 msgstr "Kategoriar"
 
-#: calendar/gui/e-tasks.c:329
+#: calendar/gui/e-tasks.c:403
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/gui/e-tasks.c:341
+#: calendar/gui/e-tasks.c:415
 #, fuzzy, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden %1 er ikkje stЬtta."
@@ -3676,37 +3824,12 @@ msgstr "Metoden %1 er ikkje stЬtta."
 msgid "%d %B"
 msgstr "%1 %2"
 
-#: calendar/gui/e-week-view.c:3151 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
 #, fuzzy
-msgid "New Appointment..."
+msgid "New _Appointment..."
 msgstr "&Vis avtale ..."
 
-#: calendar/gui/e-week-view.c:3192
-#, fuzzy
-msgid "Delete All Occurrences"
-msgstr "Slettar klassen"
-
-#: calendar/gui/gnome-cal.c:219
-#, fuzzy
-msgid "Summary contains"
-msgstr "SpЬrjinga inneheld"
-
-#: calendar/gui/gnome-cal.c:220
-#, fuzzy
-msgid "Description contains"
-msgstr "Skildringar"
-
-#: calendar/gui/gnome-cal.c:221
-#, fuzzy
-msgid "Comment contains"
-msgstr "ikkje inneheld"
-
-#: calendar/gui/gnome-cal.c:222
-#, fuzzy
-msgid "Has category"
-msgstr "Kategori"
-
-#: calendar/gui/gnome-cal.c:1058
+#: calendar/gui/gnome-cal.c:999
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
@@ -3714,7 +3837,7 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: calendar/gui/gnome-cal.c:1069
+#: calendar/gui/gnome-cal.c:1010
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden %1 er ikkje stЬtta."
@@ -3789,7 +3912,7 @@ msgstr "September"
 msgid "_Go To Today"
 msgstr "GЕ til &i dag"
 
-#: calendar/gui/itip-utils.c:223
+#: calendar/gui/itip-utils.c:224
 msgid "An organizer must be set."
 msgstr ""
 
@@ -3952,15 +4075,15 @@ msgstr "Fre"
 msgid "Sa"
 msgstr "Lau"
 
-#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:156
-#: my-evolution/e-summary-tasks.c:172 shell/e-shortcuts.c:1015
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "OppgЕver"
 
 #. Day
 #: calendar/gui/print.c:1815
-msgid "Current day (%a %b %d %Y)"
+msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
 #: calendar/gui/print.c:1834 calendar/gui/print.c:1838
@@ -3973,45 +4096,45 @@ msgstr ""
 
 #: calendar/gui/print.c:1846
 #, c-format
-msgid "Current week (%s - %s)"
+msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
 #: calendar/gui/print.c:1854
 #, fuzzy
-msgid "Current month (%b %Y)"
+msgid "Selected month (%b %Y)"
 msgstr "Denne mЕnaden"
 
 #. Year
 #: calendar/gui/print.c:1861
 #, fuzzy
-msgid "Current year (%Y)"
+msgid "Selected year (%Y)"
 msgstr "Gjeldande: %1"
 
-#: calendar/gui/print.c:2199
+#: calendar/gui/print.c:2200
 #, fuzzy
 msgid "Print Calendar"
 msgstr "Skriv ut alle"
 
-#: calendar/gui/print.c:2287 calendar/gui/print.c:2379
-#: mail/mail-callbacks.c:1820 my-evolution/e-summary.c:498
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:31
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:10
 #, fuzzy
 msgid "Print Preview"
 msgstr "&FЬrehandsvising ..."
 
-#: calendar/gui/print.c:2316
+#: calendar/gui/print.c:2317
 #, fuzzy
 msgid "Print Item"
 msgstr "Utskriftssystem"
 
-#: calendar/gui/print.c:2397
+#: calendar/gui/print.c:2398
 #, fuzzy
 msgid "Print Setup"
 msgstr "Speloppsett"
 
-#: calendar/gui/tasks-control.c:122
+#: calendar/gui/tasks-control.c:126
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "Viser korleis datoverdiar vert viste."
@@ -4099,59 +4222,59 @@ msgstr "Registrerer hjЕ tenaren ..."
 msgid "You must be working online to complete this operation"
 msgstr "Kan ikkje gjera LIST-operasjon ferdig"
 
-#: camel/camel-filter-driver.c:530 camel/camel-filter-driver.c:539
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 #, fuzzy
 msgid "Syncing folders"
 msgstr "Synkroniser"
 
-#: camel/camel-filter-driver.c:641
+#: camel/camel-filter-driver.c:644
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Kan ikkje 'chown' 'spool'-katalogen"
 
-#: camel/camel-filter-driver.c:650
+#: camel/camel-filter-driver.c:653
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Kan ikkje laga 'spool'-katalog"
 
-#: camel/camel-filter-driver.c:664
-#, fuzzy, c-format
+#: camel/camel-filter-driver.c:667
+#, fuzzy
 msgid "Getting message %d (%d%%)"
 msgstr "Mottek meldingar frЕ %1"
 
-#: camel/camel-filter-driver.c:668 camel/camel-filter-driver.c:681
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Kunne ikkje leggja til melding:\n"
 
-#: camel/camel-filter-driver.c:669
+#: camel/camel-filter-driver.c:672
 #, fuzzy
 msgid "Cannot open message"
 msgstr "Kan ikkje dekryptera melding:"
 
-#: camel/camel-filter-driver.c:692 camel/camel-filter-driver.c:803
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Synkroniser"
 
-#: camel/camel-filter-driver.c:762
+#: camel/camel-filter-driver.c:766
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "Mottek meldingar frЕ %1"
 
-#: camel/camel-filter-driver.c:767 camel/camel-filter-driver.c:785
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "Mottek meldingar frЕ %1"
 
-#: camel/camel-filter-driver.c:885
+#: camel/camel-filter-driver.c:892
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-filter-driver.c:891
+#: camel/camel-filter-driver.c:898
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
@@ -4388,7 +4511,7 @@ msgid "Connection cancelled"
 msgstr "Avbroten."
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:270
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
@@ -4397,14 +4520,14 @@ msgstr ""
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
-#: camel/camel-remote-store.c:470
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Feil ved opning"
 
-#: camel/camel-remote-store.c:476
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr ""
 
@@ -4502,7 +4625,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:438
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -4573,7 +4696,7 @@ msgstr ""
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:479
+#: camel/camel-session.c:481
 #, fuzzy, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4621,13 +4744,6 @@ msgstr "Kunne ikkje leggja til melding:\n"
 msgid "Failed to verify certificates."
 msgstr "еtvaring ved &tilbaketrekte sertifikat"
 
-#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:987 mail/mail-ops.c:994
-#: mail/mail-ops.c:1012 mail/mail-ops.c:1013
-#, fuzzy
-msgid "Trash"
-msgstr "OppgЕve"
-
 #: camel/camel-tcp-stream-openssl.c:415
 #, fuzzy, c-format
 msgid ""
@@ -4681,26 +4797,26 @@ msgstr "Vidaresendt melding"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
 
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:325
 #, fuzzy, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Slett e-post frЕ tenaren"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:493
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:530
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
@@ -4721,18 +4837,29 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:430
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
 #, fuzzy
-msgid "Scanning IMAP folder"
-msgstr "Leitar etter tilleggsmodular"
+msgid "Scanning for changed messages"
+msgstr "Melding"
 
-#: camel/providers/imap/camel-imap-folder.c:1483
-#: camel/providers/imap/camel-imap-folder.c:1819
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 #, fuzzy
 msgid "This message is not currently available"
 msgstr "%1 er ikkje tilgjengeleg."
 
-#: camel/providers/imap/camel-imap-folder.c:1852
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Melding"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -4743,7 +4870,7 @@ msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:16
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 #, fuzzy
 msgid "Checking for new mail"
 msgstr "Berre sjekk for ny e-post."
@@ -4753,7 +4880,7 @@ msgstr "Berre sjekk for ny e-post."
 msgid "Check for new messages in all folders"
 msgstr "Berre sjekk for ny e-post."
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:646
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Mapper"
 
@@ -4787,28 +4914,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:471
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentisering:"
 
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:510
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:536
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4816,11 +4943,15 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:825 mail/mail-local.c:325
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Vidaresendt melding"
 
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
+
 #: camel/providers/local/camel-local-provider.c:40
 #, fuzzy
 msgid "MH-format mail directories"
@@ -5103,7 +5234,7 @@ msgstr ""
 #: camel/providers/local/camel-mbox-summary.c:502
 #: camel/providers/local/camel-mbox-summary.c:703
 #: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1468
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "Synkroniser"
@@ -5165,7 +5296,7 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
 #: camel/providers/local/camel-spool-summary.c:545
 #: camel/providers/local/camel-spool-summary.c:1106
 #, fuzzy, c-format
@@ -5364,7 +5495,7 @@ msgstr "&La e-posten liggja pЕ tenaren."
 msgid "Delete after %s day(s)"
 msgstr "Slett denne adressa"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:62
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr ""
 
@@ -5444,7 +5575,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Sendmail"
 msgstr "Send"
@@ -5498,7 +5629,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:76
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr ""
 
@@ -5506,127 +5637,127 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:180
 #, fuzzy
 msgid "Help message"
 msgstr "Lagra melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:182
 #, fuzzy
 msgid "Service ready"
 msgstr "Skjul"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:212
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "Ingen passord oppgitt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:218
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:220
 #, fuzzy
 msgid "Authentication required"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:314
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:357
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:396
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "Oppgi ditt OpenPGP-passord"
 
-#: camel/providers/smtp/camel-smtp-transport.c:419
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5634,114 +5765,129 @@ msgid ""
 "\n"
 msgstr "Kunne ikkje starta underprosess."
 
-#: camel/providers/smtp/camel-smtp-transport.c:535
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, fuzzy, c-format
 msgid "SMTP server %s"
 msgstr "Diskusjonsgruppetenarar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:537
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:562
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:569
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:583
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#, fuzzy
+msgid "Sending message"
+msgstr "Sen melding"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:677
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, fuzzy
+msgid "SMTP Greeting"
+msgstr "MЬte"
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:729
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:744
-#: camel/providers/smtp/camel-smtp-transport.c:756
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Autentisering:"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:782
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:810
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:836
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:855
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:899
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, fuzzy, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:966
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1003
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1027
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1046
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Ukjend feil"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
@@ -5772,7 +5918,7 @@ msgid "%.1fG"
 msgstr "%1 GB"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:131
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 #, fuzzy
 msgid "attachment"
 msgstr "Vedlegg"
@@ -5811,7 +5957,7 @@ msgstr "MIME-type"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:325
+#: composer/e-msg-composer-hdrs.c:328
 #, fuzzy
 msgid "Click here for the address book"
 msgstr "Legg adresse til adresseboka"
@@ -5819,14 +5965,14 @@ msgstr "Legg adresse til adresseboka"
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:356
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "FrЕ:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:362
+#: composer/e-msg-composer-hdrs.c:365
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Svar"
@@ -5834,34 +5980,34 @@ msgstr "Svar"
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:391
 #, fuzzy
 msgid "Enter the recipients of the message"
 msgstr "Oppgi eit nytt namn pЕ meldinga."
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:394
 #, fuzzy
 msgid "Cc:"
 msgstr "&CC:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:398
 #, fuzzy
 msgid "Bcc:"
 msgstr "&Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -5892,67 +6038,67 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: composer/e-msg-composer.c:869
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Lagra som ..."
 
-#: composer/e-msg-composer.c:878
+#: composer/e-msg-composer.c:882
 #, fuzzy
 msgid "Warning!"
 msgstr "Flyttar"
 
-#: composer/e-msg-composer.c:880
+#: composer/e-msg-composer.c:884
 #, fuzzy
 msgid "File exists, overwrite?"
 msgstr "Loggfil eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:902
+#: composer/e-msg-composer.c:906
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:922
+#: composer/e-msg-composer.c:926
 #, fuzzy, c-format
 msgid "Error loading file: %s"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:997
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1047
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1055
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikkje motta fil"
 
-#: composer/e-msg-composer.c:1057
+#: composer/e-msg-composer.c:1061
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1063
+#: composer/e-msg-composer.c:1067
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1072
+#: composer/e-msg-composer.c:1076
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5961,18 +6107,13 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1169
+#: composer/e-msg-composer.c:1173
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
 "Would you like to attempt recovery?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1318 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:215
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:1324
+#: composer/e-msg-composer.c:1321
 #, fuzzy
 msgid ""
 "This message has not been sent.\n"
@@ -5982,20 +6123,25 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: composer/e-msg-composer.c:1349
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Opna fil"
 
-#: composer/e-msg-composer.c:1498
+#: composer/e-msg-composer.c:1500
 msgid "Insert File"
 msgstr "Set inn fil"
 
-#: composer/e-msg-composer.c:1854 composer/e-msg-composer.c:2242
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 #, fuzzy
 msgid "Compose a message"
 msgstr "Lukk melding"
 
-#: composer/e-msg-composer.c:2336
+#: composer/e-msg-composer.c:2351
 #, fuzzy
 msgid "Could not create composer window."
 msgstr "Kan ikkje laga nytt vindauge.\n"
@@ -6026,75 +6172,59 @@ msgstr "Adresse"
 msgid "calendar information"
 msgstr "Informasjon"
 
-#: default_user/searches.xml.h:1
-#, fuzzy
-msgid "Body contains"
-msgstr "Handlingar"
-
-#: default_user/searches.xml.h:2
-#, fuzzy
-msgid "Body does not contain"
-msgstr "ikkje inneheld"
-
-#: default_user/searches.xml.h:3
-#, fuzzy
-msgid "Body or subject contains"
-msgstr "Emne"
-
-#: default_user/searches.xml.h:4
-#, fuzzy
-msgid "Sender contains"
-msgstr "SpЬrjinga inneheld"
-
-#: default_user/searches.xml.h:5
-#, fuzzy
-msgid "Subject contains"
-msgstr "Emne"
-
-#: default_user/searches.xml.h:6
-#, fuzzy
-msgid "Subject does not contain"
-msgstr "Emne"
-
 #. strptime format for a date.
-#: e-util/e-time-utils.c:64 e-util/e-time-utils.c:106
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1312 widgets/misc/e-dateedit.c:1493
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr ""
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:77 e-util/e-time-utils.c:187
-#: e-util/e-time-utils.c:312
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
 #, fuzzy
 msgid "%I:%M:%S %p"
 msgstr "%H:%M"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:80 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:304
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
 #, fuzzy
 msgid "%H:%M:%S"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:83 e-util/e-time-utils.c:194
-#: e-util/e-time-utils.c:309 widgets/misc/e-dateedit.c:1290
-#: widgets/misc/e-dateedit.c:1349 widgets/misc/e-dateedit.c:1528
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
 #, fuzzy
 msgid "%I:%M %p"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
-#: e-util/e-time-utils.c:301 widgets/misc/e-dateedit.c:1287
-#: widgets/misc/e-dateedit.c:1346 widgets/misc/e-dateedit.c:1525
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
 #, fuzzy
 msgid "%H:%M"
 msgstr "%H:%M"
 
+#: e-util/e-time-utils.c:240
+msgid "%d/%m/%Y"
+msgstr ""
+
+#: e-util/e-time-utils.c:241
+msgid "%Y/%m/%d"
+msgstr ""
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "Tx"
+
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:258
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -6102,88 +6232,88 @@ msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:263
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr ""
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:272
+#: e-util/e-time-utils.c:312
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%H:%M"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 #, fuzzy
 msgid "year"
 msgstr "Еr"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 #, fuzzy
 msgid "years"
 msgstr "Еr"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 #, fuzzy
 msgid "month"
 msgstr "MЕnad"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 #, fuzzy
 msgid "months"
 msgstr "mЕnad(er)"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 #, fuzzy
 msgid "week"
 msgstr "Veke"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 #, fuzzy
 msgid "weeks"
 msgstr "Veke"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 #, fuzzy
 msgid "hour"
 msgstr "time/timar"
 
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 #, fuzzy
 msgid "minute"
 msgstr "minutt"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 #, fuzzy
 msgid "second"
 msgstr "sekund"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "sekund"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
-#: filter/filter-datespec.c:276
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:339
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -6191,37 +6321,42 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 #, fuzzy
 msgid "the current time"
 msgstr "tid no"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 #, fuzzy
 msgid "a time relative to the current time"
 msgstr "Vis hendingane for denne dagen"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 #, fuzzy
 msgid "Compare against"
 msgstr "KompilatorЕtvaringar"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 #, fuzzy
 msgid "now"
 msgstr "nei"
 
-#: filter/filter-datespec.c:579
+#: filter/filter-datespec.c:575
 #, fuzzy
 msgid " ago"
 msgstr "Tag"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:621
+#, fuzzy
+msgid "ago"
+msgstr "Tag"
+
+#: filter/filter-datespec.c:709
 #, fuzzy
 msgid "<click here to select a date>"
 msgstr "Trykk for Е velja ein skrifttype"
@@ -6248,8 +6383,8 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:292
-#: mail/mail-account-gui.c:766
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 #, fuzzy
 msgid "Select Folder"
 msgstr "Vel mappe"
@@ -6319,7 +6454,14 @@ msgstr "Koding"
 msgid "outgoing"
 msgstr "Oversikt"
 
-#: filter/filter.glade.h:3 mail/mail-config.glade.h:33
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Legg til"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
 msgid "Edit"
 msgstr "Rediger"
 
@@ -6461,141 +6603,136 @@ msgid "Expression"
 msgstr "&Yrke:"
 
 #: filter/libfilter-i18n.h:24
-#, fuzzy
-msgid "Forward to Address"
-msgstr "Vidaresendt melding"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 #, fuzzy
 msgid "is"
 msgstr "er"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "Mailing list"
 msgstr "E-post&liste for sprЕket:"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "Message Body"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 #, fuzzy
 msgid "Message Header"
 msgstr "Melding motteken"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 #, fuzzy
 msgid "Message was received"
 msgstr "Melding motteken"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 #, fuzzy
 msgid "Message was sent"
 msgstr "Lag meldingar og slЕ saman"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "on or after"
 msgstr "Slutt etter"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 #, fuzzy
 msgid "Read"
 msgstr "Tilfeldig"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 #, fuzzy
 msgid "Recipients"
 msgstr "Nyleg brukte fargar"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Replied to"
 msgstr "Svar til alle:"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:6
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Poengsum"
 
-#: filter/libfilter-i18n.h:43 mail/mail-callbacks.c:1062
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 #, fuzzy
 msgid "Sender"
 msgstr "Send"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 #, fuzzy
 msgid "Set Status"
 msgstr "Status:"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:44
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Storleik (KB)"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:46
 #, fuzzy
 msgid "Source Account"
 msgstr "Set opp konto"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:48
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:52 mail/mail-format.c:861
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Emne"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "was after"
 msgstr "Slutt etter"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:53
 msgid "was before"
 msgstr ""
 
@@ -6618,15 +6755,19 @@ msgstr "Rediger fil"
 msgid "Score Rules"
 msgstr "Rediger filterreglar"
 
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
 #: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
-#: importers/netscape-importer.c:764 importers/pine-importer.c:627
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
 #: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
 #: shell/importer/intelligent.c:194
 msgid "Import"
 msgstr ""
 
-#: importers/elm-importer.c:475 importers/netscape-importer.c:769
-#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:12
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
 #, fuzzy
 msgid "Mail"
 msgstr "Send"
@@ -6652,11 +6793,11 @@ msgid ""
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: importers/netscape-importer.c:774
+#: importers/netscape-importer.c:824
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: importers/netscape-importer.c:799
+#: importers/netscape-importer.c:849
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6717,26 +6858,40 @@ msgstr "ьydelagd oppsettfil."
 msgid "Mail configuration interface"
 msgstr "Oppsett"
 
-#: mail/component-factory.c:679
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "Eigenskapar ..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Endra namnet pЕ spelarane"
+
+#: mail/component-factory.c:757
 #, fuzzy
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/component-factory.c:813
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:253
+#: mail/folder-browser-ui.c:254
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Eigenskapar ..."
 
-#: mail/folder-browser-ui.c:255
+#: mail/folder-browser-ui.c:256
 #, fuzzy
 msgid "Properties"
 msgstr "Eigenskapar ..."
 
-#: mail/folder-browser.c:227 mail/mail-display.c:277
+#: mail/folder-browser.c:231 mail/mail-display.c:278
 #, fuzzy, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
@@ -6744,152 +6899,152 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: mail/folder-browser.c:884
+#: mail/folder-browser.c:893
 #, fuzzy
 msgid "Store search as vFolder"
 msgstr "Vel mappe"
 
-#: mail/folder-browser.c:1224
+#: mail/folder-browser.c:1238
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "Ingen emne"
 
-#: mail/folder-browser.c:1227
+#: mail/folder-browser.c:1241
 #, fuzzy
 msgid "VFolder on Se_nder"
 msgstr "Mappenamn:"
 
-#: mail/folder-browser.c:1230
+#: mail/folder-browser.c:1244
 #, fuzzy
 msgid "VFolder on _Recipients"
 msgstr "Mappa finst: "
 
-#: mail/folder-browser.c:1233
+#: mail/folder-browser.c:1247
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1239
+#: mail/folder-browser.c:1253
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Ingen emne"
 
-#: mail/folder-browser.c:1242
+#: mail/folder-browser.c:1256
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Fil under:"
 
-#: mail/folder-browser.c:1245
+#: mail/folder-browser.c:1259
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Skriv ut filer"
 
-#: mail/folder-browser.c:1248
+#: mail/folder-browser.c:1262
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1257
-#, fuzzy
-msgid "_Open"
-msgstr "Opna ..."
-
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1273
 #, fuzzy
 msgid "Resend"
 msgstr "Svar"
 
-#: mail/folder-browser.c:1261 ui/evolution-calendar.xml.h:54
-#: ui/evolution-mail-message.xml.h:86 ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 #, fuzzy
 msgid "_Save As..."
 msgstr "Lagra som ..."
 
-#: mail/folder-browser.c:1263 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 #, fuzzy
 msgid "_Print"
 msgstr "Skriv ut"
 
-#: mail/folder-browser.c:1268 ui/evolution-mail-message.xml.h:85
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Svar til avsendar:"
 
-#: mail/folder-browser.c:1270 ui/evolution-mail-message.xml.h:61
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Svar til:"
 
-#: mail/folder-browser.c:1272 ui/evolution-mail-message.xml.h:60
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _All"
 msgstr "Svar til alle:"
 
-#: mail/folder-browser.c:1274
+#: mail/folder-browser.c:1288
 #, fuzzy
 msgid "_Forward"
 msgstr "Fram"
 
-#: mail/folder-browser.c:1277
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "Mar&ker som ulesen"
 
-#: mail/folder-browser.c:1279
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 #, fuzzy
 msgid "Mark as U_nread"
 msgstr "Mar&ker som ulesen"
 
-#: mail/folder-browser.c:1281
+#: mail/folder-browser.c:1295
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Marker som lesen"
 
-#: mail/folder-browser.c:1286
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Marker som lesen"
+
+#: mail/folder-browser.c:1302
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "Flytt til mappe"
 
-#: mail/folder-browser.c:1288
+#: mail/folder-browser.c:1304
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "Kopier til mappe"
 
-#: mail/folder-browser.c:1292 ui/evolution-mail-message.xml.h:87
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Undelete"
 msgstr "Slett"
 
-#: mail/folder-browser.c:1297
+#: mail/folder-browser.c:1313
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "Legg til i adresseboka"
 
-#: mail/folder-browser.c:1302
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1306
+#: mail/folder-browser.c:1322
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "Mapper"
 
-#: mail/folder-browser.c:1445
+#: mail/folder-browser.c:1479
 #, fuzzy
 msgid "Filter on Mailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1446
+#: mail/folder-browser.c:1480
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1448
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1449
+#: mail/folder-browser.c:1483
 #, fuzzy, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Fil alt i liste"
@@ -6964,12 +7119,12 @@ msgstr "KDeelop-installering"
 msgid "Evolution Account Editor"
 msgstr "KDeelop-installering"
 
-#: mail/mail-account-gui.c:956
+#: mail/mail-account-gui.c:971
 #, fuzzy
 msgid "Save signature"
 msgstr "Vis sig&natur"
 
-#: mail/mail-account-gui.c:962
+#: mail/mail-account-gui.c:977
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -6979,31 +7134,40 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: mail/mail-accounts.c:130
+#: mail/mail-accounts.c:135
 #, fuzzy
 msgid " (default)"
 msgstr "Standard"
 
-#: mail/mail-accounts.c:169
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "Skru av"
 
-#: mail/mail-accounts.c:171 mail/mail-config.glade.h:37
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "pЕ"
 
-#: mail/mail-accounts.c:259 mail/mail-accounts.c:263
+#: mail/mail-accounts.c:264
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker pЕ at du vil sletta denne klassen?"
 
-#: mail/mail-accounts.c:504 mail/mail-accounts.c:508
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Slett"
+
+#: mail/mail-accounts.c:271
+msgid "Really delete account?"
+msgstr ""
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 #, fuzzy
 msgid "Are you sure you want to delete this news account?"
 msgstr "Er du sikker pЕ at du vil sletta denne klassen?"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:716
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr ""
 
@@ -7079,87 +7243,87 @@ msgstr ""
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:656
+#: mail/mail-callbacks.c:653
 #, fuzzy, c-format
 msgid "On %s, %s wrote:"
 msgstr "%D, skreiv %F:"
 
-#: mail/mail-callbacks.c:888
+#: mail/mail-callbacks.c:914
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Vidaresendt melding frЕ %1"
 
-#: mail/mail-callbacks.c:982
+#: mail/mail-callbacks.c:1011
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-callbacks.c:984
+#: mail/mail-callbacks.c:1013
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "&Kopier bileteplassering"
 
-#: mail/mail-callbacks.c:1339
+#: mail/mail-callbacks.c:1374
 #, fuzzy, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Er du sikker pЕ at du vil sletta %1?"
 
-#: mail/mail-callbacks.c:1361
+#: mail/mail-callbacks.c:1396
 #, fuzzy
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
 
-#: mail/mail-callbacks.c:1395
+#: mail/mail-callbacks.c:1430
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
 
-#: mail/mail-callbacks.c:1407
+#: mail/mail-callbacks.c:1442
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Er du sikker pЕ at du vil fjerna %1?"
 
-#: mail/mail-callbacks.c:1428
+#: mail/mail-callbacks.c:1463
 #, fuzzy
 msgid "No Message Selected"
 msgstr "Ingen rektangel valt!"
 
-#: mail/mail-callbacks.c:1510
+#: mail/mail-callbacks.c:1545
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Lagra melding"
 
-#: mail/mail-callbacks.c:1512
+#: mail/mail-callbacks.c:1547
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Lagra melding"
 
-#: mail/mail-callbacks.c:1722
+#: mail/mail-callbacks.c:1766
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "Les filinformasjon"
 
-#: mail/mail-callbacks.c:1732
+#: mail/mail-callbacks.c:1776
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:1780
+#: mail/mail-callbacks.c:1823
 #, fuzzy
 msgid "Print Message"
 msgstr "Private meldingar"
 
-#: mail/mail-callbacks.c:1827
+#: mail/mail-callbacks.c:1871
 #, fuzzy
 msgid "Printing of message failed"
 msgstr "Feil ved skriving av band-ID."
 
-#: mail/mail-callbacks.c:1922
+#: mail/mail-callbacks.c:1966
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Er du sikker pЕ at du vil sletta denne overfЬringa?"
@@ -7195,11 +7359,11 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:463
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-config.c:1583 mail/mail-config.c:1586
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 #, fuzzy
 msgid "Connecting to server..."
 msgstr " Koplar til tenar ..."
@@ -7216,64 +7380,69 @@ msgstr "farge"
 
 #: mail/mail-config.glade.h:3
 #, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Den oppgitte fila finst ikkje"
+
+#: mail/mail-config.glade.h:4
+#, fuzzy
 msgid "Account"
 msgstr "SmЕ ikon"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "Account Information"
 msgstr "Informasjon"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Kontoar"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:11
 msgid "Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
 #, fuzzy
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Authentication"
 msgstr "Autentisering:"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "Authentication Type: "
 msgstr "Autentisering:"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Automatically check for new mail every"
 msgstr "enkle innlegg"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Certificate ID:"
 msgstr "Dine SSL-sertifikat"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:18
 msgid "Composer"
 msgstr "Ny melding"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -7283,304 +7452,326 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "De_fault"
 msgstr "Standard"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:26
 #, fuzzy
-msgid "Default \"Forward\" style is: "
+msgid "Default Forward style is: "
 msgstr "Fjern ramme"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Default character set: "
 msgstr "Standardteiknsett"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Digital IDs..."
 msgstr "Detaljar ..."
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Done"
 msgstr "Ingen"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Kladd"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Drafts folder:"
 msgstr "Lagra i &kladdemappe"
 
-#: mail/mail-config.glade.h:34 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Endra ..."
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:36
 #, fuzzy
 msgid "Email Address:"
 msgstr "E-post-adresse:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37
 #, fuzzy
 msgid "Empty trash folders on exit"
 msgstr "TЬm papirkorg ved avslutting"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "pЕ"
+
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Full Name:"
 msgstr "Fullt namn"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Get Digital ID..."
 msgstr "Les band-ID ..."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "HTML Signature:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Highlight citations with"
 msgstr "MerkingsvilkЕr"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "IMAPv4 "
 msgstr "&IMAP 4"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Inline"
 msgstr "Vinkel"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Kerberos "
 msgstr "Tenar:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Load images if sender is in addressbook"
 msgstr "Last alle bileta i ein katalog"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Mail Configuration"
 msgstr "Oppsett"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Format"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:54
 #, fuzzy
-msgid "Mark messages as \"Read\" after"
+msgid "Mark messages as Read after"
 msgstr "Lag meldingar og slЕ saman"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "NNTP Server:"
 msgstr "NNTP-tenar:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:59
 msgid "Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "News"
 msgstr "Ny ..."
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Optional Information"
 msgstr "Personleg informasjon"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organisasjon:"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:65
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:70
 msgid "Pick a color"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:71
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Prompt when sending messages with an empty subject"
 msgstr "Sender meldingar til %1"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "Sender meldingar til %1"
+
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "E-post 2"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Quoted"
 msgstr "Ingen"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Receiving Email"
 msgstr "Send"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "Mottek e-post"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Val for oppkopling pЕ nytt"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:79
 msgid "Remember PGP Passphrase until exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Required Information"
 msgstr "Tenarinformasjon"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Secure MIME"
 msgstr "Er sikker"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:84
 msgid "Security"
 msgstr "Tryggleik"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:86
 #, fuzzy
 msgid "Send mail in HTML format by default."
 msgstr "Send meldingar:"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Sending Email"
 msgstr "Send"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "Sender e-post"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "Sendt"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Send meldingar"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "Mottek meldingar frЕ %1"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Oppsett"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Server Type: "
 msgstr "Tenar:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Source"
 msgstr "Kjelder"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Source Information"
 msgstr "Tenarinformasjon"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Kjelder"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Special Folders"
 msgstr "Mapper"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Standard Unix mbox"
 msgstr "Standardfil"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Brukarnamn:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "newswindow1"
 msgstr "Nytt vindauge"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "placeholder"
 msgstr "Bruk &plasshaldarar"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "seconds."
 msgstr "sekund"
@@ -7630,41 +7821,41 @@ msgstr "Kunne ikkje laga kio-jobb.\n"
 msgid "Could not create a S/MIME decode context."
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-display.c:220
+#: mail/mail-display.c:221
 #, fuzzy
 msgid "Save Attachment"
 msgstr "Smarte vedlegg"
 
-#: mail/mail-display.c:337
+#: mail/mail-display.c:338
 #, fuzzy
 msgid "Save to Disk..."
 msgstr "Lagra til disk"
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:340
 #, fuzzy
 msgid "View Inline"
 msgstr "Vinkel"
 
-#: mail/mail-display.c:341
+#: mail/mail-display.c:342
 #, fuzzy, c-format
 msgid "Open in %s..."
 msgstr "Opnar URL ..."
 
-#: mail/mail-display.c:398
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:402
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-display.c:423
+#: mail/mail-display.c:424
 #, fuzzy
 msgid "External Viewer"
 msgstr "Hendingsvisar"
 
-#: mail/mail-display.c:1047
+#: mail/mail-display.c:1048
 #, fuzzy
 msgid "Loading message content"
 msgstr "Markerer meldingar"
@@ -7685,168 +7876,160 @@ msgstr "Lagrar fil ..."
 
 #: mail/mail-display.c:1410
 #, fuzzy
-msgid "Save Image as"
+msgid "Save Image as..."
 msgstr "Lagra bilete som"
 
-#: mail/mail-folder-cache.c:164
+#: mail/mail-folder-cache.c:170
 #, fuzzy, c-format
 msgid "%d new"
 msgstr "Legg til &ny"
 
-#: mail/mail-folder-cache.c:170 mail/mail-folder-cache.c:177
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
 msgid ", "
 msgstr ", "
 
-#: mail/mail-folder-cache.c:171
+#: mail/mail-folder-cache.c:177
 #, fuzzy, c-format
 msgid "%d hidden"
 msgstr "gЬymt"
 
-#: mail/mail-folder-cache.c:178
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr "Legg til &ny"
+
+#: mail/mail-folder-cache.c:188
 #, fuzzy, c-format
 msgid "%d total"
 msgstr "(%1 totalt)"
 
-#: mail/mail-format.c:603
+#: mail/mail-format.c:609
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-format.c:652
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:734 mail/message-list.etspec.h:2
+#: mail/mail-format.c:746
 #, fuzzy
 msgid "Date"
 msgstr "Forfallsdato"
 
-#: mail/mail-format.c:850 mail/message-list.etspec.h:4
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "E-post-adresse:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "FrЕ"
 
-#: mail/mail-format.c:853
+#: mail/mail-format.c:867
 #, fuzzy
 msgid "Reply-To"
 msgstr "Svar"
 
-#: mail/mail-format.c:856 mail/message-list.etspec.h:10
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Til"
 
-#: mail/mail-format.c:859
+#: mail/mail-format.c:873
 #, fuzzy
 msgid "Cc"
 msgstr "&CC:"
 
-#: mail/mail-format.c:1182
+#: mail/mail-format.c:1291
 #, fuzzy
 msgid "No GPG/PGP program configured."
 msgstr "Ingen bilete tilgjengeleg."
 
-#: mail/mail-format.c:1197
+#: mail/mail-format.c:1307
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "Endra tidsvising"
 
-#: mail/mail-format.c:1203
+#: mail/mail-format.c:1318
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Lagra melding"
 
-#: mail/mail-format.c:1204
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1260
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1268
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1920
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1932
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1936
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1970
+#: mail/mail-format.c:2094
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr ""
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1975
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:455
+#: mail/mail-local.c:458
 #, fuzzy, c-format
 msgid "Opening '%s'"
 msgstr "Opnar URL ..."
 
-#: mail/mail-local.c:755
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:759
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:782
-msgid "Reconfiguring folder"
-msgstr ""
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:811
-msgid "Closing current folder"
-msgstr ""
-
-#: mail/mail-local.c:838
-msgid "Renaming old folder and opening"
-msgstr ""
-
-#: mail/mail-local.c:856
-#, fuzzy
-msgid "Creating new folder"
-msgstr "Lagar ei ny mappe"
-
-#: mail/mail-local.c:870
-#, fuzzy
-msgid "Copying messages"
-msgstr "Melding"
-
-#: mail/mail-local.c:887
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:926
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1012
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
+
+#: mail/mail-local.c:1011
 #, fuzzy, c-format
 msgid "Reconfigure %s"
 msgstr "Set opp %1"
 
-#: mail/mail-mt.c:190
+#: mail/mail-mt.c:187
 #, fuzzy, c-format
 msgid ""
 "Error while '%s':\n"
@@ -7855,7 +8038,7 @@ msgstr ""
 "Feil ved laging av fil '%1':\n"
 "%2"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -7864,132 +8047,118 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:885
+#: mail/mail-mt.c:794
 #, fuzzy
 msgid "Working"
 msgstr "Flyttar"
 
-#: mail/mail-mt.c:867
-#, fuzzy
-msgid "Evolution progress"
-msgstr "OpplЬysing"
-
-#: mail/mail-ops.c:556
+#: mail/mail-ops.c:578
 #, fuzzy, c-format
 msgid "Sending \"%s\""
 msgstr "Sender %1"
 
-#: mail/mail-ops.c:560
-#, fuzzy
-msgid "Sending message"
-msgstr "Sen melding"
-
-#: mail/mail-ops.c:676
+#: mail/mail-ops.c:698
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Mottek meldingar frЕ %1"
 
-#: mail/mail-ops.c:695
+#: mail/mail-ops.c:717
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "Markerer meldingar"
 
-#: mail/mail-ops.c:697 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 #, fuzzy
 msgid "Complete."
 msgstr "Ferdig"
 
-#: mail/mail-ops.c:783
+#: mail/mail-ops.c:805
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Mottek meldingar frЕ %1"
 
-#: mail/mail-ops.c:862
+#: mail/mail-ops.c:884
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-ops.c:862
+#: mail/mail-ops.c:884
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Melding"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Flyttar"
 
-#: mail/mail-ops.c:882
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Kopierer"
 
-#: mail/mail-ops.c:972
+#: mail/mail-ops.c:1016
 #, fuzzy, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1141
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#, fuzzy
+msgid "Trash"
+msgstr "OppgЕve"
+
+#: mail/mail-ops.c:1189
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Vidaresendt melding frЕ %1"
 
-#: mail/mail-ops.c:1182 mail/mail-ops.c:1320
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1249
+#: mail/mail-ops.c:1297
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1388
+#: mail/mail-ops.c:1436
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1520
+#: mail/mail-ops.c:1568
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Les mapper"
 
-#: mail/mail-ops.c:1556
+#: mail/mail-ops.c:1604
 #, fuzzy
 msgid "Expunging folder"
 msgstr "Forventar %1"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1653
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Mottek meldingar frЕ %1"
 
-#: mail/mail-ops.c:1672
-#, fuzzy
-msgid "Retrieving messages"
-msgstr "Mottek meldingar frЕ %1"
-
-#: mail/mail-ops.c:1682
+#: mail/mail-ops.c:1722
 #, fuzzy, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
+msgid "Retrieving %d message(s)"
 msgstr "Mottek meldingar frЕ %1"
 
-#: mail/mail-ops.c:1756
-#, fuzzy
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Melding"
 
-#: mail/mail-ops.c:1835
+#: mail/mail-ops.c:1887
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-ops.c:1848
-#, fuzzy, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Mottek meldingar frЕ %1"
-
-#: mail/mail-ops.c:1862
+#: mail/mail-ops.c:1913
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7998,24 +8167,24 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: mail/mail-ops.c:1936
+#: mail/mail-ops.c:1987
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Smarte vedlegg"
 
-#: mail/mail-ops.c:1951
+#: mail/mail-ops.c:2003
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-ops.c:1979
+#: mail/mail-ops.c:2032
 #, fuzzy, c-format
 msgid "Could not write data: %s"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2101
 #, fuzzy, c-format
 msgid "Disconnecting from %s"
 msgstr "Koplar frЕ ..."
@@ -8025,25 +8194,35 @@ msgstr "Koplar frЕ ..."
 msgid "(Untitled Message)"
 msgstr "Ulest melding"
 
-#: mail/mail-search.c:268
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Ulest melding"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "Legg til melding"
+
+#: mail/mail-search.c:284
 #, fuzzy
 msgid "Find in Message"
 msgstr "&Finn i melding ..."
 
-#: mail/mail-search.c:298
+#: mail/mail-search.c:314
 msgid "Case Sensitive"
 msgstr "Skil mellom store og smЕ bokstavar"
 
-#: mail/mail-search.c:299
+#: mail/mail-search.c:315
 #, fuzzy
 msgid "Search Forward"
 msgstr "30 sekund framover"
 
-#: mail/mail-search.c:316
+#: mail/mail-search.c:332
 msgid "Find:"
 msgstr "Finn:"
 
-#: mail/mail-search.c:319
+#: mail/mail-search.c:335
 #, fuzzy
 msgid "Matches:"
 msgstr "Treff:"
@@ -8083,14 +8262,14 @@ msgstr "Sender %1"
 msgid "Cancelled."
 msgstr "Avbroten."
 
-#: mail/mail-session.c:170
+#: mail/mail-session.c:171
 #, fuzzy
 msgid "User canceled operation."
 msgstr ""
 "Brukaren avbraut handling\n"
 "%1"
 
-#: mail/mail-tools.c:159
+#: mail/mail-tools.c:173
 #, fuzzy, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
@@ -8098,38 +8277,27 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: mail/mail-tools.c:207
-#, fuzzy, c-format
-msgid "[%s] (forwarded message)"
-msgstr "Vidaresendt melding"
-
-#: mail/mail-tools.c:217
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (ingen emne)"
-
-#: mail/mail-tools.c:234
+#: mail/mail-tools.c:241
 #, fuzzy, c-format
 msgid "Forwarded message - %s"
 msgstr "Vidaresendt melding frЕ %1"
 
-#: mail/mail-tools.c:236
+#: mail/mail-tools.c:245
 #, fuzzy
-msgid "Forwarded message (no subject)"
+msgid "Forwarded message"
 msgstr "Vidaresendt melding frЕ %1"
 
-#: mail/mail-tools.c:457
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
-"s<br><b>Subject:</b> %s<br>"
-msgstr ""
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Vidaresendt melding frЕ %1"
 
-#: mail/mail-vfolder.c:250
+#: mail/mail-vfolder.c:270
 #, fuzzy
 msgid "VFolders"
 msgstr "Mapper"
 
-#: mail/mail-vfolder.c:442
+#: mail/mail-vfolder.c:463
 #, fuzzy
 msgid "New VFolder"
 msgstr "Ny mappe"
@@ -8205,11 +8373,16 @@ msgstr "%H:%M"
 msgid "%b %d %Y"
 msgstr "%1 bit %2 %3"
 
-#: mail/message-list.etspec.h:3
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Melding"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:4
 #, fuzzy
 msgid "Received"
 msgstr "Motta"
@@ -8288,70 +8461,76 @@ msgstr "%H:%M"
 msgid "%a %l:%M%p"
 msgstr "%H:%M"
 
-#: my-evolution/e-summary-mail.c:103
+#: my-evolution/e-summary-mail.c:104
 #, fuzzy
 msgid "Mail summary"
 msgstr "oppsummering"
 
-#: my-evolution/e-summary-preferences.c:424
+#: my-evolution/e-summary-preferences.c:420
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:446
+#: my-evolution/e-summary-preferences.c:442
 #, fuzzy
 msgid "Quotes of the Day"
 msgstr "Tips for dagen"
 
-#: my-evolution/e-summary-preferences.c:874
+#: my-evolution/e-summary-preferences.c:869
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Legg til ei ny oppfЬring"
 
-#: my-evolution/e-summary-preferences.c:882
+#: my-evolution/e-summary-preferences.c:877
 #, fuzzy
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Oppgi namnet pЕ gruppa du vil leggja til."
 
-#: my-evolution/e-summary-rdf.c:387 my-evolution/e-summary-rdf.c:413
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "Skriftinnstillingar"
+
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
 #, fuzzy
 msgid "<b>Error downloading RDF</b>"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: my-evolution/e-summary-tasks.c:157
+#: my-evolution/e-summary-tasks.c:206
 #, fuzzy
 msgid "No tasks"
 msgstr "Ingen oppgЕver ..."
 
-#: my-evolution/e-summary-weather.c:56
+#: my-evolution/e-summary-weather.c:57
 #, fuzzy
 msgid "My Weather"
 msgstr "Vatn"
 
-#: my-evolution/e-summary-weather.c:304
-#, fuzzy
-msgid "<b>Error downloading Metar</b>"
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
-"Feil ved nedlasting av fil:\n"
-"%1"
 
-#: my-evolution/e-summary-weather.c:628
+#: my-evolution/e-summary-weather.c:643
 #, fuzzy
 msgid "Regions"
 msgstr "Start om att"
 
-#: my-evolution/e-summary.c:144
+#: my-evolution/e-summary.c:145
 #, fuzzy
 msgid "%A, %d %B %Y"
 msgstr "%1 bit %2 %3"
 
-#: my-evolution/e-summary.c:459 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print My Evolution"
 msgstr "Evolution"
 
-#: my-evolution/e-summary.c:505
+#: my-evolution/e-summary.c:518
 #, fuzzy
 msgid "Printing of My Evolution failed"
 msgstr "Feil ved skriving av band-ID."
@@ -8361,44 +8540,6 @@ msgstr "Feil ved skriving av band-ID."
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Kunne ikkje initiere Bonobo"
 
-#: my-evolution/metar.c:29
-#, fuzzy
-msgid "╟F"
-msgstr "╟"
-
-#: my-evolution/metar.c:29
-#, fuzzy
-msgid "╟C"
-msgstr "╟"
-
-#: my-evolution/metar.c:33
-#, fuzzy
-msgid "knots"
-msgstr "Knop"
-
-#: my-evolution/metar.c:33
-msgid "kph"
-msgstr ""
-
-#: my-evolution/metar.c:38
-#, fuzzy
-msgid "inHg"
-msgstr "&Linje"
-
-#: my-evolution/metar.c:38
-#, fuzzy
-msgid "mmHg"
-msgstr "mm"
-
-#: my-evolution/metar.c:41
-msgid "miles"
-msgstr "miles"
-
-#: my-evolution/metar.c:41
-#, fuzzy
-msgid "kilometers"
-msgstr "meter"
-
 #: my-evolution/metar.c:44
 #, fuzzy
 msgid "Clear sky"
@@ -9716,144 +9857,129 @@ msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
 #, fuzzy
-msgid "Add ->"
-msgstr "&Legg til >>"
-
-#: my-evolution/my-evolution.glade.h:2
-#, fuzzy
 msgid "Add new feed"
 msgstr "Legg til nytt bilete"
 
-#: my-evolution/my-evolution.glade.h:3
+#: my-evolution/my-evolution.glade.h:2
 #, fuzzy
 msgid "All folders:"
 msgstr "Alle kantar"
 
-#: my-evolution/my-evolution.glade.h:4
+#: my-evolution/my-evolution.glade.h:3
 #, fuzzy
 msgid "All news feeds:"
 msgstr "&Alle felt"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:4
 #, fuzzy
 msgid "All stations:"
 msgstr "&Tilgjengelege handlingar:"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:6
 #, fuzzy
 msgid "Display folders:"
 msgstr "Skjermkontrollerarar"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:7
 #, fuzzy
 msgid "Display stations:"
 msgstr "Visingsval:"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:8
 #, fuzzy
 msgid "Displayed feeds:"
 msgstr "Vist namn:"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:9
 #, fuzzy
 msgid "Five days"
 msgstr " dagar"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:10
 msgid "How many days should the calendar display at once?"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:12
 #, fuzzy
 msgid "Max number of items shown:"
 msgstr "&HЬgste tal pЕ hopp:"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:13
 #, fuzzy
 msgid "News Feed Settings"
 msgstr "Nettverksinnstillingar"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:14
 #, fuzzy
 msgid "News Feeds"
 msgstr "Diskusjonsgruppetenarar"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:15
 #, fuzzy
 msgid "One day"
 msgstr " dag"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:16
 #, fuzzy
 msgid "One month"
 msgstr "Neste mЕnad"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:17
 #, fuzzy
 msgid "One week"
 msgstr "Veke"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:18
 #, fuzzy
 msgid "Refresh time (seconds):"
 msgstr "&Oppfriskingsrate:"
 
-#: my-evolution/my-evolution.glade.h:20
-#, fuzzy
-msgid "Remove <-"
-msgstr "Fjern"
-
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:19
 #, fuzzy
 msgid "Schedule"
 msgstr "&Plan"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:20
 #, fuzzy
 msgid "Show all tasks"
 msgstr "Vedlegg"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:21
 #, fuzzy
 msgid "Show full path for folders"
 msgstr "Vis sidekantar"
 
-#: my-evolution/my-evolution.glade.h:24
+#: my-evolution/my-evolution.glade.h:22
 #, fuzzy
 msgid "Show today's tasks"
 msgstr "Vedlegg"
 
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:23
 #, fuzzy
 msgid "Tasks "
 msgstr "OppgЕver"
 
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:24
 #, fuzzy
 msgid "Units: "
 msgstr "Einingar"
 
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:25
 #, fuzzy
 msgid "Weather"
 msgstr "Vatn"
 
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:26
 #, fuzzy
 msgid "Weather settings"
 msgstr "Toppinnstillingar"
 
-#: my-evolution/my-evolution.glade.h:29
-#, fuzzy
-msgid "Wipe trackers"
-msgstr "TrЕdmodell"
-
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:27
 #, fuzzy
 msgid "imperial"
 msgstr "seriell"
 
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:28
 #, fuzzy
 msgid "metric"
 msgstr "Geometrisk"
@@ -9873,6 +9999,11 @@ msgstr "Vis detaljar"
 msgid "Cancel Operation"
 msgstr "&Avbryt operasjon"
 
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Mapper"
+
 #: shell/e-setup.c:125 shell/e-setup.c:196
 #, fuzzy
 msgid "Evolution installation"
@@ -9996,7 +10127,7 @@ msgstr "Er du sikker pЕ at du vil sletta denne mappa?"
 msgid "Rename folder '%s'"
 msgstr "Endra namn pЕ profil '%1'"
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-creation-dialog.c:111
 #, fuzzy, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -10005,12 +10136,12 @@ msgstr ""
 "Kan ikkje laga fila\n"
 "\""
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 #, fuzzy
 msgid "The specified folder name is not valid."
 msgstr "Arkivfilnamnet er ikkje gyldig.\n"
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 #, fuzzy
 msgid "Evolution - Create new folder"
 msgstr "Lagar ei ny mappe"
@@ -10021,11 +10152,11 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:332
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Ny ..."
 
-#: shell/e-shell-folder-title-bar.c:468 shell/e-shell-folder-title-bar.c:469
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Utan tittel"
@@ -10172,43 +10303,44 @@ msgstr "Vel katalogen som inneheld tenestene"
 
 #: shell/e-shell-view-menu.c:689
 #, fuzzy
-msgid "Work online"
+msgid "Work Online"
 msgstr "Flyttar"
 
 #: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
 #, fuzzy
-msgid "Work offline"
+msgid "Work Offline"
 msgstr "Flyttar"
 
-#: shell/e-shell-view.c:177
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr ""
 
 #. Special case for My Evolution
-#: shell/e-shell-view.c:1395 shell/e-storage-set-view.c:1441
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
 #, fuzzy
 msgid "My Evolution"
 msgstr "Evolution"
 
-#: shell/e-shell-view.c:1412
+#: shell/e-shell-view.c:1411
 #, fuzzy, c-format
 msgid "%s - Evolution %s"
 msgstr "Evalueringsfeil"
 
-#: shell/e-shell-view.c:1414
+#: shell/e-shell-view.c:1413
 #, fuzzy, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "Evalueringsfeil"
 
-#: shell/e-shell-view.c:1452
+#: shell/e-shell-view.c:1451
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1459
+#: shell/e-shell-view.c:1458
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1465
+#: shell/e-shell-view.c:1464
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
@@ -10217,7 +10349,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikkje setja blokkstorleik for band."
 
-#: shell/e-shell.c:1310
+#: shell/e-shell.c:1311
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -10245,190 +10377,195 @@ msgstr "Vil du verkeleg leggja '%1' i papirkorga?"
 msgid "Don't remove"
 msgstr "fjern"
 
-#: shell/e-shortcuts-view.c:297
+#: shell/e-shortcuts-view.c:300
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Fjern denne oppfЬringa"
 
-#: shell/e-shortcuts-view.c:298
+#: shell/e-shortcuts-view.c:301
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Fjern denne oppfЬringa"
 
-#: shell/e-shortcuts-view.c:308
+#: shell/e-shortcuts-view.c:314
 #, fuzzy
 msgid "_Small Icons"
 msgstr "SmЕ ikon"
 
-#: shell/e-shortcuts-view.c:309
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:311
+#: shell/e-shortcuts-view.c:317
 #, fuzzy
 msgid "_Large Icons"
 msgstr "Ordna ikon"
 
-#: shell/e-shortcuts-view.c:312
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:323
+#: shell/e-shortcuts-view.c:329
 #, fuzzy
 msgid "_New Group..."
 msgstr "Ny gruppe ..."
 
-#: shell/e-shortcuts-view.c:324
+#: shell/e-shortcuts-view.c:330
 #, fuzzy
 msgid "Create a new shortcut group"
 msgstr "Lagar eit nytt dokument"
 
-#: shell/e-shortcuts-view.c:326
+#: shell/e-shortcuts-view.c:332
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "Fjern gruppe"
 
-#: shell/e-shortcuts-view.c:327
+#: shell/e-shortcuts-view.c:333
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "Fjern denne oppfЬringa"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:335
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "Fjern gruppe"
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:336
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Fjern denne oppfЬringa"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:342
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "&ProgramsnЬggtastar"
 
-#: shell/e-shortcuts-view.c:455
+#: shell/e-shortcuts-view.c:461
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "Endra portnamn"
 
-#: shell/e-shortcuts-view.c:456
+#: shell/e-shortcuts-view.c:462
 #, fuzzy
 msgid "Rename selected shortcut to:"
 msgstr "&Merka tekst"
 
-#: shell/e-shortcuts-view.c:468
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+#, fuzzy
+msgid "Open"
+msgstr "Opna ..."
+
+#: shell/e-shortcuts-view.c:474
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:470 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
 #, fuzzy
 msgid "Open in New Window"
 msgstr "&Opna i eige vindauge"
 
-#: shell/e-shortcuts-view.c:470
+#: shell/e-shortcuts-view.c:476
 #, fuzzy
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Opna dokumentet i eit nytt vindauge"
 
-#: shell/e-shortcuts-view.c:473
+#: shell/e-shortcuts-view.c:479
 msgid "Rename"
 msgstr "OmdЬyp"
 
-#: shell/e-shortcuts-view.c:473
+#: shell/e-shortcuts-view.c:479
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "Fjern denne oppfЬringa"
 
-#: shell/e-shortcuts-view.c:475
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:614
+#: shell/e-shortcuts.c:585
 #, fuzzy
 msgid "Error saving shortcuts."
 msgstr "Feil ved lagring av innstillingar."
 
-#: shell/e-shortcuts.c:1011
+#: shell/e-shortcuts.c:982
 msgid "Shortcuts"
 msgstr "Snarvegar"
 
-#: shell/e-shortcuts.c:1013
+#: shell/e-shortcuts.c:984
 msgid "Inbox"
 msgstr "Innboks"
 
-#: shell/e-shortcuts.c:1016
+#: shell/e-shortcuts.c:987
 #, fuzzy
 msgid "Contacts"
 msgstr "&Innhald ..."
 
-#: shell/e-storage.c:178
+#: shell/e-storage.c:178 shell/e-storage.c:184
 #, fuzzy
 msgid "(No name)"
 msgstr "Ingen namn"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 #, fuzzy
 msgid "No error"
 msgstr "Ingen feil."
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 #, fuzzy
 msgid "Generic error"
 msgstr "Generell feil"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 #, fuzzy
 msgid "A folder with the same name already exists"
 msgstr "Ein tabell med det namnet finst alt."
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 #, fuzzy
 msgid "The specified folder type is not valid"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 #, fuzzy
 msgid "I/O error"
 msgstr "IU-feil"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 #, fuzzy
 msgid "Not enough space to create the folder"
 msgstr "Ikkje nok skip Е senda."
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 #, fuzzy
 msgid "The specified folder was not found"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 #, fuzzy
 msgid "Function not implemented in this storage"
 msgstr "Kommando ikkje stЬtta pЕ tenar"
 
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 #, fuzzy
 msgid "Operation not supported"
 msgstr "Operasjonen vart stoppa"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 #, fuzzy
 msgid "The specified type is not supported in this storage"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-task-widget.c:167
+#: shell/e-task-widget.c:168
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: shell/e-task-widget.c:172
-#, fuzzy, c-format
+#: shell/e-task-widget.c:173
+#, fuzzy
 msgid "%s (%d%% complete)"
 msgstr "%1 av %2 ferdig"
 
@@ -10506,7 +10643,7 @@ msgstr "Ikkje spЬr igjen"
 msgid "Evolution has found the following data sources:"
 msgstr "Bruk pЕ fЬlgjande delar:"
 
-#: shell/main.c:89
+#: shell/main.c:96
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -10523,38 +10660,37 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:110
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:148
+#: shell/main.c:155
 #, fuzzy
 msgid "Cannot access the Evolution shell."
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/main.c:208
+#: shell/main.c:215
 #, fuzzy
 msgid "Disable splash screen"
 msgstr "KDE-oppstartsskjermen."
 
-#: shell/main.c:209
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:244
+#: shell/main.c:255
 #, fuzzy
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:3
-#: ui/evolution-tasks.xml.h:1
-#, fuzzy
-msgid "C_ut"
-msgstr "Klipp ut"
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Kopier"
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:6
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 #, fuzzy
 msgid "Copy the selection"
 msgstr "Slettar den valte fila"
@@ -10569,7 +10705,11 @@ msgstr "Lagar eit nytt dokument"
 msgid "Create new contact list"
 msgstr "Lagar eit nytt dokument"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:11
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Klipp ut"
+
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Cut the selection"
 msgstr "Slettar den valte fila"
@@ -10589,7 +10729,11 @@ msgstr "Se&nd avtale"
 msgid "New list"
 msgstr "Ny liste"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:27
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Lim inn"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Paste the clipboard"
 msgstr "Limer inn ..."
@@ -10639,19 +10783,7 @@ msgstr "&Innhald ..."
 msgid "_Contact Group"
 msgstr "&Innhald ..."
 
-#: ui/evolution-addressbook.xml.h:25 ui/evolution-calendar.xml.h:47
-#: ui/evolution-tasks.xml.h:14
-#, fuzzy
-msgid "_Copy"
-msgstr "Kopier"
-
-#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:52
-#: ui/evolution-tasks.xml.h:16
-#, fuzzy
-msgid "_Paste"
-msgstr "Lim inn"
-
-#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:53
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
 #: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 #, fuzzy
 msgid "_Print..."
@@ -10666,199 +10798,140 @@ msgstr ""
 msgid "_Select All"
 msgstr "Vel mappe"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:55
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
 #: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 #, fuzzy
 msgid "_Tools"
 msgstr "VerktЬy"
 
-#: ui/evolution-calendar.xml.h:1
-#, fuzzy
-msgid "5 Days"
-msgstr " dag"
-
 #: ui/evolution-calendar.xml.h:2
-#, fuzzy
-msgid "Alter preferences"
-msgstr "Innstillingar"
+msgid "Configure the calendar's settings"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Create a new all day Event"
+msgid "Create a New All-Day _Event"
 msgstr "Feil ved opning"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:5
 #, fuzzy
-msgid "Create a new appointment"
+msgid "Create a _New Appointment"
 msgstr "&Slett avtale"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:6
 #, fuzzy
-msgid "Create a new calendar"
-msgstr "Feil ved opning"
+msgid "Create a new appointment"
+msgstr "&Slett avtale"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr "Dag"
+#: ui/evolution-calendar.xml.h:7
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Go To"
 msgstr "GЕ til side"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 #, fuzzy
 msgid "Go back in time"
 msgstr "Ikkje vis den overskytande teksten"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 #, fuzzy
 msgid "Go forward in time"
 msgstr "Fram"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 #, fuzzy
 msgid "Go to _Date"
 msgstr "GЕ til side"
 
-#: ui/evolution-calendar.xml.h:17
-#, fuzzy
-msgid "Go to _Today"
-msgstr "GЕ til &i dag"
-
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:14
 #, fuzzy
 msgid "Go to a specific date"
 msgstr "GЕ til side"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 #, fuzzy
 msgid "Go to present time"
 msgstr "Ikkje vis den overskytande teksten"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Month"
-msgstr "MЕnad"
-
-#: ui/evolution-calendar.xml.h:22
-#, fuzzy
-msgid "New _Event"
-msgstr "Ny &hending ..."
-
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail-message.xml.h:48
-#, fuzzy
-msgid "Next"
-msgstr "Neste"
-
-#: ui/evolution-calendar.xml.h:25
-#, fuzzy
-msgid "Open Calendar"
-msgstr "Feil ved opning"
-
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:16
 #, fuzzy
-msgid "Prev"
-msgstr "FЬrehandsvising:"
+msgid "New Appointment"
+msgstr "&Vis avtale ..."
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:18
 #, fuzzy
 msgid "Previews the calendar to be printed"
 msgstr "Sen melding"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:20
 #, fuzzy
 msgid "Print calendar"
 msgstr "Skriv ut alle"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "Print this Calendar"
 msgstr "Skriv ut alle"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:22
 #, fuzzy
 msgid "Publish Free/Busy Information"
 msgstr "Informasjon"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:23
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:36 ui/evolution-message-composer.xml.h:19
-#, fuzzy
-msgid "Save As"
-msgstr "Lagra"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "Save calendar as something else"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:38
-#, fuzzy
-msgid "Settings..."
-msgstr "Skriftinnstillingar"
-
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Show 1 day"
 msgstr "Vis dato"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:25
 #, fuzzy
 msgid "Show 1 month"
 msgstr "Vis metodar"
 
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Show 1 week"
 msgstr "Vis %1"
 
-#: ui/evolution-calendar.xml.h:42
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show the working week"
 msgstr "Vis hovudvindauget"
 
-#: ui/evolution-calendar.xml.h:43 widgets/misc/e-cell-date-edit.c:232
-#: widgets/misc/e-dateedit.c:431
-#, fuzzy
-msgid "Today"
-msgstr "i dag"
-
-#: ui/evolution-calendar.xml.h:44
+#: ui/evolution-calendar.xml.h:28
 #, fuzzy
 msgid "W_ork Week"
 msgstr "&Arbeidsveke"
 
-#: ui/evolution-calendar.xml.h:45
-msgid "Week"
-msgstr "Veke"
-
-#: ui/evolution-calendar.xml.h:46
+#: ui/evolution-calendar.xml.h:29
 #, fuzzy
-msgid "_Appointment"
+msgid "_Appointment..."
 msgstr "Avtale"
 
-#: ui/evolution-calendar.xml.h:48
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "Skriftinnstillingar"
+
+#: ui/evolution-calendar.xml.h:32
 #, fuzzy
 msgid "_Day"
 msgstr "Dag"
 
-#: ui/evolution-calendar.xml.h:49
+#: ui/evolution-calendar.xml.h:33
 #, fuzzy
 msgid "_Month"
 msgstr "MЕnad"
 
-#: ui/evolution-calendar.xml.h:50 ui/evolution.xml.h:56
-#, fuzzy
-msgid "_New"
-msgstr "Vis"
-
-#: ui/evolution-calendar.xml.h:51
-#, fuzzy
-msgid "_Open Calendar"
-msgstr "Feil ved opning"
-
-#: ui/evolution-calendar.xml.h:56
+#: ui/evolution-calendar.xml.h:37
 #, fuzzy
 msgid "_Week"
 msgstr "Veke"
@@ -10892,7 +10965,7 @@ msgstr ""
 msgid "Preview the printed item"
 msgstr "Sen melding"
 
-#: ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
 #, fuzzy
 msgid "Print Pre_view"
 msgstr "&FЬrehandsvising ..."
@@ -10936,22 +11009,16 @@ msgstr ""
 msgid "_Action"
 msgstr "Handlingar"
 
-#: ui/evolution-comp-editor.xml.h:21 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-contact-list-editor.xml.h:9
 #: ui/evolution-mail-messagedisplay.xml.h:10
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_File"
 msgstr "Fil"
 
-#: ui/evolution-comp-editor.xml.h:22 ui/evolution-signature-editor.xml.h:9
-#: ui/evolution.xml.h:51
-#, fuzzy
-msgid "_Help"
-msgstr "Heim"
-
 #: ui/evolution-contact-editor.xml.h:2
 #, fuzzy
 msgid "Delete this item"
@@ -10975,7 +11042,7 @@ msgstr "Private meldingar"
 
 #: ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:4
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:21
 #, fuzzy
 msgid "Save _As..."
 msgstr "Lagra som ..."
@@ -11091,88 +11158,93 @@ msgid "Compose"
 msgstr "Lukk"
 
 #: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Lukk melding"
+
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:7
 msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:8
 #, fuzzy
 msgid "Empty _Trash"
 msgstr " dag"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:9
 #, fuzzy
 msgid "Forget _Passwords"
 msgstr "Lagra som"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:10
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:11
 #, fuzzy
 msgid "Manage _Subscriptions..."
 msgstr "Skildring:"
 
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:12
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:13
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:14
 #, fuzzy
 msgid "Send / Receive"
 msgstr "Mottakar"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 #, fuzzy
 msgid "Show message preview window"
 msgstr "Vis &meldingar kvar gong"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:17
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 #, fuzzy
 msgid "Virtual Folder _Editor..."
 msgstr "Mapper"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 #, fuzzy
 msgid "_Filters..."
 msgstr "E-post:"
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:20
 #, fuzzy
 msgid "_Mail Message"
 msgstr "Legg til melding"
 
-#: ui/evolution-mail-global.xml.h:20
+#: ui/evolution-mail-global.xml.h:21
 #, fuzzy
 msgid "_Mail Settings..."
 msgstr "Skriftinnstillingar"
 
-#: ui/evolution-mail-global.xml.h:21
+#: ui/evolution-mail-global.xml.h:22
 #, fuzzy
 msgid "_Preview Pane"
 msgstr "FЬrehandsvis i"
 
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:23
 #, fuzzy
 msgid "_Send / Receive"
 msgstr "Mottakar"
@@ -11204,7 +11276,7 @@ msgstr "Neste melding"
 
 #: ui/evolution-mail-list.xml.h:8
 #, fuzzy
-msgid "Hide _Read messages"
+msgid "Hide _Read Messages"
 msgstr "Vidaresendt melding frЕ %1"
 
 #: ui/evolution-mail-list.xml.h:9
@@ -11406,22 +11478,22 @@ msgstr "Vis det fЬrre dokumentet"
 
 #: ui/evolution-mail-message.xml.h:24
 #, fuzzy
-msgid "Filter on Mailing _List"
+msgid "Filter on Mailing _List..."
 msgstr "Fil alt i liste"
 
 #: ui/evolution-mail-message.xml.h:25
 #, fuzzy
-msgid "Filter on Se_nder"
+msgid "Filter on Se_nder..."
 msgstr "Fil under:"
 
 #: ui/evolution-mail-message.xml.h:26
 #, fuzzy
-msgid "Filter on _Recipients"
+msgid "Filter on _Recipients..."
 msgstr "Skriv ut filer"
 
 #: ui/evolution-mail-message.xml.h:27
 #, fuzzy
-msgid "Filter on _Subject"
+msgid "Filter on _Subject..."
 msgstr "Ingen emne"
 
 #: ui/evolution-mail-message.xml.h:28
@@ -11472,208 +11544,244 @@ msgstr "Sentrer dei valte elementa"
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 #, fuzzy
 msgid "Load _Images"
 msgstr "Endra &biletestorleik"
 
-#: ui/evolution-mail-message.xml.h:39
-#, fuzzy
-msgid "Mar_k As Read"
-msgstr "Mar&ker som ulesen"
-
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 #, fuzzy
-msgid "Mark As I_mportant"
-msgstr "Mar&ker som ulesen"
+msgid "Mark as I_mportant"
+msgstr "Marker som lesen"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 #, fuzzy
-msgid "Mark As U_nread"
-msgstr "Mar&ker som ulesen"
+msgid "Mark as Unimp_ortant"
+msgstr "Marker som lesen"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 #, fuzzy
 msgid "Mark the selected messages as having been read"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 #, fuzzy
 msgid "Mark the selected messages as important"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Mark the selected messages as not having been read"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Sentrer dei valte elementa"
+
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Mark the selected messages for deletion"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Move"
 msgstr "MЕn"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Move selected messages to another folder"
 msgstr "Lagra side til ascii-fil"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
+#, fuzzy
+msgid "Next"
+msgstr "Neste"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Vis informasjonsmelding"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Legg til melding"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Vel mappe"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Ulest melding"
+
+#: ui/evolution-mail-message.xml.h:56
 #, fuzzy
 msgid "Open the selected message in a new window"
 msgstr "Opna dokumentet i eit nytt vindauge"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Kopierer det merkte omrЕdet til utklippstavla"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
 msgid "Previews the message to be printed"
 msgstr "Sen melding"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:59
 msgid "Previous"
 msgstr "FЬrre"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Vis det fЬrre dokumentet"
+
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Private meldingar"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Vis det fЬrre dokumentet"
+
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Print Message..."
 msgstr "Private meldingar"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Print Preview..."
 msgstr "&FЬrehandsvising ..."
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
-msgid "Print message to the printer"
-msgstr "Sen melding"
-
-#: ui/evolution-mail-message.xml.h:57
-msgid "Redirect (FIXME: implement me)"
-msgstr ""
+msgid "Print this message"
+msgstr "Private meldingar"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply"
 msgstr "Svar"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Reply to All"
 msgstr "Svar til alle:"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "S_earch Message"
 msgstr "SЬk i &meldingar ..."
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Lagra side til ascii-fil"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Search for text in the body of the displayed message"
 msgstr "Skriv tittelen pЕ ruta her."
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Show Email _Source"
 msgstr "E-posttenar"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Show Full _Headers"
 msgstr "Vis &heile meldingshovudet"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:76
 #, fuzzy
 msgid "Show message in the normal style"
 msgstr "Vis &meldingar kvar gong"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
 msgid "Show message with all email headers"
 msgstr "Lag meldingar og slЕ saman"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:78
 #, fuzzy
 msgid "Show the raw email source of the message"
 msgstr "Kunne ikkje lagra melding(ar)."
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:80
 #, fuzzy
 msgid "VFolder on Mailing _List..."
 msgstr "Fil alt i liste"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:81
 #, fuzzy
 msgid "VFolder on Se_nder..."
 msgstr "Mappenamn:"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "VFolder on _Recipients..."
 msgstr "Mappa finst: "
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:83
 #, fuzzy
 msgid "VFolder on _Subject..."
 msgstr "Ingen emne"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:84
 #, fuzzy
 msgid "_Apply Filters"
 msgstr "Rediger fil"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Vidaresendt melding"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "_Message Display"
 msgstr "Endra tidsvising"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Flytt til mappe"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "_Normal Display"
 msgstr "Vis"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "_Open Message"
 msgstr "Send melding"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "_Re-send Message"
 msgstr "Send melding"
@@ -11697,7 +11805,7 @@ msgid "Customize toolbars"
 msgstr ""
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:42
 #, fuzzy
@@ -11745,174 +11853,179 @@ msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
 #, fuzzy
+msgid "Inline Text _File..."
+msgstr "Sett inn fil ..."
+
+#: ui/evolution-message-composer.xml.h:11
+#, fuzzy
 msgid "Insert a file as text into the message"
 msgstr "Oppgi eit nytt namn pЕ meldinga."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:12
 #, fuzzy
 msgid "Insert text file..."
 msgstr "Sett inn fil ..."
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 #, fuzzy
 msgid "Open a file"
 msgstr "Opna fil"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:17
 #, fuzzy
 msgid "S/MIME Encrypt"
 msgstr "&Krypter"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:18
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
 msgid "Save"
 msgstr "Lagra"
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "Save As"
+msgstr "Lagra"
+
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save _Draft"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
 msgid "Save in folder..."
 msgstr "Lagrar fil ..."
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:24
 #: ui/evolution-signature-editor.xml.h:4
 #, fuzzy
 msgid "Save the current file"
 msgstr "tid no"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:25
 #, fuzzy
 msgid "Save the current file with a different name"
 msgstr "Sender ei melding til ein nettverksspelar"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:26
 #, fuzzy
 msgid "Save the message in a specified folder"
 msgstr "Lagra side til ascii-fil"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Send"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
 msgid "Send _Later"
 msgstr "Send &seinare"
 
-#: ui/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
 msgid "Send _later"
 msgstr "Send &seinare"
 
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:30
 #, fuzzy
 msgid "Send the mail in HTML format"
 msgstr "Send meldingar:"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
 msgid "Send the message later"
 msgstr "Sen melding"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
 msgid "Send this message now"
 msgstr "Sen melding"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
 msgid "Show / hide attachments"
 msgstr "Vedlegg som ikon"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
 msgid "Show _attachments"
 msgstr "Vedlegg"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:35
 #, fuzzy
 msgid "Show attachments"
 msgstr "Vedlegg"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
 msgid "Sign this message with your PGP key"
 msgstr "Sender meldingar til %1"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:37
 #, fuzzy
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Sender meldingar til %1"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:42
 #, fuzzy
-msgid "_Attachment"
+msgid "_Attachment..."
 msgstr "Vedlegg"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
 #: ui/evolution-signature-editor.xml.h:6
 msgid "_Debug"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:47
 #, fuzzy
 msgid "_Delete all"
 msgstr "Slett alt"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:51
 #: ui/evolution-signature-editor.xml.h:10
 #, fuzzy
 msgid "_Insert"
 msgstr "Set inn"
 
-#: ui/evolution-message-composer.xml.h:51
-#, fuzzy
-msgid "_Insert text file..."
-msgstr "Sett inn fil ..."
-
 #: ui/evolution-message-composer.xml.h:52
 #, fuzzy
 msgid "_Open..."
@@ -11927,6 +12040,11 @@ msgstr "Svar"
 msgid "_Security"
 msgstr ""
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+#, fuzzy
+msgid "_Help"
+msgstr "Heim"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
@@ -11973,48 +12091,47 @@ msgid "Re_fresh Task"
 msgstr "Frisk opp lerret"
 
 #: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:3
 #, fuzzy
 msgid "Copy selected task"
 msgstr "Slett den valte oppgЕva"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 #, fuzzy
 msgid "Create a new task"
 msgstr "Lagar eit nytt dokument"
 
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:5
 #, fuzzy
 msgid "Cut selected task"
 msgstr "Slett den valte oppgЕva"
 
 #: ui/evolution-tasks.xml.h:7
 #, fuzzy
+msgid "Delete selected tasks"
+msgstr "Slett den valte oppgЕva"
+
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
 msgid "New Task"
 msgstr "OppgЕve"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 #, fuzzy
 msgid "Paste task from the clipboard"
 msgstr "Lim inn oppgЕve eller variabel frЕ utklippstavla."
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:11
-#, fuzzy
-msgid "Set task view preferences"
-msgstr "kView-innstillingar"
-
-#: ui/evolution-tasks.xml.h:12
-#, fuzzy
-msgid "Tasks Preferences..."
-msgstr "Innstillingar"
-
 #: ui/evolution-tasks.xml.h:13
 #, fuzzy
-msgid "TasksPreferences"
-msgstr "Innstillingar"
+msgid "Tasks Settings"
+msgstr "Skriftinnstillingar"
 
 #: ui/evolution-tasks.xml.h:19
 #, fuzzy
@@ -12161,11 +12278,6 @@ msgstr "Skriv ut alle"
 msgid "View the selected folder"
 msgstr "Slettar den valte fila"
 
-#: ui/evolution.xml.h:38
-#, fuzzy
-msgid "Work Offline"
-msgstr "Flyttar"
-
 #: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_About Evolution..."
@@ -12216,6 +12328,11 @@ msgstr "Legg til melding"
 msgid "_Move..."
 msgstr "&Flytt ..."
 
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_New"
+msgstr "Vis"
+
 #: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_New Folder"
@@ -12301,10 +12418,6 @@ msgstr "Kategori"
 msgid "%A, %B %d, %Y"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "Mellombels"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Oppteke"
@@ -12401,21 +12514,20 @@ msgstr "Detaljert oversikt"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:427
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr ""
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1067 widgets/misc/e-calendar-item.c:2766
-#, fuzzy
-msgid "%B %Y"
-msgstr "%1 %2"
-
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:425
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 #, fuzzy
 msgid "Now"
 msgstr "&No"
 
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+#, fuzzy
+msgid "Today"
+msgstr "i dag"
+
 #: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr ""
@@ -12509,21 +12621,26 @@ msgstr "Datakoding"
 msgid "..."
 msgstr " ..."
 
-#: widgets/misc/e-filter-bar.c:167
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Comment=X-redigering"
+
+#: widgets/misc/e-filter-bar.c:173
 #, fuzzy
 msgid "Save Search"
 msgstr "SЬk"
 
-#: widgets/misc/e-filter-bar.c:238
+#: widgets/misc/e-filter-bar.c:241
 #, fuzzy
 msgid "Advanced Search"
 msgstr "Legg til ..."
 
-#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
+#: widgets/misc/e-filter-bar.h:104
 #, fuzzy
 msgid "Advanced..."
 msgstr "Legg til ..."
@@ -12590,3 +12707,229 @@ msgstr "Kunne ikkje initiere Bonobo"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Kunne ikkje initiere Bonobo"
 
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "kView-innstillingar"
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "Innstillingar"
+
+#~ msgid "(none)"
+#~ msgstr "(ingen)"
+
+#~ msgid "File not found"
+#~ msgstr "Fann ikkje fil"
+
+#, fuzzy
+#~ msgid "Open calendar"
+#~ msgstr "Feil ved opning"
+
+#, fuzzy
+#~ msgid "Save calendar"
+#~ msgstr "Ny kalender"
+
+#, fuzzy
+#~ msgid "Edit this task"
+#~ msgstr "&Endra avtale ..."
+
+#, fuzzy
+#~ msgid "Go to Today"
+#~ msgstr "GЕ til &i dag"
+
+#, fuzzy
+#~ msgid "Delete all Occurrences"
+#~ msgstr "Slettar klassen"
+
+#, fuzzy
+#~ msgid "Summary contains"
+#~ msgstr "SpЬrjinga inneheld"
+
+#, fuzzy
+#~ msgid "Description contains"
+#~ msgstr "Skildringar"
+
+#, fuzzy
+#~ msgid "Comment contains"
+#~ msgstr "ikkje inneheld"
+
+#, fuzzy
+#~ msgid "Has category"
+#~ msgstr "Kategori"
+
+#, fuzzy
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Leitar etter tilleggsmodular"
+
+#, fuzzy
+#~ msgid "Body contains"
+#~ msgstr "Handlingar"
+
+#, fuzzy
+#~ msgid "Body does not contain"
+#~ msgstr "ikkje inneheld"
+
+#, fuzzy
+#~ msgid "Body or subject contains"
+#~ msgstr "Emne"
+
+#, fuzzy
+#~ msgid "Sender contains"
+#~ msgstr "SpЬrjinga inneheld"
+
+#, fuzzy
+#~ msgid "Subject contains"
+#~ msgstr "Emne"
+
+#, fuzzy
+#~ msgid "Subject does not contain"
+#~ msgstr "Emne"
+
+#, fuzzy
+#~ msgid "Forward to Address"
+#~ msgstr "Vidaresendt melding"
+
+#, fuzzy
+#~ msgid "Creating new folder"
+#~ msgstr "Lagar ei ny mappe"
+
+#, fuzzy
+#~ msgid "Copying messages"
+#~ msgstr "Melding"
+
+#, fuzzy
+#~ msgid "Evolution progress"
+#~ msgstr "OpplЬysing"
+
+#, fuzzy
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Mottek meldingar frЕ %1"
+
+#, fuzzy
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Mottek meldingar frЕ %1"
+
+#, fuzzy
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "Vidaresendt melding"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Fwd: (ingen emne)"
+
+#, fuzzy
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Vidaresendt melding frЕ %1"
+
+#, fuzzy
+#~ msgid "<b>Error downloading Metar</b>"
+#~ msgstr ""
+#~ "Feil ved nedlasting av fil:\n"
+#~ "%1"
+
+#, fuzzy
+#~ msgid "╟F"
+#~ msgstr "╟"
+
+#, fuzzy
+#~ msgid "╟C"
+#~ msgstr "╟"
+
+#, fuzzy
+#~ msgid "knots"
+#~ msgstr "Knop"
+
+#, fuzzy
+#~ msgid "inHg"
+#~ msgstr "&Linje"
+
+#, fuzzy
+#~ msgid "mmHg"
+#~ msgstr "mm"
+
+#~ msgid "miles"
+#~ msgstr "miles"
+
+#, fuzzy
+#~ msgid "kilometers"
+#~ msgstr "meter"
+
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "&Legg til >>"
+
+#, fuzzy
+#~ msgid "Remove <-"
+#~ msgstr "Fjern"
+
+#, fuzzy
+#~ msgid "Wipe trackers"
+#~ msgstr "TrЕdmodell"
+
+#, fuzzy
+#~ msgid "Work offline"
+#~ msgstr "Flyttar"
+
+#, fuzzy
+#~ msgid "5 Days"
+#~ msgstr " dag"
+
+#, fuzzy
+#~ msgid "Alter preferences"
+#~ msgstr "Innstillingar"
+
+#, fuzzy
+#~ msgid "Create a new calendar"
+#~ msgstr "Feil ved opning"
+
+#~ msgid "Day"
+#~ msgstr "Dag"
+
+#~ msgid "Month"
+#~ msgstr "MЕnad"
+
+#, fuzzy
+#~ msgid "New _Event"
+#~ msgstr "Ny &hending ..."
+
+#, fuzzy
+#~ msgid "Open Calendar"
+#~ msgstr "Feil ved opning"
+
+#, fuzzy
+#~ msgid "Prev"
+#~ msgstr "FЬrehandsvising:"
+
+#, fuzzy
+#~ msgid "Settings..."
+#~ msgstr "Skriftinnstillingar"
+
+#~ msgid "Week"
+#~ msgstr "Veke"
+
+#, fuzzy
+#~ msgid "_Open Calendar"
+#~ msgstr "Feil ved opning"
+
+#, fuzzy
+#~ msgid "Mar_k As Read"
+#~ msgstr "Mar&ker som ulesen"
+
+#, fuzzy
+#~ msgid "Mark As I_mportant"
+#~ msgstr "Mar&ker som ulesen"
+
+#, fuzzy
+#~ msgid "Mark As U_nread"
+#~ msgstr "Mar&ker som ulesen"
+
+#, fuzzy
+#~ msgid "Print message to the printer"
+#~ msgstr "Sen melding"
+
+#, fuzzy
+#~ msgid "_Insert text file..."
+#~ msgstr "Sett inn fil ..."
+
+#, fuzzy
+#~ msgid "Tasks Preferences..."
+#~ msgstr "Innstillingar"
diff --git a/po/no.po b/po/no.po
index bb7792a0e1..05c3613b08 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-applets 1.4.1\n"
-"POT-Creation-Date: 2001-07-31 14:16+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-07-31 14:54+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -633,15 +633,6 @@ msgstr "Kategori inneholder"
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappeutforskeren vil vise"
 
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * card.
-#.
-#: addressbook/gui/component/e-address-popup.c:178
-msgid "(none)"
-msgstr "(ingen)"
-
 #: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: addressbook/gui/contact-editor/e-contact-editor.c:1536
@@ -844,7 +835,7 @@ msgstr "_Kontakter..."
 #: calendar/gui/dialogs/alarm-page.glade.h:10
 #: calendar/gui/dialogs/meeting-page.c:1447
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
-#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:79
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Slett"
@@ -1325,7 +1316,7 @@ msgstr "Send melding til kontakt"
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
 #: addressbook/gui/widgets/e-addressbook-view.c:604
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-mail-message.xml.h:55 ui/evolution-tasks.xml.h:9
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Skriv ut"
@@ -1340,7 +1331,7 @@ msgstr "Skriv ut konvolutt"
 #: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
 #: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Slett"
 
@@ -2652,7 +2643,7 @@ msgstr ""
 "Overskriv den?"
 
 #: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+#: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Lagre som..."
 
@@ -3765,7 +3756,7 @@ msgstr "Skriv ut oppfЬring"
 msgid "Print Setup"
 msgstr "Skriveroppsett"
 
-#: calendar/gui/tasks-control.c:122
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "URIen til oppgavemappen skal vises"
 
@@ -3874,7 +3865,6 @@ msgid "Unable to process spool folder"
 msgstr "Kan ikke prosessere spool-mappen"
 
 #: camel/camel-filter-driver.c:667
-#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Henter melding %d (%d%%)"
 
@@ -4532,8 +4522,8 @@ msgstr "For lesing og lagring av e-post pЕ IMAP-tjenere."
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
-"Dette valget vil la deg koble til en IMAP-tjener ved Е bruke et klartekst-"
-"passord."
+"Dette valget vil la deg koble til en IMAP-tjener ved Е bruke et "
+"klartekst-passord."
 
 #: camel/providers/imap/camel-imap-store.c:463
 #, c-format
@@ -5111,8 +5101,8 @@ msgid ""
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 "For tilkobling til POP-tjenere. POP-protokollen kan ogsЕ brukes for Е hente "
-"e-post fra enkelte e-posttilbydere via web i tillegg til proprietФre e-"
-"postsystemer."
+"e-post fra enkelte e-posttilbydere via web i tillegg til proprietФre "
+"e-postsystemer."
 
 #: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
@@ -5120,8 +5110,8 @@ msgid ""
 "is the only option supported by many POP servers."
 msgstr ""
 "Dette alternativet lar deg koble til POP-tjeneren ved bruk av passord i "
-"klartekst. Dette er det eneste alternativet som er stЬttet av mange POP-"
-"tjenere."
+"klartekst. Dette er det eneste alternativet som er stЬttet av mange "
+"POP-tjenere."
 
 #: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
@@ -5740,11 +5730,11 @@ msgstr "еpne fil"
 msgid "Insert File"
 msgstr "Sett inn fil"
 
-#: composer/e-msg-composer.c:1856 composer/e-msg-composer.c:2252
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:2346
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "Kan ikke opprette komponeringsvinduet."
 
@@ -5772,30 +5762,6 @@ msgstr "adressekort"
 msgid "calendar information"
 msgstr "kalenderinformasjon"
 
-#: default_user/searches.xml.h:1
-msgid "Body contains"
-msgstr "Kropp inneholder"
-
-#: default_user/searches.xml.h:2
-msgid "Body does not contain"
-msgstr "Kropp inneholder ikke"
-
-#: default_user/searches.xml.h:3
-msgid "Body or subject contains"
-msgstr "Kropp eller emne inneholder"
-
-#: default_user/searches.xml.h:4
-msgid "Sender contains"
-msgstr "Sender inneholder"
-
-#: default_user/searches.xml.h:5
-msgid "Subject contains"
-msgstr "Emne inneholder"
-
-#: default_user/searches.xml.h:6
-msgid "Subject does not contain"
-msgstr "Emne inneholder ikke"
-
 #. strptime format for a date.
 #: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
 #: e-util/e-time-utils.c:239
@@ -6490,7 +6456,7 @@ msgstr "Filtrer pЕ e-_postliste"
 msgid "Resend"
 msgstr "Send pЕ nytt"
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:87
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
 #: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Lagre _som..."
@@ -6499,15 +6465,15 @@ msgstr "Lagre _som..."
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:86
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:62
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:61
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
@@ -6515,11 +6481,11 @@ msgstr "Svar til _alle"
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:39
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:41
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Merk som _ulest"
 
@@ -6539,7 +6505,7 @@ msgstr "Fl_ytt til mappe..."
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:88
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "A_ngre slett"
 
@@ -7010,8 +6976,7 @@ msgstr "Skisser"
 msgid "Drafts folder:"
 msgstr "Skissemappe:"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Rediger..."
 
@@ -7943,38 +7908,6 @@ msgstr "Utskrift av Min Evolution feilet"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Executive summary komponent kunne ikke initialisere Bonobo.\n"
 
-#: my-evolution/metar.c:29
-msgid "╟F"
-msgstr "╟F"
-
-#: my-evolution/metar.c:29
-msgid "╟C"
-msgstr "╟C"
-
-#: my-evolution/metar.c:33
-msgid "knots"
-msgstr "knop"
-
-#: my-evolution/metar.c:33
-msgid "kph"
-msgstr "kpt"
-
-#: my-evolution/metar.c:38
-msgid "inHg"
-msgstr "inHg"
-
-#: my-evolution/metar.c:38
-msgid "mmHg"
-msgstr "mmHg"
-
-#: my-evolution/metar.c:41
-msgid "miles"
-msgstr "engelske mil"
-
-#: my-evolution/metar.c:41
-msgid "kilometers"
-msgstr "kilometer"
-
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Klar himmel"
@@ -9787,7 +9720,6 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:173
-#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fullfЬrt)"
 
@@ -10028,7 +9960,7 @@ msgstr "Opprett en ny avtale"
 msgid "Create an event for the whole day"
 msgstr "Opprett en hendelse for hele dagen"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "GЕ til"
 
@@ -10141,7 +10073,7 @@ msgstr "HovedverktЬylinje"
 msgid "Preview the printed item"
 msgstr "ForhЕndsvisning av oppfЬring som skal skrives ut"
 
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:10
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
 msgid "Print Pre_view"
 msgstr "ForhЕndsvisning av utskrift"
 
@@ -10627,171 +10559,206 @@ msgstr "Videresend den valgte meldingen til noen"
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Videresend den valgte meldingen til noen som et vedlegg"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 msgid "Load _Images"
 msgstr "Last b_ilder"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 msgid "Mark as I_mportant"
 msgstr "Merk som _viktig"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:43
 msgid "Mark as Unimp_ortant"
 msgstr "Merk som uv_iktig"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "Merk valgte meldinger som lest"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark the selected messages as important"
 msgstr "Merk valgte meldinger som viktige"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "Merk valgte meldinger som ikke lest"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected messages as unimportant"
 msgstr "Merk valgte meldinger som uviktige"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages for deletion"
 msgstr "Merk valgte meldinger for sletting"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Flytt"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "Flytt valgte meldinger til en annen mappe"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Next"
 msgstr "Neste"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Neste melding"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Neste melding"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Velg _trЕd"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Neste melding"
+
+#: ui/evolution-mail-message.xml.h:56
 msgid "Open the selected message in a new window"
 msgstr "еpne valgt melding i et nytt vindu"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:57
 msgid "Open the selected message in the composer to re-send it"
 msgstr "еpne valgt melding i redigeringsvinduet for Е sende den pЕ nytt"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:58
 msgid "Previews the message to be printed"
 msgstr "Viser forhЕndsvisning av meldingen som skal skrives ut"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Previous"
 msgstr "Forrige"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Forrige melding"
+
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Forrige melding"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Forrige melding"
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Print Message..."
 msgstr "Skriv ut melding..."
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:65
 msgid "Print Preview..."
 msgstr "ForhЕndsvisning av utskrift"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print this message"
 msgstr "Skriv ut denne meldingen"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply"
 msgstr "Svar"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:68
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:71
 msgid "S_earch Message"
 msgstr "SЬk i m_elding"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:72
 msgid "Save the message as a text file"
 msgstr "Lagre meldingen som en tekstfil"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:73
 msgid "Search for text in the body of the displayed message"
 msgstr "SЬk etter tekst i kroppen av vist melding"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "Vis e-post-kilde"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:75
 msgid "Show Full _Headers"
 msgstr "Vis fulle _headere"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:76
 msgid "Show message in the normal style"
 msgstr "Vis melding i normal stil"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:77
 msgid "Show message with all email headers"
 msgstr "Vis melding med fulle e-post headere"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:78
 msgid "Show the raw email source of the message"
 msgstr "Vis e-post meldingen i sin rЕe form"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "Angre slett av den valgte meldingen"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:80
 msgid "VFolder on Mailing _List..."
 msgstr "VFolder pЕ e-post_liste..."
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:81
 msgid "VFolder on Se_nder..."
 msgstr "VFolder for se_nder..."
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:82
 msgid "VFolder on _Recipients..."
 msgstr "VFolder for mottake_re..."
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:83
 msgid "VFolder on _Subject..."
 msgstr "VFolder pЕ e_mne..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_PЕfЬr filtre"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Copy to Folder"
 msgstr "_Kopier til mappe"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "La_g filter fra melding"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:88
 msgid "_Forward Message"
 msgstr "_Videresend melding"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:89
 msgid "_Message Display"
 msgstr "_Meldingsvisning"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Open Message"
 msgstr "_еpne melding"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Re-send Message"
 msgstr "_Send melding pЕ nytt"
 
@@ -11060,49 +11027,47 @@ msgid "Re_fresh Task"
 msgstr "O_ppdater oppgave"
 
 #: ui/evolution-tasks.xml.h:2
+#, fuzzy
+msgid "Configure the task view's settings"
+msgstr "Konfigurer innstillinger for kalender"
+
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopier valgt oppgave"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Opprett en ny oppgave"
 
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Klipp ut valgt oppgave"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "Slett valgte oppgaver"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Ny oppgave"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Paste task from the clipboard"
 msgstr "Lim inn oppgave fra utklippstavlen"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Lagre oppgave som noe annet"
 
-#: ui/evolution-tasks.xml.h:12
-msgid "Set task view preferences"
-msgstr "Endre brukervalg for oppgavevisning"
-
 #: ui/evolution-tasks.xml.h:13
-msgid "TasksPreferences"
-msgstr "Brukervalg for oppgaver"
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "Inns_tillinger for oppgaver..."
 
 #: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_Oppgave"
 
-#: ui/evolution-tasks.xml.h:20
-msgid "_Tasks Settings..."
-msgstr "Inns_tillinger for oppgaver..."
-
 #: ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "Om Evolution..."
@@ -11530,11 +11495,11 @@ msgstr "Lagre sЬk"
 msgid "Advanced Search"
 msgstr "Avansert sЬk"
 
-#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Vis alle"
 
-#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Avansert..."
 
@@ -11587,6 +11552,57 @@ msgstr "init_corba(): kunne ikke initiere GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 
+#~ msgid "(none)"
+#~ msgstr "(ingen)"
+
+#~ msgid "Body contains"
+#~ msgstr "Kropp inneholder"
+
+#~ msgid "Body does not contain"
+#~ msgstr "Kropp inneholder ikke"
+
+#~ msgid "Body or subject contains"
+#~ msgstr "Kropp eller emne inneholder"
+
+#~ msgid "Sender contains"
+#~ msgstr "Sender inneholder"
+
+#~ msgid "Subject contains"
+#~ msgstr "Emne inneholder"
+
+#~ msgid "Subject does not contain"
+#~ msgstr "Emne inneholder ikke"
+
+#~ msgid "╟F"
+#~ msgstr "╟F"
+
+#~ msgid "╟C"
+#~ msgstr "╟C"
+
+#~ msgid "knots"
+#~ msgstr "knop"
+
+#~ msgid "kph"
+#~ msgstr "kpt"
+
+#~ msgid "inHg"
+#~ msgstr "inHg"
+
+#~ msgid "mmHg"
+#~ msgstr "mmHg"
+
+#~ msgid "miles"
+#~ msgstr "engelske mil"
+
+#~ msgid "kilometers"
+#~ msgstr "kilometer"
+
+#~ msgid "Set task view preferences"
+#~ msgstr "Endre brukervalg for oppgavevisning"
+
+#~ msgid "TasksPreferences"
+#~ msgstr "Brukervalg for oppgaver"
+
 #~ msgid "File not found"
 #~ msgstr "Fil ikke funnet"
 
@@ -11627,11 +11643,11 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Videresendt melding (uten emne)"
 
 #~ msgid ""
-#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
-#~ "s<br><b>Subject:</b> %s<br>"
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
 #~ msgstr ""
-#~ "-----Videresendt melding---<br><b>Fra:</b> %s<br><b>Til:</b> %"
-#~ "s<br><b>Emne:</b> %s<br>"
+#~ "-----Videresendt melding---<br><b>Fra:</b> %s<br><b>Til:</b> "
+#~ "%s<br><b>Emne:</b> %s<br>"
 
 #~ msgid "Wipe trackers"
 #~ msgstr "Visk ut sporere"
@@ -11973,8 +11989,8 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "This applet monitors the charge of your laptop's battery.  Click on it to "
 #~ "change display modes."
 #~ msgstr ""
-#~ "Denne appleten overvЕker strЬmstyrken til batteriet pЕ din bФrbare. Klikk "
-#~ "pЕ den for Е endre visningsmodus."
+#~ "Denne appleten overvЕker strЬmstyrken til batteriet pЕ din bФrbare. Klikk pЕ "
+#~ "den for Е endre visningsmodus."
 
 #~ msgid "Could not allocate space for graph values"
 #~ msgstr "Kunne ikke allokere plass for grafverdiene"
@@ -12120,8 +12136,8 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "Gnome panel applet for copying and retrieving selections with a history "
 #~ "list. Released under GNU General Public Licence."
 #~ msgstr ""
-#~ "Gnome Panel applet for Е kopiere og hente tilbake utvalg med en "
-#~ "historikk. Utgitt under GNU General Puclic License."
+#~ "Gnome Panel applet for Е kopiere og hente tilbake utvalg med en historikk. "
+#~ "Utgitt under GNU General Puclic License."
 
 #~ msgid "John Ellis <johne@bellatlantic.net>"
 #~ msgstr "John Ellis <johne@bellatlantic.net>"
@@ -12139,9 +12155,9 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "arrives."
 #~ msgstr ""
 #~ "Utgitt under GNU general public license.\n"
-#~ "Enkel digital klokke med dato i verktЬystips. Valgfri 12/24-timers "
-#~ "visning. Blinking for post kan vФre for enhver ulest melding, eller bare "
-#~ "kort nЕr ny post ankommer."
+#~ "Enkel digital klokke med dato i verktЬystips. Valgfri 12/24-timers visning. "
+#~ "Blinking for post kan vФre for enhver ulest melding, eller bare kort nЕr ny "
+#~ "post ankommer."
 
 #~ msgid "%a, %b %d"
 #~ msgstr "%a, %b %d"
@@ -12198,8 +12214,8 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "The CPU/Mem usage applet displays your system resources with 3 colorful "
 #~ "stacked bar graphs (processor, memory, swap)"
 #~ msgstr ""
-#~ "CPU-/minnebruk appleten viser ressursene pЕ ditt system med tre "
-#~ "fargefulle sЬylediagrammer (prosessor, minne, swap)"
+#~ "CPU-/minnebruk appleten viser ressursene pЕ ditt system med tre fargefulle "
+#~ "sЬylediagrammer (prosessor, minne, swap)"
 
 #~ msgid "File Systems"
 #~ msgstr "Filsystemer"
@@ -12341,11 +12357,11 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Copyright (C) The Free Software Foundation"
 
 #~ msgid ""
-#~ "Sam Lloyd's all-time favorite game, now for your delight in the Gnome "
-#~ "Panel. Guaranteed to be a productivity buster."
+#~ "Sam Lloyd's all-time favorite game, now for your delight in the Gnome Panel. "
+#~ "Guaranteed to be a productivity buster."
 #~ msgstr ""
-#~ "Sam Lloyds favorittspill, nЕ til alles begeistring tilgjengelig i Panelet."
-#~ "Garantert Ьdeleggende for produktiviteten."
+#~ "Sam Lloyds favorittspill, nЕ til alles begeistring tilgjengelig i "
+#~ "Panelet.Garantert Ьdeleggende for produktiviteten."
 
 #~ msgid "Can't create fifteen applet!"
 #~ msgstr "Kan ikke opprette femten appleten!"
@@ -12426,17 +12442,15 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "╘ 1998-2000 Free Software Foundation"
 
 #~ msgid ""
-#~ "This applet switches between keyboard maps. It uses setxkbmap, or "
-#~ "xmodmap.\n"
+#~ "This applet switches between keyboard maps. It uses setxkbmap, or xmodmap.\n"
 #~ "Mail me your flag, please (60x40 size), I will put it to CVS.\n"
 #~ "So long, and thanks for all the fish.\n"
 #~ "Thanks for Balazs Nagy (Kevin) <julian7@kva.hu> for his help and Emese "
 #~ "Kovacs <emese@eik.bme.hu> for her solidarity."
 #~ msgstr ""
-#~ "Denne appleten bytter mellom forskjellige tastaturkart. Den bruker "
-#~ "setxkbmap eller xmodmap. Send meg flagget ditt er du snill (60x40 "
-#~ "stЬrrelse), sЕ skal jeg legge det inn i CVS. Ha det og takk for all "
-#~ "fisken.\n"
+#~ "Denne appleten bytter mellom forskjellige tastaturkart. Den bruker setxkbmap "
+#~ "eller xmodmap. Send meg flagget ditt er du snill (60x40 stЬrrelse), sЕ skal "
+#~ "jeg legge det inn i CVS. Ha det og takk for all fisken.\n"
 #~ "Takk til Balazs Nagy (Kevin) <julian7@kva.hu> for hjelpen og Emese Kovacs "
 #~ "<emese@eik.bme.hu> for hennes solidaritet."
 
@@ -12778,14 +12792,14 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "GNOME AksjeovervЕker"
 
 #~ msgid ""
-#~ "This program connects to a popular site and downloads current stock "
-#~ "quotes.  The GNOME Stock Ticker is a free Internet-based application.  It "
-#~ "comes with ABSOLUTELY NO WARRANTY.  Do not use the GNOME Stock Ticker for "
-#~ "making investment decisions; it is for informational purposes only."
+#~ "This program connects to a popular site and downloads current stock quotes.  "
+#~ "The GNOME Stock Ticker is a free Internet-based application.  It comes with "
+#~ "ABSOLUTELY NO WARRANTY.  Do not use the GNOME Stock Ticker for making "
+#~ "investment decisions; it is for informational purposes only."
 #~ msgstr ""
 #~ "Dette programmet laster ned aksjekurser fra populФre nettsteder. GNOME "
-#~ "aksjeovervЕker er en fri internett-basert applikasjon. Det fЬlger IKKE "
-#~ "MED NOEN GARANTIER. Ikke bruk GNOME aksjeovervЕker til Е gjЬre "
+#~ "aksjeovervЕker er en fri internett-basert applikasjon. Det fЬlger IKKE MED "
+#~ "NOEN GARANTIER. Ikke bruk GNOME aksjeovervЕker til Е gjЬre "
 #~ "investeringsavgjЬrelser; kun for informasjonsformЕl."
 
 #~ msgid "New Symbol:"
@@ -12911,8 +12925,8 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 
 #~ msgid ""
 #~ "Detailed forecast not available for this location.\n"
-#~ "Please try the state forecast; note that IWIN forecasts are available "
-#~ "only for US cities."
+#~ "Please try the state forecast; note that IWIN forecasts are available only "
+#~ "for US cities."
 #~ msgstr ""
 #~ "Detaljert vФrmelding er ikke tilgjengelig for denne plassen.\n"
 #~ "Vennligst prЬv melding for staten; merk at IWIN meldingene kun er "
@@ -13062,12 +13076,11 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "clock.\n"
 #~ "\n"
 #~ "This program is free software; you can redistribute it and/or modify it "
-#~ "under the terms of the GNU General Public License as published by the "
-#~ "Free Software Foundation; either version 2 of the License, or (at your "
-#~ "option) any later version."
+#~ "under the terms of the GNU General Public License as published by the Free "
+#~ "Software Foundation; either version 2 of the License, or (at your option) "
+#~ "any later version."
 #~ msgstr ""
-#~ "Denne GNOME-appleten legger til en kommandolinje pЕ panelet. Denne "
-#~ "stЬtter\n"
+#~ "Denne GNOME-appleten legger til en kommandolinje pЕ panelet. Denne stЬtter\n"
 #~ "kommando-komplettering, kommando-historikk, redigerbare makroer og en\n"
 #~ "valgfri, innebygget klokke.\n"
 #~ "\n"
@@ -13214,8 +13227,8 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "(c) 1998 the Free Software Foundation"
 
 #~ msgid ""
-#~ "The mixer applet gives you instant access to setting the master volume "
-#~ "level on your soundcard device"
+#~ "The mixer applet gives you instant access to setting the master volume level "
+#~ "on your soundcard device"
 #~ msgstr ""
 #~ "Mikserappleten gir deg umiddelbar tilgang til innstillingene av lydnivЕet "
 #~ "for din lydenhet"
@@ -13468,8 +13481,8 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "(C) 1999 the Free Software Foundation"
 
 #~ msgid ""
-#~ "a GNOME applet that tracks and measures the movements of your mouse "
-#~ "pointer across the desktop."
+#~ "a GNOME applet that tracks and measures the movements of your mouse pointer "
+#~ "across the desktop."
 #~ msgstr ""
 #~ "en GNOME applet som fЬlger og mЕler bevegelsen til muspekeren over "
 #~ "skrivebordet."
@@ -13496,13 +13509,13 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Hurtigstart applet"
 
 #~ msgid ""
-#~ "This applet adds some pretty small icons for your launchers to your "
-#~ "panel, like the windowish QuickLaunch toolbar, avoiding that annoying "
-#~ "huge GNOME launchers."
+#~ "This applet adds some pretty small icons for your launchers to your panel, "
+#~ "like the windowish QuickLaunch toolbar, avoiding that annoying huge GNOME "
+#~ "launchers."
 #~ msgstr ""
-#~ "Denne appleten legger til noen ganske smЕ ikoner for oppstartere pЕ "
-#~ "panelet, slik som hurtigstartmenylinjen i Windows, og unngЕr de svФre "
-#~ "GNOME startknappene."
+#~ "Denne appleten legger til noen ganske smЕ ikoner for oppstartere pЕ panelet, "
+#~ "slik som hurtigstartmenylinjen i Windows, og unngЕr de svФre GNOME "
+#~ "startknappene."
 
 #~ msgid "Launcher Properties"
 #~ msgstr "Egenskaper for oppstarter"
@@ -13601,8 +13614,8 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "jpg, jpeg, bmp, cgm, cmyk, dib, eps, fig, fpx, gif, ico, map, miff, pcx,\n"
 #~ "pict, pix, png, pnm, ppm, psd, rgb, rgba, rla, rle, tiff, tga, xbm, xpm,\n"
 #~ "and several obscure ones. Try your luck with something interesting!\n"
-#~ "Eg .html for a client-side image map. You'll get a .gif, .html, and a ."
-#~ "shtml\n"
+#~ "Eg .html for a client-side image map. You'll get a .gif, .html, and a "
+#~ ".shtml\n"
 #~ "\n"
 #~ "Recommendations:\n"
 #~ "Small file, pretty good quality:   jpg, 75% quality\n"
@@ -13615,13 +13628,12 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "jpg, jpeg, bmp, cgm, cmyk, dib, eps, fig, fpx, gif, ico, map, miff, pcx,\n"
 #~ "pict, pix, png, pnm, ppm, psd, rgb, rgba, rla, rle, tiff, tga, xbm, xpm,\n"
 #~ "og flere andre obskure typer. PrЬv ditt hell med noe interessant!\n"
-#~ "For eksempel .html for et klientside bildekart. Du vil fЕ et .gif, .html "
-#~ "og et .shtml.\n"
+#~ "For eksempel .html for et klientside bildekart. Du vil fЕ et .gif, .html og "
+#~ "et .shtml.\n"
 #~ "\n"
 #~ "Forslag:\n"
 #~ "Liten fil ganske god kvalitet:        jpg, 75% kvalitet\n"
-#~ "Litt stЬrre fil men uten tap av data: png, sЕ mye kompresjon som du "
-#~ "Ьnsker.\n"
+#~ "Litt stЬrre fil men uten tap av data: png, sЕ mye kompresjon som du Ьnsker.\n"
 #~ "- kompresjon av png filer tar lengre tid ved hЬyere rater, men er likevel "
 #~ "uten tap av data"
 
@@ -13652,26 +13664,25 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Bruk hЬykvalitets mellomlagring under oppretting av miniatyr"
 
 #~ msgid ""
-#~ "(This'll chug loads of CPU, but will prevent compressing the image twice "
-#~ "if a\n"
+#~ "(This'll chug loads of CPU, but will prevent compressing the image twice if "
+#~ "a\n"
 #~ "lossy file format is used)\n"
 #~ "Don't use this if you're using a lossless compression format, or if you "
 #~ "cherish\n"
 #~ "speed and don't mind imperfection in your thumbnails."
 #~ msgstr ""
-#~ "(Dette vil bruke mye prosessorkraft, men vil forhindre at bildet "
-#~ "komprimeres \n"
+#~ "(Dette vil bruke mye prosessorkraft, men vil forhindre at bildet komprimeres "
+#~ "\n"
 #~ "to ganger hvis du bruker et format som taper data)\n"
-#~ "Ikke bruk dette alternativet hvis du bruker et tapsfritt "
-#~ "kompresjonsformat, eller hvis du setter pris pЕ \n"
+#~ "Ikke bruk dette alternativet hvis du bruker et tapsfritt kompresjonsformat, "
+#~ "eller hvis du setter pris pЕ \n"
 #~ "hurtighet og ikke bryr deg om mindre feil i miniatyrene."
 
 #~ msgid "Thumbnails"
 #~ msgstr "Miniatyrer"
 
 #~ msgid ""
-#~ "All post-processing, frill and spurious options will chug more CPU than "
-#~ "a\n"
+#~ "All post-processing, frill and spurious options will chug more CPU than a\n"
 #~ "simple screenshot, due to the creation and then conversion of an "
 #~ "intermediate\n"
 #~ "image. Intensive operations may take some time on less spiffy CPUs."
@@ -13740,8 +13751,7 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "specified on the commandline as follows:\n"
 #~ "{Script_Name} {Image_Filename} {Thumbnail_filename_if_specified}\n"
 #~ "Hint: I use a script to update my website screenshot page.\n"
-#~ "An example script should've been included in the tarball, or at my "
-#~ "website."
+#~ "An example script should've been included in the tarball, or at my website."
 #~ msgstr ""
 #~ "Skript/program som vil startes etter oppretting av bildet med bildets\n"
 #~ "filnavn spesifisert pЕ kommandolinjen som fЬlger:\n"
@@ -13978,8 +13988,7 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "\n"
 #~ "If your sound card is not fully 100% FULL DUPLEX (can do input and output "
 #~ "simultaneously),\n"
-#~ "then this may touch bugs in sound drivers/esound that may hang the "
-#~ "system.\n"
+#~ "then this may touch bugs in sound drivers/esound that may hang the system.\n"
 #~ "\n"
 #~ "You have been warned!"
 #~ msgstr ""
@@ -13987,8 +13996,8 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "\n"
 #~ "Hvis ditt lydkort ikke stЬtter FULL DUPLEX 100% (opptak og avspilling pЕ "
 #~ "same tid),\n"
-#~ "sЕ kan dette fremtvinge feil i lyddriverene/esound som kan fЕ systemet "
-#~ "til Е henge.\n"
+#~ "sЕ kan dette fremtvinge feil i lyddriverene/esound som kan fЕ systemet til Е "
+#~ "henge.\n"
 #~ "\n"
 #~ "Du er herved advart!"
 
@@ -14567,12 +14576,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Delete this message"
 #~ msgstr "Slett denne meldingen"
 
-#~ msgid "Previous message"
-#~ msgstr "Forrige melding"
-
-#~ msgid "Next message"
-#~ msgstr "Neste melding"
-
 #~ msgid "Select everything"
 #~ msgstr "Velg alt"
 
@@ -15038,8 +15041,7 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 
 #~ msgid "Forward this message in-line with your mail, so you can edit it"
 #~ msgstr ""
-#~ "Videresend denne meldingen \"in-line\" med din e-post, sЕ du kan redigere "
-#~ "den"
+#~ "Videresend denne meldingen \"in-line\" med din e-post, sЕ du kan redigere den"
 
 #~ msgid "Hide Deleted Messages"
 #~ msgstr "Skjul slettede meldinger"
@@ -15171,8 +15173,8 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "PLAIN"
 
 #~ msgid ""
-#~ "This option will connect to the server using a the PLAIN SASL mechanism "
-#~ "if the server supports it."
+#~ "This option will connect to the server using a the PLAIN SASL mechanism if "
+#~ "the server supports it."
 #~ msgstr ""
 #~ "Dette alternativet kobler til tjeneren med bruk av PLAIN SASL-mekanismen "
 #~ "hvis tjeneren stЬtter det."
@@ -15194,23 +15196,23 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Sikker POP"
 
 #~ msgid ""
-#~ "For connecting to POP servers over an SSL connection. The POP protocol "
-#~ "can also be used to retrieve mail from certain web mail providers and "
+#~ "For connecting to POP servers over an SSL connection. The POP protocol can "
+#~ "also be used to retrieve mail from certain web mail providers and "
 #~ "proprietary email systems."
 #~ msgstr ""
-#~ "For tilkobling til POP-tjenere over en SSL-forbindelse. POP-protokollen "
-#~ "kan ogsЕ brukes for Е hente e-post fra enkelte e-posttilbydere via web i "
-#~ "tillegg til proprietФre e-postsystemer."
+#~ "For tilkobling til POP-tjenere over en SSL-forbindelse. POP-protokollen kan "
+#~ "ogsЕ brukes for Е hente e-post fra enkelte e-posttilbydere via web i tillegg "
+#~ "til proprietФre e-postsystemer."
 
 #~ msgid "Secure SMTP"
 #~ msgstr "Sikker SMTP"
 
 #~ msgid ""
-#~ "For delivering mail by connecting to a remote mailhub using SMTP over an "
-#~ "SSL connection.\n"
+#~ "For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+#~ "connection.\n"
 #~ msgstr ""
-#~ "For levering av e-post via en ekstern e-posttjener med SMTP over en SSL-"
-#~ "forbindelse.\n"
+#~ "For levering av e-post via en ekstern e-posttjener med SMTP over en "
+#~ "SSL-forbindelse.\n"
 
 #~ msgid ""
 #~ "One or more of your servers are not configured correctly.\n"
@@ -15712,8 +15714,7 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid ""
 #~ "Could not read UID cache file \"%s\". You may receive duplicate messages."
 #~ msgstr ""
-#~ "Kunne ikke lese bufferfil for UID \"%s\". Du kan motta dupliserte "
-#~ "meldinger."
+#~ "Kunne ikke lese bufferfil for UID \"%s\". Du kan motta dupliserte meldinger."
 
 #~ msgid "Retrieving message %d of %d"
 #~ msgstr "Henter melding %d av %d"
@@ -15767,13 +15768,12 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Gratulerer, konfigurasjon av e-post er fullfЬrt.\n"
 
 #~ msgid ""
-#~ "Enter your name and email address to be used in outgoing mail. You may "
-#~ "also, optionally, enter the name of your organization, and the name of a "
-#~ "file to read your signature from."
+#~ "Enter your name and email address to be used in outgoing mail. You may also, "
+#~ "optionally, enter the name of your organization, and the name of a file to "
+#~ "read your signature from."
 #~ msgstr ""
-#~ "Skriv inn ditt navn og din e-post adresse for bruk i utgЕende post. Du "
-#~ "kan ogsЕ skrive inn navnet pЕ din organisasjon, og navnet pЕ en "
-#~ "signaturfil."
+#~ "Skriv inn ditt navn og din e-post adresse for bruk i utgЕende post. Du kan "
+#~ "ogsЕ skrive inn navnet pЕ din organisasjon, og navnet pЕ en signaturfil."
 
 #~ msgid "Full name:"
 #~ msgstr "Fullt navn:"
@@ -15785,50 +15785,47 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Type e-post-kilde:"
 
 #~ msgid ""
-#~ "Select the kind of mail server you have, and enter the relevant "
-#~ "information about it.\n"
+#~ "Select the kind of mail server you have, and enter the relevant information "
+#~ "about it.\n"
 #~ "\n"
-#~ "If the server requires authentication, you can click the \"Detect "
-#~ "supported types...\" button after entering the other information."
+#~ "If the server requires authentication, you can click the \"Detect supported "
+#~ "types...\" button after entering the other information."
 #~ msgstr ""
-#~ "Velg hvilken type e-post tjener du har, og skriv inn relevant informasjon "
-#~ "om denne.\n"
+#~ "Velg hvilken type e-post tjener du har, og skriv inn relevant informasjon om "
+#~ "denne.\n"
 #~ "\n"
-#~ "Hvis tjeneren trenger autentisering, kan du klikke pЕ \"SЬk etter "
-#~ "stЬttede typer...\" knappen etter at du har skrevet inn resten av "
-#~ "informasjonen."
+#~ "Hvis tjeneren trenger autentisering, kan du klikke pЕ \"SЬk etter stЬttede "
+#~ "typer...\" knappen etter at du har skrevet inn resten av informasjonen."
 
 #~ msgid "News source type:"
 #~ msgstr "Type news-kilde:"
 
 #~ msgid ""
-#~ "Select the kind of news server you have, and enter the relevant "
-#~ "information about it.\n"
+#~ "Select the kind of news server you have, and enter the relevant information "
+#~ "about it.\n"
 #~ "\n"
-#~ "If the server requires authentication, you can click the \"Detect "
-#~ "supported types...\" button after entering the other information."
+#~ "If the server requires authentication, you can click the \"Detect supported "
+#~ "types...\" button after entering the other information."
 #~ msgstr ""
-#~ "Velg hvilken type news-tjener du har, og skriv inn relevant informasjon "
-#~ "om denne.\n"
+#~ "Velg hvilken type news-tjener du har, og skriv inn relevant informasjon om "
+#~ "denne.\n"
 #~ "\n"
-#~ "Hvis tjeneren trenger autentisering, kan du klikke pЕ \"SЬk etter "
-#~ "stЬttede typer...\"-knappen etter at du har skrevet inn resten av "
-#~ "informasjonen."
+#~ "Hvis tjeneren trenger autentisering, kan du klikke pЕ \"SЬk etter stЬttede "
+#~ "typer...\"-knappen etter at du har skrevet inn resten av informasjonen."
 
 #~ msgid "Mail transport type:"
 #~ msgstr "Type e-post-transport"
 
 #~ msgid ""
-#~ "Select the kind of mail server you have, and enter the relevant "
-#~ "information about it.\n"
-#~ "If the server requires authentication, you can click the \"Detect "
-#~ "supported types...\" button after entering the other information."
+#~ "Select the kind of mail server you have, and enter the relevant information "
+#~ "about it.\n"
+#~ "If the server requires authentication, you can click the \"Detect supported "
+#~ "types...\" button after entering the other information."
 #~ msgstr ""
-#~ "Velg hvilken type e-post tjener du har, og skriv inn relevant informasjon "
-#~ "om denne.\n"
-#~ "Hvis tjeneren trenger autentisering, kan du klikke pЕ \"SЬk etter "
-#~ "stЬttede typer...\" knappen etter at du har skrevet inn resten av "
-#~ "informasjonen."
+#~ "Velg hvilken type e-post tjener du har, og skriv inn relevant informasjon om "
+#~ "denne.\n"
+#~ "Hvis tjeneren trenger autentisering, kan du klikke pЕ \"SЬk etter stЬttede "
+#~ "typer...\" knappen etter at du har skrevet inn resten av informasjonen."
 
 #~ msgid "Add Identity"
 #~ msgstr "Legg til identitet"
@@ -15894,8 +15891,7 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Videresend meldingen \"%s\""
 
 #~ msgid ""
-#~ "Failed to generate mime part from message while generating forwarded "
-#~ "message."
+#~ "Failed to generate mime part from message while generating forwarded message."
 #~ msgstr ""
 #~ "Kunne ikke generere MIME-del fra melding under generering av videresendt "
 #~ "melding."
@@ -16108,8 +16104,8 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "For reading mail delivered by the local system, and for storing mail on "
 #~ "local disk."
 #~ msgstr ""
-#~ "For lesing av e-post levert av det lokale systemet, og for lagring av e-"
-#~ "post pЕ lokal disk."
+#~ "For lesing av e-post levert av det lokale systemet, og for lagring av e-post "
+#~ "pЕ lokal disk."
 
 #~ msgid "Could not rename folder %s to %s: destination exists"
 #~ msgstr "Kunne ikke endre navn pЕ mappe %s til %s: mЕlet eksisterer"
diff --git a/po/pl.po b/po/pl.po
index 512826e930..50be7c2f05 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-07-13 10:36+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-07-13 19:47+0200\n"
 "Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -13,15 +13,15 @@ msgstr ""
 msgid "Factory to import VCard files into Evolution."
 msgstr "Generator importu plikСw z VCard do Evolution."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
 msgid "Imports VCard files into Evolution."
 msgstr "Impurtuje pliki VCard do Evolution."
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Karta: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -29,7 +29,7 @@ msgstr ""
 "\n"
 "Nazwa: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -37,7 +37,7 @@ msgstr ""
 "\n"
 "  Przedrostek: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -45,7 +45,7 @@ msgstr ""
 "\n"
 "  ImiЙ:       "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -53,7 +53,7 @@ msgstr ""
 "\n"
 "  Dodatkowe:  "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -61,7 +61,7 @@ msgstr ""
 "\n"
 "  Rodzina:    "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -69,7 +69,7 @@ msgstr ""
 "\n"
 "  Przyrostek: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -77,7 +77,7 @@ msgstr ""
 "\n"
 "Data urodzenia: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -85,7 +85,7 @@ msgstr ""
 "\n"
 "Adres:"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -93,13 +93,13 @@ msgstr ""
 "\n"
 "  Skrzynka pocztowa: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -107,7 +107,7 @@ msgstr ""
 "\n"
 "  Ulica:       "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -115,7 +115,7 @@ msgstr ""
 "\n"
 "  Miasto:      "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -123,7 +123,7 @@ msgstr ""
 "\n"
 "  Region:      "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -131,7 +131,7 @@ msgstr ""
 "\n"
 "  Kod pocztowy: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -139,13 +139,13 @@ msgstr ""
 "\n"
 "  Kraj:        "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -153,7 +153,7 @@ msgstr ""
 "\n"
 "Telefony:\n"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -161,7 +161,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -169,7 +169,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -177,13 +177,13 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -191,7 +191,7 @@ msgstr ""
 "\n"
 "Strefa czasowa: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -199,7 +199,7 @@ msgstr ""
 "\n"
 "PoЁo©enie geograficzne: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -207,7 +207,7 @@ msgstr ""
 "\n"
 "Stanowisko sЁu©bowe: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -215,7 +215,7 @@ msgstr ""
 "\n"
 "Organizacja: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -223,7 +223,7 @@ msgstr ""
 "\n"
 "  Nazwa: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -231,7 +231,7 @@ msgstr ""
 "\n"
 "  Jednostka: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -239,7 +239,7 @@ msgstr ""
 "\n"
 "  Jednostka2: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -247,7 +247,7 @@ msgstr ""
 "\n"
 "  Jednostka3: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -255,7 +255,7 @@ msgstr ""
 "\n"
 "  Jednostka4: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -263,7 +263,7 @@ msgstr ""
 "\n"
 "Kategorie: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -281,7 +281,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -289,7 +289,7 @@ msgstr ""
 "\n"
 "Unikatowy napis: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -297,49 +297,49 @@ msgstr ""
 "\n"
 "Klucz publiczny: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:4045
 #, c-format
 msgid "VCard for %s"
 msgstr ""
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:1
-#: addressbook/backend/ebook/load-pine-addressbook.c:1
-#: addressbook/backend/ebook/test-client-list.c:1
-#: addressbook/backend/ebook/test-client.c:1
-#: addressbook/conduit/address-conduit.c:1
-#: addressbook/gui/component/addressbook-factory.c:1
-#: calendar/conduits/calendar/calendar-conduit.c:1
-#: calendar/conduits/todo/todo-conduit.c:1
-#: calendar/gui/alarm-notify/notify-main.c:1 calendar/gui/main.c:1
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+#: addressbook/backend/ebook/load-pine-addressbook.c:22
+#: addressbook/backend/ebook/test-client-list.c:23
+#: addressbook/backend/ebook/test-client.c:33
+#: addressbook/conduit/address-conduit.c:1092
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Nie mo©na zainicjowaФ Bonobo"
 
-#: addressbook/conduit/address-conduit.c:1
+#: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr "Nie mo©na wczytaФ kursora\n"
 
-#: addressbook/conduit/address-conduit.c:1
+#: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
 msgstr "Nie mo©na wczytaФ EBook\n"
 
-#: addressbook/conduit/address-conduit.c:1
-#: calendar/conduits/calendar/calendar-conduit.c:1
-#: calendar/conduits/todo/todo-conduit.c:1
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Nie mo©na uruchomiФ serwera wombat"
 
-#: addressbook/conduit/address-conduit.c:1
-#: calendar/conduits/calendar/calendar-conduit.c:1
-#: calendar/conduits/todo/todo-conduit.c:1
+#: addressbook/conduit/address-conduit.c:655
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Nie mo©na uruchomiФ wombata"
 
-#: addressbook/conduit/address-conduit.c:1
-#: addressbook/conduit/address-conduit.c:1
+#: addressbook/conduit/address-conduit.c:687
+#: addressbook/conduit/address-conduit.c:690
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -347,161 +347,162 @@ msgstr ""
 msgid "A Bonobo control for an address popup."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
 msgid "A Bonobo control for displaying an address."
 msgstr "Komponent Bonobo wy╤wietlaj╠cy adres."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
 msgid "A sample Bonobo control which displays an addressbook."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Evolution Addressbook minicard viewer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Evolution component for handling contacts."
 msgstr "Komponent Evolution obsЁuguj╠cy kontakty."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Factory for the Addressbook Minicard control"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Factory for the Addressbook's address displayer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook's address popup"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Evolution addressbook component."
 msgstr "Generator komponentСw ksi╠©ki adresowej Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:148
 msgid "LDAP Server"
 msgstr "Serwer LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:150
 msgid "File"
 msgstr "Plik"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:153
 msgid "Unknown addressbook type"
 msgstr "Nieznany typ ksi╠©ki adresowej"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:163
 msgid "None (anonymous mode)"
 msgstr "Nic (tryb anonimowy)"
 
-#: addressbook/gui/component/addressbook-config.c:1
-#: camel/camel-sasl-plain.c:1 camel/providers/imap/camel-imap-provider.c:1
-#: camel/providers/nntp/camel-nntp-store.c:1
-#: camel/providers/pop3/camel-pop3-provider.c:1 mail/mail-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
 msgid "Password"
 msgstr "HasЁo"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:168
 msgid "Unknown auth type"
 msgstr "Nieznany typ uwierzytelnienia"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:177
 msgid "Base"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:179
 msgid "One"
 msgstr "Jeden"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "Subtree"
 msgstr "Poddrzewo"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:184
 msgid "Unknown scope type"
 msgstr "Nieznany typ zakresu"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:349
 msgid "Bind DN:"
 msgstr "ё╠cz z DN:"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:350
 msgid "FIXME Bind DN Help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1
-#: mail/mail-config.glade.h:1
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
 msgid "Remember this password"
 msgstr "ZapamiЙtanie hasЁa"
 
-#: addressbook/gui/component/addressbook-config.c:1
-#: mail/mail-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
 msgid "Host:"
 msgstr "Komputer:"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:404
 msgid "FIXME Host help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:406
 msgid "Root DN:"
 msgstr "NadrzЙdny DN:"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "FIXME Root DN help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:411
 msgid "Port:"
 msgstr "Port:"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:412
 msgid "FIXME Port help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:432
 msgid "Search Scope:"
 msgstr "Zakres wyszukiwania:"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:479
 msgid "Authentication:"
 msgstr "Uwierzytelnianie:"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:501
 msgid "Advanced LDAP Options"
 msgstr "Zaawansowane opcje LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:1
-#: mail/mail-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
 msgid "Path:"
 msgstr "╕cie©ka:"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:523
 msgid "FIXME Path Help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:528
 msgid "Create path if it doesn't exist."
 msgstr "Stworzenie ╤cie©ki je╤li nie istnieje."
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:663
 msgid "Edit Addressbook"
 msgstr "Ustawienia ksi╠©ki adresowej"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:665
 msgid "Add Addressbook"
 msgstr "Dodaj ksi╠©kЙ adresow╠"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:683
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
@@ -509,22 +510,22 @@ msgstr ""
 "Wybierz rodzaj uzywanej ksi╠©ki adresowej i wprowad╪ koniecznie inforacje o "
 "niej."
 
-#: addressbook/gui/component/addressbook-config.c:1
-#: mail/mail-config.glade.h:1 my-evolution/e-summary-preferences.c:1
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:692
 msgid "FIXME Name help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1
-#: calendar/gui/e-itip-control.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
 msgid "Description:"
 msgstr "Opis:"
 
-#: addressbook/gui/component/addressbook-config.c:1
+#: addressbook/gui/component/addressbook-config.c:695
 msgid "FIXME Description help text here"
 msgstr ""
 
@@ -532,50 +533,49 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "╞rСdЁa ksi╠©ek adresowych"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:2
 msgid "De_lete"
 msgstr "_UsuЯ"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:3
 msgid "Name"
 msgstr "Nazwa"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:4
 msgid "URI"
 msgstr "URI"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-#: mail/mail-config.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: mail/mail-config.glade.h:1 ui/evolution-comp-editor.xml.h:1
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1 ui/evolution-subscribe.xml.h:1
-#: ui/evolution.xml.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: addressbook/gui/component/addressbook-storage.c:1
+#: addressbook/gui/component/addressbook-storage.c:118
 msgid "Other Contacts"
 msgstr "Inne kontakty"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:345
 #, c-format
 msgid "Enter password for %s"
 msgstr "Podaj hasЁo dla %s"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:373
 msgid "Unable to open addressbook"
 msgstr "Nie mo©na otworzyФ ksi╠©ki adresowej"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:380
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -584,7 +584,7 @@ msgstr ""
 "Nie mo©na otworzyФ tej ksi╠©ki adresowej. Mo©e to byФ spowodowane\n"
 "wprowadzeniem niepoprawnego URI lub niedostЙpno╤ci╠ serwera LDAP."
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:385
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -595,7 +595,7 @@ msgstr ""
 "Aby mСc wykorzystaФ LDAP, nale©y pobraФ OpenLDAP spod podanego\n"
 "poni©ej adresu i ponownie skompilowaФ Evolution ze ╪rСdeЁ.\n"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:393
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -603,92 +603,83 @@ msgstr ""
 "Nie mo©na otworzyФ tej ksi╠©ki adresowej. Upewnij siЙ, ©e ╤cie©ka\n"
 "ustnieje oraz ©e ma ustawione odpowiednie uprawnienia."
 
-#: addressbook/gui/component/addressbook.c:1 calendar/gui/gnome-cal.c:1
+#: addressbook/gui/component/addressbook.c:554
 msgid "Any field contains"
 msgstr "Jakiekolwiek pole zawiera"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:555
 msgid "Name contains"
 msgstr "Nazwa zawiera"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:556
 msgid "Email contains"
 msgstr "E-mail zawiera"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:557
 msgid "Category contains"
 msgstr "Kategoria zawiera"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr "URI ktСre ma wy╤wietliФ przegl╠darka katalogСw"
 
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * card.
-#.
-#: addressbook/gui/component/e-address-popup.c:1
-msgid "(none)"
-msgstr "(brak)"
-
-#: addressbook/gui/component/e-address-popup.c:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
 msgid "Primary Email"
 msgstr "GЁСwny e-mail"
 
-#: addressbook/gui/component/e-address-popup.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
 msgid "Email 2"
 msgstr "E-mail 2"
 
-#: addressbook/gui/component/e-address-popup.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
 msgid "Email 3"
 msgstr "E-mail 3"
 
-#: addressbook/gui/component/e-address-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:579
 msgid "Select an Action"
 msgstr "WybСr czynno╤ci"
 
-#: addressbook/gui/component/e-address-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:585
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "StwСrz nowy kontakt \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:597
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Dodaj adres do istniej╠cego kontaktu \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:859
 msgid "Querying Addressbook..."
 msgstr "Sprawdzanie ksi╠©ki adresowej..."
 
-#: addressbook/gui/component/e-address-popup.c:1
-#: addressbook/gui/component/e-address-widget.c:1
-#: addressbook/gui/component/select-names/e-select-names-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
 msgid "Edit Contact Info"
 msgstr "ZmieЯ informacje o kontakcie"
 
-#: addressbook/gui/component/e-address-popup.c:1
-#: addressbook/gui/component/e-address-widget.c:1
-#: addressbook/gui/component/select-names/e-select-names-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
 msgid "Add to Contacts"
 msgstr "Dodaj do kontaktСw"
 
-#: addressbook/gui/component/e-address-popup.c:1
+#: addressbook/gui/component/e-address-popup.c:989
 msgid "Merge E-Mail Address"
 msgstr "DoЁ╠czenie adresu e-mail"
 
-#: addressbook/gui/component/e-address-widget.c:1
+#: addressbook/gui/component/e-address-widget.c:365
 msgid "Disable Queries"
 msgstr "WyЁ╠cz zapytania"
 
-#: addressbook/gui/component/e-address-widget.c:1
+#: addressbook/gui/component/e-address-widget.c:365
 msgid "Enable Queries (Dangerous!)"
 msgstr "WЁ╠cz zapytania (Niebezpieczne!)"
 
@@ -696,184 +687,191 @@ msgstr "WЁ╠cz zapytania (Niebezpieczne!)"
 msgid "Evolution's addressbook name selection interface."
 msgstr "Interfejs wyboru nazwy ksi╠©ki adresowej Evolution"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Generator interfejsu wyboru nazwy ksi╠©ki adresowej Evolution"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:1
-#: addressbook/gui/component/select-names/e-select-names.c:1
-#: composer/e-msg-composer-attachment-bar.c:1 filter/filter-filter.c:1
-#: filter/filter-rule.c:1 filter/filter.glade.h:1
-#: shell/e-shortcuts-view.c:1 shell/e-shortcuts-view.c:1
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
 msgid "Remove"
 msgstr "UsuЯ"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:1
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
 msgid "Remove All"
 msgstr "UsuЯ wszystko"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:1
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
 msgid "Send HTML Mail?"
 msgstr "Czy wysЁaФ list jako HTML?"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Zmieniony kontakt:"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Message Recipients"
 msgstr "Odbiorcy listu"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Select Names"
 msgstr "WybСr nazw"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Select name from _folder:"
 msgstr "Wybierz nazwЙ z f_olderu:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:4
 msgid "_Category:"
 msgstr "_Kategoria:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-#: mail/mail-search-dialogue.c:1
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "_Znajd╪"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "Add"
-msgstr "Dodaj"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "_Rocznice:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "_Praca"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "_Faks sЁu©bowy"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "K_ategorie..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Edytor kontaktСw"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: calendar/gui/dialogs/task-editor.c:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "SzczegСЁy"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Zapisz jako:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "OgСlne"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Nowy typ telefonu"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "_Notatki:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
 msgid "Organi_zation:"
 msgstr "_Organizacja:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Typy telefonСw"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "Chce otrzymywaФ listy w HTML-u"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Adres strony WWW:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "_Adres..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "_Nazwisko asystenta:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "_Urodziny:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Praca"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
 msgid "_Contacts..."
 msgstr "_Kontakty..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/meeting-page.c:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1 mail/folder-browser.c:1
-#: mail/mail-config.glade.h:1 ui/evolution-mail-message.xml.h:1
-#: ui/evolution-tasks.xml.h:1 ui/evolution.xml.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_UsuЯ"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "_OddziaЁ:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "_PeЁna nazwa..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_Dom"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "TytuЁ _sЁu©bowy:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "Nazwisko s_zefa:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "P_rzeno╤ny"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "_Przydomek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "_Biuro:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_ZawСd:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "_MaЁ©onek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "_To jest adres pocztowy"
 
@@ -881,112 +879,112 @@ msgstr "_To jest adres pocztowy"
 msgid "Delete Contact?"
 msgstr "Usun╠Ф kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "Ten kontakt przynale©y do nastЙpuj╠cych kategorii:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Asystent"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Praca"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Praca 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Faks sЁu©bowy"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Telefon kontaktowy"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "SamochСd"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Dom"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Dom 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Faks w domu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Przeno╤ny"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: mail/mail-config.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Inne"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Inny faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "GЁСwny"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTy/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:1
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Szybkie dodawanie kontaktСw"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:1
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "PeЁna edycja"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "PeЁna nazwa"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:1
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "E-mail"
 
@@ -994,43 +992,43 @@ msgstr "E-mail"
 msgid "Address _2:"
 msgstr "Adres _2:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Kanada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Sprawd╪ adres"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "_Kraj:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Finlandia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "USA"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Adres:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_Miasto:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "Skrzynka p_ocztowa:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "_Stan/Prowincja:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "_Kod pocztowy:"
 
@@ -1038,67 +1036,67 @@ msgstr "_Kod pocztowy:"
 msgid "Check Full Name"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr ""
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "II"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "Panna"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Pan"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Pani"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Panna"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_ImiЙ:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_Nazwisko:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Drugie:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_Przyrostek:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_TytuЁ:"
 
@@ -1106,28 +1104,28 @@ msgstr "_TytuЁ:"
 msgid "List _name:"
 msgstr "Nazwa _listy:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
 msgid "Members"
 msgstr "CzЁonkowie"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 msgid "Type an email address or drag a contact into the list below:"
 msgstr "Wprowad╪ adres e-mail lub przeci╠gnij kontakt do poni©szej listy:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Ukrywanie adresСw przy wysyЁaniu do tej listy"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "_Remove"
 msgstr "_UsuЯ"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "contact-list-editor"
 msgstr "Edytor listy kontaktСw"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:1
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
 msgid "Contact List Editor"
 msgstr "Edytor listy kontaktСw"
 
@@ -1135,20 +1133,20 @@ msgstr "Edytor listy kontaktСw"
 msgid "Add Anyway"
 msgstr "Dodaj mimo wszystko"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Duplicate Contact Detected"
 msgstr "Wykryto powtСrzony kontakt"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
 msgid "New Contact:"
 msgstr "Nowy Kontakt:"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
 msgid "Original Contact:"
 msgstr "Oryginalny kontakt:"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -1157,18 +1155,14 @@ msgstr ""
 "Czy chcesz dodaФ go mimo wszystko?"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
-msgid "Change Anyway"
-msgstr "ZmieЯ mimo wszystko"
-
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Zmieniony kontakt:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Conflicting Contact:"
 msgstr "Koliduj╠cy kontakt:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -1176,8 +1170,13 @@ msgstr ""
 "Folder zawiera ju© kontakt o tej samej nazwie lub adresie e-mail.\n"
 "Czy chcesz dodaФ go mimo wszystko?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:1
-#: mail/mail-search.c:1
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+#, fuzzy
+msgid "_Change Anyway"
+msgstr "ZmieЯ mimo wszystko"
+
+#: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Wyszukiwanie"
 
@@ -1185,341 +1184,342 @@ msgstr "Wyszukiwanie"
 msgid "123"
 msgstr "123"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:2
 msgid "a"
 msgstr "a"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:3
 msgid "b"
 msgstr "b"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:4
 msgid "c"
 msgstr "c"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:5
 msgid "d"
 msgstr "d"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:6
 msgid "e"
 msgstr "e"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:7
 msgid "f"
 msgstr "f"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:8
 msgid "g"
 msgstr "g"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:9
 msgid "h"
 msgstr "h"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:10
 msgid "i"
 msgstr "i"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:11
 msgid "j"
 msgstr "j"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:12
 msgid "k"
 msgstr "k"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:13
 msgid "l"
 msgstr "l"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:14
 msgid "m"
 msgstr "m"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:15
 msgid "n"
 msgstr "n"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:16
 msgid "o"
 msgstr "o"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:17
 msgid "p"
 msgstr "p"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:18
 msgid "q"
 msgstr "q"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:19
 msgid "r"
 msgstr "r"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:20
 msgid "s"
 msgstr "s"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:21
 msgid "t"
 msgstr "t"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:22
 msgid "u"
 msgstr "u"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:23
 msgid "v"
 msgstr "v"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:24
 msgid "w"
 msgstr "w"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:25
 msgid "x"
 msgstr "x"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:26
 msgid "y"
 msgstr "y"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: addressbook/gui/widgets/alphabet.glade.h:27
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:1
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "Zapisz jako VCard"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr "Wy╤lij kontakt do innej osoby"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Send message to contact"
 msgstr "Wy╤lij list do kontaktu"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-mail-message.xml.h:1
-#: ui/evolution-tasks.xml.h:1 ui/my-evolution.xml.h:1
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Wydrukuj"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr "Wydrukuj kopertЙ"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1 filter/filter.glade.h:1
-#: filter/libfilter-i18n.h:1 mail/mail-config.glade.h:1
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-comp-editor.xml.h:1
-#: ui/evolution-mail-message.xml.h:1 ui/evolution-tasks.xml.h:1
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "UsuЯ"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:1
-#: addressbook/gui/widgets/e-addressbook-util.c:1
-#: addressbook/gui/widgets/e-minicard.c:1
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
 msgid "Error modifying card"
 msgstr "BЁ╠d przy modyfikacji karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:34
 msgid "Success"
 msgstr "Sukces"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
-#: camel/providers/imap/camel-imap-command.c:1 shell/e-storage.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
 msgid "Unknown error"
 msgstr "Nieznany bЁ╠d"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:36
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1 shell/e-storage.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
 msgid "Permission denied"
 msgstr "Brak uprawnieЯ"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Card not found"
 msgstr "Nie odnaleziono karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Card ID already exists"
 msgstr "Karta z tym ID ju© istnieje"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Protocol not supported"
 msgstr "ProtokСЁ nie jest obsЁugiwany"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Canceled"
 msgstr "Anulowano"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Other error"
 msgstr "Inny bЁ╠d"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 msgid "Error adding list"
 msgstr "BЁ╠d przy dodawaniu listy"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 msgid "Error adding card"
 msgstr "BЁ╠d przy dodawaniu karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:68
 msgid "Error modifying list"
 msgstr "BЁ╠d przy modyfikacji listy"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 msgid "Error removing list"
 msgstr "BЁ╠d przy usuwaniu listy"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:1
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
 msgid "Error removing card"
 msgstr "BЁ╠d przy usuwaniu karty"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* Kliknij tutaj by dodaФ kontakt *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr "Zapisz jako"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "GЁСwny telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr "Telefon asystenta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "Telefon firmowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "Telefon domowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Organizacja"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "Adres firmowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "Adres domowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "Telefon przeno╤ny"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "Telefon samochodowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "Telefon domowy 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "Inny telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "Inny adres"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Serwis WWW"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "OddziaЁ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Biuro"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "TytuЁ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "ZawСd"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Menad©er"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Przydomek"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Notka"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr "URL sygnalizuj╠cy zajЙto╤Ф"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 msgid "Done."
 msgstr "Gotowe."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
 msgid "Removing cards..."
 msgstr "Usuwanie kart..."
 
-#: addressbook/gui/widgets/e-minicard-control.c:1
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Zapisz w ksi╠©ce adresowej"
 
-#: addressbook/gui/widgets/e-minicard-view.c:1
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1533,7 +1533,7 @@ msgstr ""
 "\n"
 "PodwСjne klikniЙcie stworzy nowy Kontakt."
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:1
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr "Widok karty"
 
@@ -1541,178 +1541,184 @@ msgstr "Widok karty"
 msgid "10 pt. Tahoma"
 msgstr "10-punktowa Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:2
 msgid "8 pt. Tahoma"
 msgstr "8-punktowa Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:3
 msgid "Blank forms at end:"
 msgstr "Pustych formatek na koЯcu:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:4
 msgid "Body"
 msgstr "Tre╤Ф"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:5
 msgid "Bottom:"
 msgstr "Dolny:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:6
 msgid "Dimensions:"
 msgstr "Wymiary:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
-msgid "Font..."
+#: addressbook/printing/e-contact-print.glade.h:7
+#, fuzzy
+msgid "F_ont..."
 msgstr "Czcionka..."
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
 msgstr "Czcionki"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:9
 msgid "Footer:"
 msgstr "Stopka:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:10
 msgid "Format"
 msgstr "Format"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:11
 msgid "Header"
 msgstr "GЁСwka"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
 msgstr "GЁСwka/Stopka"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:13
 msgid "Headings"
 msgstr "NagЁСwki"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:14
 msgid "Headings for each letter"
 msgstr "NagЁСwek dla ka©dej litery"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:15
 msgid "Height:"
 msgstr "Wysoko╤Ф:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:16
 msgid "Immediately follow each other"
 msgstr "Bezpo╤rednio jedna po drugiej"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:17
 msgid "Include:"
 msgstr "DoЁ╠czanie:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:18
 msgid "Landscape"
 msgstr "Pejza©"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:19
 msgid "Left:"
 msgstr "Lewy:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:20
 msgid "Letter tabs on side"
 msgstr "ZakЁadki liter z boku"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:21
 msgid "Margins"
 msgstr "Marginesy"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:22
 msgid "Number of columns:"
 msgstr "Liczba kolumn:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "Opcje"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:24
 msgid "Orientation"
 msgstr "UЁo©enie"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:25
 msgid "Page"
 msgstr "Strona"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:26
 msgid "Page Setup:"
 msgstr "Ustawienia strony:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:27
 msgid "Paper"
 msgstr "Papier"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:28
 msgid "Paper source:"
 msgstr "╛rСdЁo papieru:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:29
 msgid "Portrait"
 msgstr "Portret"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:30
 msgid "Preview:"
 msgstr "Podgl╠d:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:31
 msgid "Print using gray shading"
 msgstr "Drukowanie przy u©yciu odcieni szaro╤ci"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:32
 msgid "Reverse on even pages"
 msgstr "Odwrotnie na stronach parzystych"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:33
 msgid "Right:"
 msgstr "Prawy:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:34
 msgid "Sections:"
 msgstr "Sekcje:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:35
 msgid "Shading"
 msgstr "Cieniowanie"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:36
 msgid "Size:"
 msgstr "Rozmiar:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:37
 msgid "Start on a new page"
 msgstr "Rozpoczynana na nowej stronie"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:38
 msgid "Style name:"
 msgstr "Nazwa stylu:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:39
 msgid "Top:"
 msgstr "GСrny:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Type:"
 msgstr "Typ:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: addressbook/printing/e-contact-print.glade.h:41
 msgid "Width:"
 msgstr "Szeroko╤Ф:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1
-#: calendar/conduits/todo/todo-conduit.c:1
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Czcionka..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "BЁ╠d przy komunikacji z serwerem kalendarza"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1
-#: calendar/conduits/calendar/calendar-conduit.c:1
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:1
-#: calendar/conduits/todo/todo-conduit.c:1
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -1720,81 +1726,86 @@ msgstr ""
 msgid "A sample Bonobo control which displays an calendar."
 msgstr "Komponent Bonobo wy╤wietlaj╠cy kalendarz."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
 msgid "Evolution calendar executive summary component."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Przegl╠darka kalendarza iTip/iMip"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 msgid "Evolution component for handling the calendar."
 msgstr "Komponent Bonobo obsЁuguj╠cy kalendarz."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Factory for the Calendar Summary component."
 msgstr "Generator komponentu zestawienia kalendarza"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Factory for the Evolution calendar component."
 msgstr "Generator komponentСw kalendarza Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the sample Calendar control"
 msgstr ""
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Generator komponentСw kalendarza Evolution."
+
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
 msgstr "UsЁuga przypominania za pomoc╠ alarmu"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
 msgid "Factory for the alarm notification service"
 msgstr "Generator usЁugi przypominania za pomoc╠ alarmu"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:1
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
 #, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr "Przypomnienie o terminie rozpoczynaj╠cym siЙ o %s i koЯcz╠cym o %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:1
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
 #, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr "Przypomnienie o terminie rozpoczynaj╠cym siЙ o %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:1
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
 #, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr "Przypomnienie o terminie koЯcz╠cym siЙ o %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:1
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
 msgid "Notification about your appointment"
 msgstr "Przypomnienie o terminie"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:1
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
 #, c-format
 msgid "Notification about your task starting on %s and ending on %s"
 msgstr "Przypomnienie o zadaniu rozpoczynaj╠cym siЙ o %s i koЯcz╠cym o %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:1
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
 #, c-format
 msgid "Notification about your task starting on %s"
 msgstr "Przypomnienie o zadaniu rozpoczynaj╠cym siЙ o %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:1
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
 #, c-format
 msgid "Notification about your task ending on %s"
 msgstr "Przypomnienie o zadaniu koЯcz╠cym siЙ o %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:1
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
 msgid "Notification about your task"
 msgstr "Przypomnienie o zadaniu"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:1
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarm o %A %d %b %Y %H:%M"
 
@@ -1803,178 +1814,201 @@ msgstr "Alarm o %A %d %b %Y %H:%M"
 msgid "C_lose"
 msgstr "Zam_knij"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "Snoo_ze"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
 msgid "Snooze time (minutes)"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
 msgid "_Edit appointment"
 msgstr "_Zmodyfikuj termin"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1
+#: calendar/gui/alarm-notify/alarm-queue.c:487
 msgid "No description available."
 msgstr "Brak opisu."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1
-#: calendar/gui/alarm-notify/alarm-queue.c:1
-#: calendar/gui/alarm-notify/alarm-queue.c:1
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
 msgid "Reminder of your appointment at "
 msgstr "Przypomnienie o terminie "
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1
+#: calendar/gui/alarm-notify/alarm-queue.c:991
 msgid "Snooze"
 msgstr ""
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:1
-#: calendar/gui/alarm-notify/alarm-queue.c:1
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
 msgid "Ok"
 msgstr "Ok"
 
-#: calendar/gui/alarm-notify/notify-main.c:1
+#: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
 "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
 "know."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:1 calendar/gui/main.c:1
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
 msgid "Could not initialize GNOME"
 msgstr "Nie mo©na zainicjowaФ GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:1 calendar/gui/main.c:1
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
 msgid "Could not initialize gnome-vfs"
 msgstr "Nie mo©na zainicjowaФ gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:1
+#: calendar/gui/alarm-notify/notify-main.c:115
 msgid "Could not create the alarm notify service factory"
 msgstr "Nie mo©na stworzyФ generatora usЁugi przypominania za pomoc╠ alarmu"
 
-#: calendar/gui/calendar-commands.c:1
-msgid "File not found"
-msgstr "Nie odnaleziono pliku"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A, %d %B %Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:1
-msgid "Open calendar"
-msgstr "OtwСrz kalendarz"
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:1
-msgid "Save calendar"
-msgstr "Zapisz kalendarz"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:1
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Nie mo©na stworzyФ widoku kalendarza.  Zweryfikuj ustawienia ORBita i OAF-a."
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "Publiczny"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Prywatny"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Tajny"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/dialogs/alarm-page.c:1
-#: calendar/gui/dialogs/alarm-page.c:1
-#: camel/providers/smtp/camel-smtp-transport.c:1
-#: widgets/misc/e-charset-picker.c:1 widgets/misc/e-charset-picker.c:1
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 mail/message-list.c:1
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Wysoki"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 mail/message-list.c:1
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "ZwykЁy"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 mail/message-list.c:1
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Niski"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Przezroczy╤cie"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Przejrzy╤cie"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Przed rozpoczЙciem"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "Trwaj╠ce"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "ZakoЯczone"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 camel/camel-service.c:1
-#: camel/camel-service.c:1
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Anulowane"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:1 e-util/e-time-utils.c:1
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:1 e-util/e-time-utils.c:1
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1985,26 +2019,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/e-timezone-dialog.c:1
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
 #: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/e-calendar-table.c:1
-#: mail/mail-account-gui.c:1 mail/mail-accounts.c:1
-#: mail/mail-accounts.c:1 mail/mail-config.glade.h:1
-#: shell/e-shell-view.c:1 widgets/misc/e-cell-date-edit.c:1
-#: widgets/misc/e-dateedit.c:1 widgets/misc/e-dateedit.c:1
-#: widgets/misc/e-dateedit.c:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Brak"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2014,80 +2049,84 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Warto╤Ф procentowa musi siЙ zawieraФ w przedziale od 0 do 100 wЁ╠cznie"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "Priorytet musi byФ okre╤lony jako \"Wysoki\", \"ZwykЁy\", \"Niski\" lub "
 "\"Niezdefiniowany\""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1
-#: calendar/gui/dialogs/task-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Niezdefiniowany"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "Powtarzanie"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Przyporz╠dkowany"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Tak"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Nie"
 
-#: calendar/gui/calendar-view-factory.c:1 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Widok dnia"
 
-#: calendar/gui/calendar-view-factory.c:1 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
 msgid "Work Week View"
 msgstr "Widok tygodnia roboczego"
 
-#: calendar/gui/calendar-view-factory.c:1 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
 msgid "Week View"
 msgstr "Widok tygodnia"
 
-#: calendar/gui/calendar-view-factory.c:1 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
 msgid "Month View"
 msgstr "Widok miesi╠ca"
 
-#: calendar/gui/control-factory.c:1
+#: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "URI wy╤wietlany przez kalendarz"
 
-#: calendar/gui/dialogs/alarm-options.c:1
+#: calendar/gui/dialogs/alarm-options.c:354
 msgid "Audio Alarm Options"
 msgstr "Ustawienia alarmu d╪wiЙkowego"
 
-#: calendar/gui/dialogs/alarm-options.c:1
+#: calendar/gui/dialogs/alarm-options.c:363
 msgid "Message Alarm Options"
 msgstr "Ustawienia alarmu z komunikatem"
 
-#: calendar/gui/dialogs/alarm-options.c:1
+#: calendar/gui/dialogs/alarm-options.c:372
 msgid "Mail Alarm Options"
 msgstr "Ustawienia alarmu z wysЁaniem listu"
 
-#: calendar/gui/dialogs/alarm-options.c:1
+#: calendar/gui/dialogs/alarm-options.c:381
 msgid "Program Alarm Options"
 msgstr "Ustawienia alarmu z uruchomieniem programu"
 
-#: calendar/gui/dialogs/alarm-options.c:1
+#: calendar/gui/dialogs/alarm-options.c:390
 msgid "Unknown Alarm Options"
 msgstr "Ustawienia nieznanego alarmu"
 
@@ -2095,124 +2134,124 @@ msgstr "Ustawienia nieznanego alarmu"
 msgid "Alarm Repeat"
 msgstr "PowtСrzenia alarmu"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:2
 msgid "FIXME: mail alarm options"
 msgstr "Ustawienia alarmu z wysЁaniem listu"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Wy╤wietlany komunikat"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Play sound:"
 msgstr "Odtwarzany d╪wiЙk:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Repeat the alarm"
 msgstr "Powtarzanie alarmu"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Run program:"
 msgstr "Uruchamiany program:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "Argumenty programu:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1 filter/filter-datespec.c:1
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
 msgid "days"
 msgstr "dni"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "extra times every"
 msgstr "dodatkowych razy co"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1 filter/filter-datespec.c:1
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
 msgid "hours"
 msgstr "godzin"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1 filter/filter-datespec.c:1
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
 msgid "minutes"
 msgstr "minut"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:284
 #, c-format
 msgid "%d days"
 msgstr "%d dni"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:286
 msgid "1 day"
 msgstr "1 dzieЯ"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:289
 #, c-format
 msgid "%d weeks"
 msgstr "%d tygodni"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:291
 msgid "1 week"
 msgstr "1 tydzieЯ"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:294
 #, c-format
 msgid "%d hours"
 msgstr "%d godzin"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:296
 msgid "1 hour"
 msgstr "1 godzina"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:299
 #, c-format
 msgid "%d minutes"
 msgstr "%d minut"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:301
 msgid "1 minute"
 msgstr "1 minuta"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:304
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:306
 msgid "1 second"
 msgstr "1 sekunda"
 
-#: calendar/gui/dialogs/alarm-page.c:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Odtworzenie d╪wiЙku"
 
-#: calendar/gui/dialogs/alarm-page.c:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Wy╤wietlenie komunikatu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
 msgstr "WysЁanie listu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Uruchomienie programu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:361
 msgid "before start of appointment"
 msgstr "przed pocz╠tkiem terminu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:364
 msgid "after start of appointment"
 msgstr "po pocz╠tku terminu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:374
 msgid "before end of appointment"
 msgstr "przed koЯcem terminu"
 
-#: calendar/gui/dialogs/alarm-page.c:1
+#: calendar/gui/dialogs/alarm-page.c:377
 msgid "after end of appointment"
 msgstr "po koЯcu terminu"
 
@@ -2222,56 +2261,56 @@ msgstr "po koЯcu terminu"
 msgid "Basics"
 msgstr "Proste"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
 msgid "Date/Time:"
 msgstr "Data/Czas:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Reminders"
 msgstr "Przypominanie"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Zestawienie:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "_Options..."
 msgstr "_Opcje..."
 
 #. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:1 filter/libfilter-i18n.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
 msgid "after"
 msgstr "po"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1 filter/libfilter-i18n.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
 msgid "before"
 msgstr "przed"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
 msgstr "dni"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
 msgstr "koniec terminu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
 msgstr "godzin"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1 mail/mail-config.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
 msgid "minute(s)"
 msgstr "minut"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr "pocz╠tek terminu"
 
@@ -2279,316 +2318,315 @@ msgstr "pocz╠tek terminu"
 msgid "05 minutes"
 msgstr "05 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid "10 minutes"
 msgstr "10 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
 msgid "12 hour (am/pm)"
 msgstr "12-godzinny (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "24 hour"
 msgstr "24-godzinny"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "30 minutes"
 msgstr "30 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "60 minutes"
 msgstr "60 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Beep when alarm windows appear."
 msgstr "SygnaЁ d╪wiЙkowy przy pojawianiu siЙ okien alarmu."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: my-evolution/my-evolution.glade.h:1 shell/e-shortcuts.c:1
-#: ui/evolution-calendar.xml.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Kalendarz"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "Ustawienia termiarza"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Color for overdue tasks"
 msgstr "Kolor zalegЁych zadaЯ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for tasks due today"
 msgstr "Kolor dzisiejszych zadaЯ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Colors for Tasks"
 msgstr "Kolory zadaЯ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Compress weekends in month view"
 msgstr "Kompresowanie weekendСw na widoku miesiЙcznym"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Date Navigator"
 msgstr "Nawigator daty"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Defaults"
 msgstr "Domy╤lne"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: mail/mail-config.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: mail/mail-config.glade.h:30
 msgid "Display"
 msgstr "Wy╤wietl"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "End of day:"
 msgstr "Koniec dnia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Pierwszy dzieЯ tygodnia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "Pi╠"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Pi╠tek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "Pon"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "PoniedziaЁek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Notification Options"
 msgstr "Opcje przypomnieЯ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Overdue tasks"
 msgstr "ZalegЁe zadania"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Przypominanie a wszystkich terminach"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "Sob"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Sobota"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Show appointment end times in week and month views"
 msgstr ""
 "Wy╤wietlanie czasСw zakoЯczenia terminСw w widoku tygodniowym i miesiЙcznym"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Wy╤wietlanie numerСw tygodni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "Pocz╠tek dnia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "Nie"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Task List"
 msgstr "Lista zadaЯ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Tasks due today"
 msgstr "Zadania na dzi╤"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "Czw"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Czwartek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Time"
 msgstr "Czas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "PrzedziaЁy czasu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Format czasu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Time zone:"
 msgstr "Strefa czasowa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "Wto"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Wtorek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "╕ro"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "╕roda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Work Week"
 msgstr "TydzieЯ roboczy"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "minut przed wyst╠pieniem"
 
-#: calendar/gui/dialogs/cancel-comp.c:1
+#: calendar/gui/dialogs/cancel-comp.c:52
 msgid "The meeting status has changed. Send an updated version?"
 msgstr "Termin spotkania zostaЁ zmieniony. Czy wysЁaФ aktualn╠ wersjЙ?"
 
-#: calendar/gui/dialogs/cancel-comp.c:1
+#: calendar/gui/dialogs/cancel-comp.c:58
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Czy na pewno chcesz anulowaФ i usun╠Ф to spotkanie?"
 
-#: calendar/gui/dialogs/cancel-comp.c:1
+#: calendar/gui/dialogs/cancel-comp.c:63
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Czy na pewno chcesz anulowaФ i usun╠Ф to zadanie?"
 
-#: calendar/gui/dialogs/cancel-comp.c:1
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Czy na pewno chcesz anulowaФ i usun╠Ф ten wpis dziennika?"
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Zadanie zostaЁo usuniЙte."
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Zadanie zostaЁo usuniЙte."
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Wpis dziennika zostaЁ usuniЙty."
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "% Wprowadzono zmiany. AnulowaФ je wszystkie i zamkn╠Ф edytor?"
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Nie wprowadzono ©adnych zmian, zamkn╠Ф edytor?"
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Zdarzenie zostaЁo zmienione."
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Zadanie zostaЁo zmienione."
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Wpis dziennika zostaЁ zmieniony."
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:1
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:1
-#: calendar/gui/e-itip-control.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
 msgid " to "
 msgstr " do "
 
-#: calendar/gui/dialogs/comp-editor-util.c:1
-#: calendar/gui/e-itip-control.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
 msgid " (Completed "
 msgstr " (ZakoЯczone "
 
-#: calendar/gui/dialogs/comp-editor-util.c:1
-#: calendar/gui/e-itip-control.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
 msgid "Completed "
 msgstr "ZakoЯczone"
 
-#: calendar/gui/dialogs/comp-editor-util.c:1
-#: calendar/gui/e-itip-control.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:1
-#: calendar/gui/e-itip-control.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:449
 msgid "Edit Appointment"
 msgstr "Zmodyfikuj termin"
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:454
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:457
 #, c-format
 msgid "Task - %s"
 msgstr "Zadanie - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:460
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Wpis dziennika - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:474
 msgid "No summary"
 msgstr "Brak zestawienia"
 
-#: calendar/gui/dialogs/comp-editor.c:1 mail/mail-callbacks.c:1
-#: mail/mail-display.c:1
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
 msgid "Overwrite file?"
 msgstr "NadpisaФ plik?"
 
-#: calendar/gui/dialogs/comp-editor.c:1 mail/mail-callbacks.c:1
-#: mail/mail-display.c:1
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -2596,53 +2634,53 @@ msgstr ""
 "Plik o tej nazwie ju© istnieje.\n"
 "NadpisaФ go?"
 
-#: calendar/gui/dialogs/comp-editor.c:1 ui/evolution-comp-editor.xml.h:1
-#: widgets/misc/e-filter-bar.h:1 widgets/misc/e-filter-bar.h:1
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Zapisz jako..."
 
-#: calendar/gui/dialogs/comp-editor.c:1
+#: calendar/gui/dialogs/comp-editor.c:1026
 msgid "Unable to obtain current version!"
 msgstr "Nie mo©na uzyskaФ bie©╠cej wersji!"
 
-#: calendar/gui/dialogs/delete-comp.c:1
+#: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Czy na pewno chcesz usun╠Ф termin \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:1
+#: calendar/gui/dialogs/delete-comp.c:87
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Czy na pewno chcesz usun╠Ф ten pozbawiony nazwy termin?"
 
-#: calendar/gui/dialogs/delete-comp.c:1
+#: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Czy na pewno chcesz usun╠Ф zadanie \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:1
+#: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Czy na pewno chcesz usun╠Ф to pozbawione nazwy zadanie?"
 
-#: calendar/gui/dialogs/delete-comp.c:1
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Czy na pewno chcesz usun╠Ф wpis dziennika zatytuЁowany \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:1
+#: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Czy na pewno chcesz usun╠Ф ten niezatytuЁowany wpis dziennika?"
 
-#: calendar/gui/dialogs/delete-comp.c:1
+#: calendar/gui/dialogs/delete-comp.c:120
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Czy na pewno chcesz usun╠Ф %d terminСw?"
 
-#: calendar/gui/dialogs/delete-comp.c:1
+#: calendar/gui/dialogs/delete-comp.c:125
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Czy na pewno chcesz usun╠Ф %d zadaЯ?"
 
-#: calendar/gui/dialogs/delete-comp.c:1
+#: calendar/gui/dialogs/delete-comp.c:130
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Czy na pewno chcesz usun╠Ф %d wpisСw dziennika"
@@ -2651,15 +2689,15 @@ msgstr "Czy na pewno chcesz usun╠Ф %d wpisСw dziennika"
 msgid "Select a Time Zone"
 msgstr "WybСr strefy czasowej"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
 msgid "Selection:"
 msgstr "WybСr:"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
 msgid "Time Zones"
 msgstr "Strefy czasowe"
 
-#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -2669,20 +2707,20 @@ msgstr ""
 "strefЙ czasow╠.\n"
 "Przyci╤niЙcie prawego przycisku przywraca zwykЁe powiЙkszenie."
 
-#: calendar/gui/dialogs/event-editor.c:1
+#: calendar/gui/dialogs/event-editor.c:154
 msgid "Appointment"
 msgstr "Termin"
 
-#: calendar/gui/dialogs/event-editor.c:1
+#: calendar/gui/dialogs/event-editor.c:159
 msgid "Reminder"
 msgstr "Przypominanie"
 
-#: calendar/gui/dialogs/event-editor.c:1
+#: calendar/gui/dialogs/event-editor.c:164
 msgid "Recurrence"
 msgstr "Powtarzalno╤Ф"
 
-#: calendar/gui/dialogs/event-editor.c:1
-#: calendar/gui/dialogs/event-editor.c:1
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
 msgid "Meeting"
 msgstr "Spotkanie"
 
@@ -2690,50 +2728,174 @@ msgstr "Spotkanie"
 msgid "A_ll day event"
 msgstr "Wydarzenie _caЁodniowe"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Klasyfikacja"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Date & Time"
 msgstr "Data i czas"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Pri_vate"
 msgstr "P_rywatny"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "Pu_bliczny"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "Z_estawienie:"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
 msgid "_Confidential"
 msgstr "_Tajny"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:10
 msgid "_End time:"
 msgstr "Czas _zakoЯczenia"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:11
 msgid "_Start time:"
 msgstr "Czas _rozpoczЙcia:"
 
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Nazwa grupy:"
+
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "╛rСdЁo"
+
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+#, fuzzy
+msgid "Chair"
+msgstr "SamochСd"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+#, fuzzy
+msgid "Required Participant"
+msgstr "Wymagane informacje"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+#, fuzzy
+msgid "Optional Participant"
+msgstr "Informacje opcjonalne"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "WybСr czynno╤ci"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Accepted"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr "UsuniЙty"
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "UsuniЙty"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "Trwaj╠ce"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Telefon samochodowy"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Wymagane informacje"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Informacje opcjonalne"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Non-Participants"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:891
 msgid "Sent By:"
 msgstr "WysЁane przez:"
 
-#: calendar/gui/dialogs/meeting-page.c:1
+#: calendar/gui/dialogs/meeting-page.c:1442
 msgid "_Delegate To..."
 msgstr "_Oddeleguj do..."
 
@@ -2741,584 +2903,581 @@ msgstr "_Oddeleguj do..."
 msgid "Attendee"
 msgstr "Uczestnik"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
 msgid "Common Name"
 msgstr "WspСlna nazwa"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
 msgid "Delegated From"
 msgstr "Oddelegowane od"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
 msgid "Delegated To"
 msgstr "Oddelegowane do"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
 msgid "Language"
 msgstr "JЙzyk"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
 msgid "Member"
 msgstr "CzЁonek"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
 msgid "RSVP"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
 msgid "Role"
 msgstr "Rola"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:1 filter/libfilter-i18n.h:1
-#: mail/message-list.etspec.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
 msgid "Status"
 msgstr "Stan"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:1 mail/mail-config.glade.h:1
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Typ"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizator:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/dialogs/meeting-page.glade.h:3
 msgid "_Change Organizer"
 msgstr "_ZmieЯ organizatora"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 msgid "_Invite Others"
 msgstr "_Zapro╤ innych"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "_Other Organizer"
 msgstr "_Inny organizator"
 
-#: calendar/gui/dialogs/recurrence-page.c:1 calendar/gui/print.c:1
-#: calendar/gui/print.c:1 calendar/gui/print.c:1
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/recurrence-page.c:584
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Termin zawiera powtСrzenia, ktСrych nie mo©na zmieniaФ za pomoc╠ Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/recurrence-page.c:938
 msgid "on"
 msgstr "w"
 
-#: calendar/gui/dialogs/recurrence-page.c:1 filter/filter-datespec.c:1
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
 msgid "day"
 msgstr "dzieЯ"
 
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/recurrence-page.c:1094
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/recurrence-page.c:1102
 msgid "th"
 msgstr "."
 
-#: calendar/gui/dialogs/recurrence-page.c:1
+#: calendar/gui/dialogs/recurrence-page.c:1274
 msgid "occurrences"
 msgstr "powtСrzeniami"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Custom recurrence"
 msgstr "Dowolna powtarzalno╤Ф"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Co"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Exceptions"
 msgstr "Wyj╠tki"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "No recurrence"
 msgstr "Brak powtarzalno╤ci"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Preview"
 msgstr "Podgl╠d"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "Recurrence Rule"
 msgstr "ReguЁa powtarzalno╤ci"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "Simple recurrence"
 msgstr "Prosta powtarzalno╤Ф"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "_Modify"
 msgstr "_ZmieЯ"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "z"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
 msgid "forever"
 msgstr "bez koЯca"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
 msgid "month(s)"
 msgstr "miesiЙcy"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
 msgid "until"
 msgstr "a© do"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
 msgid "week(s)"
 msgstr "tygodni"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
 msgid "year(s)"
 msgstr "lat"
 
-#: calendar/gui/dialogs/save-comp.c:1
+#: calendar/gui/dialogs/save-comp.c:51
 msgid "Do you want to save changes?"
 msgstr "Czy chcesz zapisaФ zmiany?"
 
-#: calendar/gui/dialogs/send-comp.c:1
+#: calendar/gui/dialogs/send-comp.c:56
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Informacje o spotkaniu zostaЁy zmienione. Czy wysЁaФ aktualn╠ wersjЙ?"
 
-#: calendar/gui/dialogs/send-comp.c:1
+#: calendar/gui/dialogs/send-comp.c:61
 msgid "The task information has changed. Send an updated version?"
 msgstr "Informacje o zadaniu zostaЁy zmienione. Czy wysЁaФ aktualn╠ wersjЙ?"
 
-#: calendar/gui/dialogs/send-comp.c:1
+#: calendar/gui/dialogs/send-comp.c:66
 msgid "The journal entry has changed. Send an updated version?"
 msgstr "Wpis dziennika zostaЁ zmieniony. Czy wysЁaФ aktualn╠ wersjЙ?"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "Date Completed:"
 msgstr "Data zakoЯczenia:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:4
 msgid "Delegated From:"
 msgstr "Oddelegowane od:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:5
 msgid "Delegated To:"
 msgstr "Oddelegowane do:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:6
 msgid "No one"
 msgstr "Nikt"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: my-evolution/e-summary-preferences.c:1
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:1
+#: calendar/gui/dialogs/task-editor.c:130
 msgid "Task"
 msgstr "Zadanie"
 
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/task-page.glade.h:2
 #, no-c-format
 msgid "% Comp_lete:"
 msgstr "% _zakoЯczenia:"
 
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/task-page.glade.h:14
 msgid "Progress"
 msgstr "PostЙp"
 
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/task-page.glade.h:16
 msgid "Sta_rt Date:"
 msgstr "Czas _rozpoczЙcia:"
 
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/task-page.glade.h:21
 msgid "_Due Date:"
 msgstr "Czas _zakoЯczenia:"
 
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/task-page.glade.h:22
 msgid "_Priority:"
 msgstr "_Priorytet:"
 
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/task-page.glade.h:23
 msgid "_Status:"
 msgstr "_Stan:"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:1
-msgid "Edit this task"
-msgstr "Zredaguj zadanie"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "_OtwСrz"
 
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/e-calendar-table.c:1
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-mail-list.xml.h:1
-msgid "Cut"
-msgstr "Wytnij"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "_Wytnij"
 
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/e-calendar-table.c:1
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-mail-list.xml.h:1 ui/evolution-mail-message.xml.h:1
-msgid "Copy"
-msgstr "Skopiuj"
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "S_kopiuj"
 
-#: calendar/gui/e-calendar-table.c:1 calendar/gui/e-calendar-table.c:1
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view.c:1 calendar/gui/e-week-view.c:1
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-mail-list.xml.h:1
-msgid "Paste"
-msgstr "Wklej"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "Wk_lej"
 
-#: calendar/gui/e-calendar-table.c:1
-msgid "Mark as complete"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
 msgstr "Oznacz jako zakoЯczone"
 
-#: calendar/gui/e-calendar-table.c:1
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "UsuЯ zadanie"
 
-#: calendar/gui/e-calendar-table.c:1
-msgid "Mark tasks as complete"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
 msgstr "Oznacza zadania jako zakoЯczone"
 
-#: calendar/gui/e-calendar-table.c:1 ui/evolution-tasks.xml.h:1
-msgid "Delete selected tasks"
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Usuwa zaznaczone zadanie"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:1137
 msgid "Click here to add a task"
 msgstr "Kliknij tutaj, aby dodaФ zadanie"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% zakoЯczenia"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmy"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Kategorie"
 
-#: calendar/gui/e-calendar-table.etspec.h:1 camel/camel-filter-driver.c:1
-#: camel/camel-filter-driver.c:1
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
 msgid "Complete"
 msgstr "ZakoЯczone"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "Data zakoЯczenia"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr "Data wykonania"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Data zakoЯczenia"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "Pozycja geograficzna"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Priorytet"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Start Date"
 msgstr "Data rozpoczЙcia"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Summary"
 msgstr "Zestawienie"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:15
 msgid "Task sort"
 msgstr "Porz╠dek zadaЯ"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Transparency"
 msgstr "Prze╪roczysto╤Ф"
 
-#: calendar/gui/e-calendar-table.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-day-view-time-item.c:1
+#: calendar/gui/e-day-view-time-item.c:519
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view-main-item.c:1 calendar/gui/print.c:1
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view-main-item.c:1
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view-main-item.c:1
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
+#: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-#: calendar/gui/print.c:1
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-#: calendar/gui/print.c:1
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:1 ui/evolution-calendar.xml.h:1
-msgid "New Appointment"
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Nowy termin"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "Nowy termin caЁodniowy"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-msgid "Go to Today"
-msgstr "Przejd╪ do dzisiaj"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "Przejd╪ do d_zisiaj"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "Przejd╪ do daty..."
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-#: shell/e-shortcuts-view.c:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-message-composer.xml.h:1
-msgid "Open"
-msgstr "OtwСrz"
-
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "UsuЯ termin"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "PrzeksztaЁФ to wyst╠pienie w przesuwalne"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "UsuЯ to wyst╠pienie"
 
-#: calendar/gui/e-day-view.c:1
-msgid "Delete all Occurrences"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "UsuЯ wszystkie wyst╠pienia"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:694
 msgid "This is an event that can be added to your calendar."
 msgstr "To jest zdarzenie, ktСre mo©na dodaФ do kalendarza."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:697
 msgid "This is a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:700
 msgid "This is one or more additions to a current meeting."
 msgstr "To jest jeden lub wiЙcej dodatkСw do bie©╠cego spotkania."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:703
 msgid "This is a request for the latest event information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:706
 msgid "This is a reply to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:709
 msgid "This is an event cancellation."
 msgstr "To jest anulowanie zdarzenia."
 
-#: calendar/gui/e-itip-control.c:1 calendar/gui/e-itip-control.c:1
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 msgid "The message is not understandable."
 msgstr "List jest niezrozumiaЁy."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:737
 msgid "This is an task that can be added to your calendar."
 msgstr "To jest zadanie, ktСre mo©na dodaФ do kalendarza."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:740
 msgid "This is a task request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:743
 msgid "This is a request for the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:746
 msgid "This is a reply to a task request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:749
 msgid "This is an task cancellation."
 msgstr "To jest anulowanie zadania."
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:771
 msgid "This is freebusy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:774
 msgid "This is a request for freebusy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:777
 msgid "This is a reply to a freebusy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:834
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:853
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:877
 msgid "The information contained in this attachment was not valid"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:989
 msgid "I couldn't update your calendar file!\n"
 msgstr "Nie mo©na uaktualniФ pliku kalendarza!\n"
 
-#: calendar/gui/e-itip-control.c:1
+#: calendar/gui/e-itip-control.c:1015
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Nie mo©na usun╠Ф elementu z pliku kalendarza!\n"
 
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
 msgstr "%P %%"
 
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/e-itip-control.glade.h:3
 msgid "--to--"
 msgstr "--do--"
 
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/e-itip-control.glade.h:4
 msgid "Calendar Message"
 msgstr "Komunikat kalendarza"
 
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Data:"
 
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Wczytywanie kalendarza"
 
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Wczytywanie kalendarza..."
 
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Komunikat serwera:"
 
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "data-pocz╠tkowa"
 
-#: calendar/gui/e-itip-control.glade.h:1
+#: calendar/gui/e-itip-control.glade.h:13
 msgid "date-start"
 msgstr "data-koЯcowa"
 
-#: calendar/gui/e-tasks.c:1 calendar/gui/e-tasks.c:1
-#: calendar/gui/e-tasks.c:1
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "Wszystkie"
 
-#: calendar/gui/e-tasks.c:1
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "Kategoria:"
 
-#: calendar/gui/e-tasks.c:1
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nie mo©na wczytaФ zadania w \"%s\""
 
-#: calendar/gui/e-tasks.c:1
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoda wymagana do odczytu \"%s\" nie jest obsЁugiwana"
@@ -3326,41 +3485,22 @@ msgstr "Metoda wymagana do odczytu \"%s\" nie jest obsЁugiwana"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:1 calendar/gui/print.c:1
-#: my-evolution/e-summary-calendar.c:1
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/e-week-view.c:1 calendar/gui/e-week-view.c:1
-msgid "New Appointment..."
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
 msgstr "Nowy termin..."
 
-#: calendar/gui/e-week-view.c:1
-msgid "Delete All Occurrences"
-msgstr "UsuЯ wszystkie wyst╠pienia"
-
-#: calendar/gui/gnome-cal.c:1
-msgid "Summary contains"
-msgstr "Zestawienie zawiera"
-
-#: calendar/gui/gnome-cal.c:1
-msgid "Description contains"
-msgstr "Opis zawiera"
-
-#: calendar/gui/gnome-cal.c:1
-msgid "Comment contains"
-msgstr "Komentarz zawiera"
-
-#: calendar/gui/gnome-cal.c:1
-msgid "Has category"
-msgstr "Ma kategoriЙ"
-
-#: calendar/gui/gnome-cal.c:1
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nie mo©na otworzyФ folderu w \"%s\""
 
-#: calendar/gui/gnome-cal.c:1
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoda wymagana do otwarcia \"%s\" nie jest obsЁugiwana"
@@ -3369,278 +3509,281 @@ msgstr "Metoda wymagana do otwarcia \"%s\" nie jest obsЁugiwana"
 msgid "April"
 msgstr "KwiecieЯ"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:2
 msgid "August"
 msgstr "SierpieЯ"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:3
 msgid "December"
 msgstr "GrudzieЯ"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:4
 msgid "February"
 msgstr "Luty"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:5
 msgid "Go To Date"
 msgstr "Przej╤cie do daty"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "January"
 msgstr "StyczeЯ"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "Lipiec"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "Czerwiec"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "Marzec"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "Maj"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "Listopad"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "Pa╪dziernik"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "WrzesieЯ"
 
-#: calendar/gui/goto-dialog.glade.h:1
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "_Go To Today"
 msgstr "_Przejd╪ do dzi╤"
 
-#: calendar/gui/itip-utils.c:1
+#: calendar/gui/itip-utils.c:224
 msgid "An organizer must be set."
 msgstr "Nale©y podaФ organizatora."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Ni"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Po"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Wt"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "╕r"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Cz"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Pt"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "So"
 
-#: calendar/gui/print.c:1 my-evolution/e-summary-tasks.c:1
-#: my-evolution/e-summary-tasks.c:1 shell/e-shortcuts.c:1
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Zadania"
 
 #. Day
-#: calendar/gui/print.c:1
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "Bie©╠cy dzieЯ (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1 calendar/gui/print.c:1
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Bie©╠cy tydzieЯ (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Bie©╠cy miesi╠Ф (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Bie©╠cy rok (%Y)"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Wydrukuj kalendarz"
 
-#: calendar/gui/print.c:1 calendar/gui/print.c:1
-#: mail/mail-callbacks.c:1 my-evolution/e-summary.c:1
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-comp-editor.xml.h:1
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Podgl╠d wydruku"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:2317
 msgid "Print Item"
 msgstr "Wydruk elementu"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:2398
 msgid "Print Setup"
 msgstr "Ustawienia wydruku"
 
-#: calendar/gui/tasks-control.c:1
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "URI foldera zadaЯ, ktСry nale©y wy╤wietliФ"
 
-#: calendar/gui/tasks-migrate.c:1
+#: calendar/gui/tasks-migrate.c:106
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:1
+#: calendar/gui/tasks-migrate.c:109
 msgid ""
 "Evolution has tried to take the tasks that were in your calendar folder and "
 "migrate them to the new tasks folder.\n"
@@ -3648,7 +3791,7 @@ msgid ""
 "again in the future."
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:1
+#: calendar/gui/tasks-migrate.c:121
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
@@ -3657,7 +3800,7 @@ msgstr ""
 "Nie mo©na otworzyФ `%s'; ©aden z elementСw folderu kalendarza nie zostaЁ "
 "przeniesiony do folderu zadaЯ."
 
-#: calendar/gui/tasks-migrate.c:1
+#: calendar/gui/tasks-migrate.c:134
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
@@ -3666,31 +3809,31 @@ msgstr ""
 "Metoda wymagana do odczytu \"%s\" nie jest obsЁugiwana. Nie przeniesiono "
 "©adnych elementСw z folderu kalendarza do folderu zadaЯ."
 
-#: calendar/gui/weekday-picker.c:1 calendar/gui/weekday-picker.c:1
+#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
 msgid "SMTWTFS"
 msgstr "NPW╕CPS"
 
-#: camel/camel-cipher-context.c:1
+#: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "Ten rodzaj szyfrowania nie obsЁuguje podpisywania"
 
-#: camel/camel-cipher-context.c:1
+#: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:1
+#: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
 msgstr "Ten rodzaj szyfrowania nie obsЁuguje weryfikacji"
 
-#: camel/camel-cipher-context.c:1
+#: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
 msgstr "Ten rodzaj szyfrowania nie obsЁuguje kodowania"
 
-#: camel/camel-cipher-context.c:1
+#: camel/camel-cipher-context.c:336
 msgid "Decryption is not supported by this cipher"
 msgstr "Ten rodzaj szyfrowania nie obsЁuguje rozkodowywania"
 
-#: camel/camel-disco-diary.c:1
+#: camel/camel-disco-diary.c:181
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -3698,7 +3841,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:1
+#: camel/camel-disco-diary.c:244
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -3709,70 +3852,69 @@ msgstr ""
 "%s\n"
 "Zmiany w tym folderze nie zostan╠ zsynchronizowane z serwerem."
 
-#: camel/camel-disco-diary.c:1
+#: camel/camel-disco-diary.c:278
 msgid "Resynchronizing with server"
 msgstr "Ponowne synchronizowanie z serwerem"
 
-#: camel/camel-disco-store.c:1
+#: camel/camel-disco-store.c:305
 msgid "You must be working online to complete this operation"
 msgstr "Do zakoЯczenia tej operacji konieczne jest poЁ╠czenie z sieci╠"
 
-#: camel/camel-filter-driver.c:1 camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "Synchronizowanie folderСw"
 
-#: camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr "Nie mo©na otworzyФ folderu kolejki"
 
-#: camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr "Nie mo©na przetworzyФ folderu kolejki"
 
-#: camel/camel-filter-driver.c:1
-#, c-format
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "Pobieranie listu %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1 camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, c-format
 msgid "Failed on message %d"
 msgstr "Niepowodzenie przy %d. li╤cie"
 
-#: camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "Nie mo©na otworzyФ listu"
 
-#: camel/camel-filter-driver.c:1 camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "Synchronizowanie folderu"
 
-#: camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Pobieranie listu %d z %d"
 
-#: camel/camel-filter-driver.c:1 camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Niepowodzenie przy li╤cie %d z %d"
 
-#: camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "BЁ╠d przy analizie skЁadni filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:1
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "BЁ╠d przy wykonywaniu filtru: %s: %s"
 
-#: camel/camel-filter-search.c:1 camel/camel-filter-search.c:1
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "BЁ╠d przy wykonywaniu wyszukiwania przez filtr: %s: %s"
 
-#: camel/camel-folder-search.c:1
+#: camel/camel-folder-search.c:328
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -3781,7 +3923,7 @@ msgstr ""
 "BЁ╠d w wyra©eniu wyszukiwania: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:1
+#: camel/camel-folder-search.c:338
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -3790,239 +3932,239 @@ msgstr ""
 "BЁ╠d przy wykonywaniu wyra©enia wyszukiwania %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:1 camel/camel-folder-search.c:1
+#: camel/camel-folder-search.c:485 camel/camel-folder-search.c:513
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:1
+#: camel/camel-folder-search.c:559
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Wykonywanie zapytania na nieznanym nagЁСwku: %s"
 
-#: camel/camel-folder-search.c:1 camel/camel-folder-search.c:1
+#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
-#: camel/camel-lock-client.c:1
+#: camel/camel-lock-client.c:110
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Nie mo©na stworzyФ potoku do pomocniczego programu blokuj╠cego: %s"
 
-#: camel/camel-lock-client.c:1
+#: camel/camel-lock-client.c:123
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Nie mo©na stworzyФ procesu dla pomocniczego programu blokuj╠cego: %s"
 
-#: camel/camel-lock-client.c:1 camel/camel-lock-client.c:1
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 "Nie mo©na zablokowaФ \"%s\": bЁ╠d przy komuniacji z programem blokuj╠cym"
 
-#: camel/camel-lock-client.c:1
+#: camel/camel-lock-client.c:212
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Nie mo©na zablokowaФ \"%s\""
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:1 camel/camel-lock.c:1
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Nie mo©na stworzyФ pliku blokady dla %s: %s"
 
-#: camel/camel-lock.c:1
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "UpЁyn╠Ё czas przeznaczony na uzyskanie blokady pliku %s. SprСbuj ponownie "
 "pС╪niej."
 
-#: camel/camel-lock.c:1
+#: camel/camel-lock.c:201
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Uzyskanie blokady za pomoc╠ fcntl(2) nie powiodЁo siЙ: %s"
 
-#: camel/camel-lock.c:1
+#: camel/camel-lock.c:255
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Uzyskanie blokady za pomoc╠ flock(2) nie powiodЁo siЙ: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Nie mo©na sprawdziФ pliku z listami %s: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Nie mo©na otworzyФ pliku z listami %s: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Nie mo©na otworzyФ tymczasowego pliku z listami %s: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Zapisanie listu w pliku tymczasowym %s nie powiodЁo siЙ: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Stworzenie potoku nie powiodЁo siЙ: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Nie mo©na stworzyФ procesu: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "BЁ╠d programu przesyЁaj╠cego pocztЙ: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Nieznany bЁ╠d)"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:263
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "BЁ╠d przy odczycie pliku z listem: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:274
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "BЁ╠d przy zapisie do tymczasowego pliku z listami: %s"
 
-#: camel/camel-movemail.c:1 camel/camel-movemail.c:1
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "BЁ╠d przy kopiowaniu tymczasowego pliku z listami: %s"
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:193
 #, fuzzy, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Wprowad╪ hasЁo NNTP dla %s@%s"
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr "Brak tekstu do podpisania."
 
-#: camel/camel-pgp-context.c:1 camel/camel-pgp-context.c:1
-#: camel/camel-pgp-context.c:1 camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Nie podano hasЁa."
 
-#: camel/camel-pgp-context.c:1 camel/camel-pgp-context.c:1
-#: camel/camel-pgp-context.c:1 camel/camel-pgp-context.c:1
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Nie mo©na stworzyФ potoku do GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr "Brak tekstu do weryfikacji."
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Nie mo©na stworzyФ pliku tymczasowego: %s"
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr "Brak tekstu do zaszyfrowania."
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "Nie podano odbiorcСw"
 
-#: camel/camel-pgp-context.c:1
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr ""
 
-#: camel/camel-provider.c:1
+#: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Nie mo©na zaЁadowaФ %s: ёadowanie moduЁСw nie jest obsЁugiwane przez system."
 
-#: camel/camel-provider.c:1
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nie mo©na wczytaФ %s: %s"
 
-#: camel/camel-provider.c:1
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nie mo©na wczytaФ %s: Brak kodu inicjuj╠cego w module."
 
-#: camel/camel-remote-store.c:1
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s serwer %s"
 
-#: camel/camel-remote-store.c:1
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "usЁuga %s dla %s na %s"
 
-#: camel/camel-remote-store.c:1
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr "Anulowano poЁ╠czenie"
 
-#: camel/camel-remote-store.c:1
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nie mo©na nawi╠zaЯ poЁ╠czenia z %s (port %d): %s"
 
-#: camel/camel-remote-store.c:1
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr "(nieznany komputer)"
 
-#: camel/camel-remote-store.c:1 camel/camel-remote-store.c:1
-#: camel/camel-remote-store.c:1
-#: camel/providers/imap/camel-imap-command.c:1
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "Operacja anulowana"
 
-#: camel/camel-remote-store.c:1
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "Swerwer nieoczekiwanie przerwaЁ poЁ╠czenie"
 
-#: camel/camel-sasl-anonymous.c:1
+#: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "Anonimowy"
 
-#: camel/camel-sasl-anonymous.c:1
+#: camel/camel-sasl-anonymous.c:35
 msgid "This option will connect to the server using an anonymous login."
 msgstr ""
 "Przy tej opcji Ё╠czenie z serwerem nast╠pi przy u©yciu anonimowego konta."
 
-#: camel/camel-sasl-anonymous.c:1 camel/camel-sasl-plain.c:1
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
 msgstr "Uwierzytelnienie nie powiodЁo siЙ."
 
-#: camel/camel-sasl-anonymous.c:1
+#: camel/camel-sasl-anonymous.c:119
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-sasl-anonymous.c:1
+#: camel/camel-sasl-anonymous.c:131
 #, fuzzy, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -4031,7 +4173,7 @@ msgstr ""
 "BЁ╠d przy wczytywaniu informacji o filtrze:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:1
+#: camel/camel-sasl-anonymous.c:143
 #, fuzzy, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -4040,11 +4182,11 @@ msgstr ""
 "BЁ╠d przy wczytywaniu informacji o filtrze:\n"
 "%s"
 
-#: camel/camel-sasl-cram-md5.c:1
+#: camel/camel-sasl-cram-md5.c:35
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: camel/camel-sasl-cram-md5.c:1
+#: camel/camel-sasl-cram-md5.c:37
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -4052,11 +4194,11 @@ msgstr ""
 "Przy tej opcji poЁ╠czenie z serwerem nast╠pi przy u©yciu hasЁa CRAM-MD5, o "
 "ile bЙdzie ono obsЁugiwane przez serwer."
 
-#: camel/camel-sasl-digest-md5.c:1
+#: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:1
+#: camel/camel-sasl-digest-md5.c:45
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -4064,41 +4206,41 @@ msgstr ""
 "Przy tej opcji poЁ╠czenie z serwerem nast╠pi przy u©yciu hasЁa DIGEST-MD5, o "
 "ile bЙdzie ono obsЁugiwane przez serwer."
 
-#: camel/camel-sasl-digest-md5.c:1
+#: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:1
+#: camel/camel-sasl-digest-md5.c:819
 msgid "Server challenge invalid\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:1
+#: camel/camel-sasl-digest-md5.c:825
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:1
+#: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
 msgstr "Odpwoied╪ serwera nie zawiera danych o autoryzacji\n"
 
-#: camel/camel-sasl-digest-md5.c:1
+#: camel/camel-sasl-digest-md5.c:865
 msgid "Server response contained incomplete authorization data\n"
 msgstr "Odpowied╪ serwera zawiera niekompletne dane o autoryzacji\n"
 
-#: camel/camel-sasl-digest-md5.c:1
+#: camel/camel-sasl-digest-md5.c:875
 msgid "Server response does not match\n"
 msgstr "Niepotwierdzona odpowied╪ serwera\n"
 
-#: camel/camel-sasl-kerberos4.c:1
+#: camel/camel-sasl-kerberos4.c:40
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:1
+#: camel/camel-sasl-kerberos4.c:42
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 "Opcja ta spowoduje Ё╠czenie z serwerem przy wykorzystaniu uwierzytelniania "
 "Kerberos 4."
 
-#: camel/camel-sasl-kerberos4.c:1
+#: camel/camel-sasl-kerberos4.c:161
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -4107,81 +4249,81 @@ msgstr ""
 "Nie mo©na pobraФ biletu Kerberosa:\n"
 "%s"
 
-#: camel/camel-sasl-kerberos4.c:1
-#: camel/providers/imap/camel-imap-store.c:1
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "Niepoprawna odpowied╪ serwera na uwierzytelnienie."
 
-#: camel/camel-sasl-login.c:1
+#: camel/camel-sasl-login.c:32
 msgid "NT Login"
 msgstr "Logowanie NT"
 
-#: camel/camel-sasl-login.c:1 camel/camel-sasl-plain.c:1
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
 msgstr ""
 "Przy tej opcji poЁ╠czenie z serwerem nast╠pi przy u©yciu hasЁa w postaci "
 "czystego tekstu."
 
-#: camel/camel-sasl-login.c:1
+#: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
 msgstr "Nieznany stan uwierzytelnienia."
 
-#: camel/camel-search-private.c:1
+#: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Nie powiodЁa siЙ kompilacja wyra©enia regularnego: %s: %s"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "W URL-u \"%s\" wymagana jest nazwa u©ytkownika"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "W URL-u \"%s\" wymagana jest nazwa komputera"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "W URL-u \"%s\" wymagana jest ╤cie©ka"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:548
 #, c-format
 msgid "Resolving: %s"
 msgstr "Wyszukiwanie: %s"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:575
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Nie mo©na ustaliФ adresu odpowiadaj╠cego nazwie: %s"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:600
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 "Nie mo©na ustaliФ adresu odpowiadaj╠cego nazwie: %s: nazwa nie istnieje"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:602
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 "Nie mo©na ustaliФ adresu odpowiadaj╠cego nazwie: %s: przyczyna nieznana"
 
-#: camel/camel-session.c:1
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:1
+#: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:1 camel/camel-session.c:1
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Brak dostarczyciela dla protokoЁu \"%s\""
 
-#: camel/camel-session.c:1
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -4190,50 +4332,44 @@ msgstr ""
 "Nie mo©na stworzyФ katalogu %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:1
+#: camel/camel-smime-context.c:173
 #, c-format
 msgid "Please enter your password for %s"
 msgstr "Podaj swoje hasЁo dla %s"
 
-#: camel/camel-smime-context.c:1
+#: camel/camel-smime-context.c:203
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr ""
 
-#: camel/camel-smime-context.c:1
+#: camel/camel-smime-context.c:209
 #, c-format
 msgid "The signature certificate for \"%s\" does not exist."
 msgstr "Certyfikat podpisu dla \"%s\" nie istnieje."
 
-#: camel/camel-smime-context.c:1
+#: camel/camel-smime-context.c:249
 #, c-format
 msgid "The encryption certificate for \"%s\" does not exist."
 msgstr "Certyfikat szyfruj╠cy dla \"%s\" nie istnieje."
 
-#: camel/camel-smime-context.c:1 camel/camel-smime-context.c:1
-#: camel/camel-smime-context.c:1 camel/camel-smime-context.c:1
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
 #, c-format
 msgid "Failed to find certificate for \"%s\"."
 msgstr "Nie mo©na odnale╪Ф certyfikatu dla \"%s\"."
 
-#: camel/camel-smime-context.c:1
+#: camel/camel-smime-context.c:545
 msgid "Failed to find a common bulk algorithm."
 msgstr ""
 
-#: camel/camel-smime-context.c:1
+#: camel/camel-smime-context.c:799
 msgid "Failed to decode message."
 msgstr "Nie mo©na odkodowaФ listu."
 
-#: camel/camel-smime-context.c:1
+#: camel/camel-smime-context.c:844
 msgid "Failed to verify certificates."
 msgstr "Nie mo©na zweryfikowaФ certyfikatu."
 
-#. Fill in the new fields
-#: camel/camel-store.c:1 mail/mail-ops.c:1 mail/mail-ops.c:1
-#: mail/mail-ops.c:1 mail/mail-ops.c:1
-msgid "Trash"
-msgstr "╕mietnik"
-
-#: camel/camel-tcp-stream-openssl.c:1
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -4241,7 +4377,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:1 camel/camel-tcp-stream-ssl.c:1
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -4256,7 +4392,7 @@ msgstr ""
 "\n"
 "Czy mimo wszystko chcesz go zaakceptowaФ?"
 
-#: camel/camel-tcp-stream-ssl.c:1
+#: camel/camel-tcp-stream-ssl.c:348
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -4268,146 +4404,158 @@ msgid ""
 "Country: %s"
 msgstr ""
 
-#: camel/camel-url.c:1
+#: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Nie mo©na rozpoznaФ URL-a \"%s\""
 
-#: camel/camel-vee-folder.c:1
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Brak listu %s w %s."
 
-#: camel/camel-vee-folder.c:1
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "Brak listu: %s"
 
-#: camel/camel-vtrash-folder.c:1
+#: camel/camel-vtrash-folder.c:109
 msgid "You cannot copy messages from this trash folder."
 msgstr "Nie mo©na kopiowaФ listСw z tego folderu ╤mietnka."
 
-#: camel/providers/imap/camel-imap-command.c:1
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Nieoczekiwana odpowied╪ od serwera IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:1
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Nie powiodЁo siЙ polecenie IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:1
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:1
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Odpowied╪ serwera IMAP nie zawiera informacji %s"
 
-#: camel/providers/imap/camel-imap-command.c:1
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Nieoczekiwana odpowied╪ OK od serwera IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1
+#: camel/providers/imap/camel-imap-folder.c:192
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nie mo©na stworzyФ katalogu %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nie mo©na wczytaФ zestawienia dla %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1
+#: camel/providers/imap/camel-imap-folder.c:275
 msgid "Folder was destroyed and recreated on server."
 msgstr "Folder na serwerze zostaЁ usuniЙty stworzony ponownie."
 
-#: camel/providers/imap/camel-imap-folder.c:1
-msgid "Scanning IMAP folder"
-msgstr "Skanowanie folderu IMAP"
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "Zapisywanie listСw"
 
-#: camel/providers/imap/camel-imap-folder.c:1
-#: camel/providers/imap/camel-imap-folder.c:1
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "Ten list jest obecnie niedostЙpny"
 
-#: camel/providers/imap/camel-imap-folder.c:1
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Zapisywanie listСw"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "Nie mo©na odnale╪Ф tre╤ci listu w odpowiedzi na FETCH."
 
-#: camel/providers/imap/camel-imap-message-cache.c:1
+#: camel/providers/imap/camel-imap-message-cache.c:155
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Nie mo©na otworzyФ katalogu cache: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:1 mail/mail-config.glade.h:1
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "Sprawdzanie nowej poczty"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:45
 msgid "Check for new messages in all folders"
 msgstr "Sprawdza nowe listy we wszystkich folderach"
 
-#: camel/providers/imap/camel-imap-provider.c:1 shell/e-shell-view.c:1
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Foldery"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Show only subscribed folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Override server-supplied folder namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:54
 msgid "Namespace"
 msgstr "PrzestrzeЯ nazw"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 "Zastosowywanie filtrСw w odniesieniu do nowych listСw w INBOX na tym serwerze"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAPv4"
 msgstr "IMAPv4"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Do przegl╠dania i przechowywania poczty na serwerach IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Przy tej opcji poЁ╠czenie z serwerem IMAP nast╠pi przy u©yciu hasЁa w "
 "postaci czystego tekstu."
 
-#: camel/providers/imap/camel-imap-store.c:1
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Serwer IMAP-a %s nie obsЁuguje wymaganego typu uwierzytelniania %s"
 
-#: camel/providers/imap/camel-imap-store.c:1
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Brak obsЁugi typu uwierzytelniania %s"
 
-#: camel/providers/imap/camel-imap-store.c:1
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%Podaj hasЁo IMAP dla %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "Nie wprowadzono hasЁa."
 
-#: camel/providers/imap/camel-imap-store.c:1
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4418,103 +4566,107 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1 mail/mail-local.c:1
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
 msgid "No such folder %s"
 msgstr "Folder \"%s\" nie istnieje"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "Katalogi z listami formacie MH"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr "Do przechowywania lokalnej poczty w katalogach o formacie MH"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr "Standardowy uniksowy plik mailbox"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr "Do przechowywania lokalnej poczty w standardowym formacie mbox"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr "Pliki z listami w formacie maildir Qmaila"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr "Do przechowywania lokalnej poczty w katalogach maildir qmaila"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:70
 msgid "Unix mbox spool-format mail files"
 msgstr "Uniksowe pliki mbox w postaci kolejki pocztowej"
 
-#: camel/providers/local/camel-local-provider.c:1
+#: camel/providers/local/camel-local-provider.c:71
 msgid "For storing local mail in standard Unix spool directories"
 msgstr ""
 "Do przechowywania lokalnej poczty w uniksowych katalogach kolejkuj╠cych"
 
-#: camel/providers/local/camel-local-store.c:1
-#: camel/providers/local/camel-spool-store.c:1
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:1
+#: camel/providers/local/camel-local-store.c:134
 #, fuzzy, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "\"%s\" nie jest zwykЁym plikiem."
 
-#: camel/providers/local/camel-local-store.c:1
-#: camel/providers/local/camel-local-store.c:1
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Nie mo©na pobraФ folderu: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:1
+#: camel/providers/local/camel-local-store.c:173
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:1
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokalny plik z listami %s"
 
-#: camel/providers/local/camel-local-store.c:1
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nie mo©na zmieniФ nazwy folderu %s na %s: %s"
 
-#: camel/providers/local/camel-local-store.c:1
+#: camel/providers/local/camel-local-store.c:279
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nie mo©na usun╠Ф pliku z zestawieniem folderu \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:1
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nie mo©na usun╠Ф pliku \"%s\" z indeksem folderu: %s"
 
-#: camel/providers/local/camel-local-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nie mo©na dodaФ listu do zestawienia: przyczyna nieznana"
 
-#: camel/providers/local/camel-maildir-folder.c:1
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nie mo©na doЁ╠czyФ listu do folderu w formacie maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:1
-#: camel/providers/local/camel-maildir-folder.c:1
-#: camel/providers/local/camel-maildir-folder.c:1
-#: camel/providers/local/camel-mbox-folder.c:1
-#: camel/providers/local/camel-mh-folder.c:1
-#: camel/providers/local/camel-mh-folder.c:1
-#: camel/providers/local/camel-mh-folder.c:1
-#: camel/providers/local/camel-spool-folder.c:1
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4523,20 +4675,20 @@ msgstr ""
 "Nie mo©na pobraФ listu: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:1
-#: camel/providers/local/camel-mbox-folder.c:1
-#: camel/providers/local/camel-mh-folder.c:1
-#: camel/providers/local/camel-spool-folder.c:1
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "Nie ma takiego listu"
 
-#: camel/providers/local/camel-maildir-folder.c:1
-#: camel/providers/local/camel-mh-folder.c:1
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr "Niepoprawna zawarto╤Ф listu"
 
-#: camel/providers/local/camel-maildir-store.c:1
-#: camel/providers/local/camel-mh-store.c:1
+#: camel/providers/local/camel-maildir-store.c:103
+#: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -4545,16 +4697,16 @@ msgstr ""
 "Nie mo©na otworzyФ folderu \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:1
-#: camel/providers/local/camel-mbox-store.c:1
-#: camel/providers/local/camel-mh-store.c:1
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Folder \"%s\" nie istnieje."
 
 # y, c-format
-#: camel/providers/local/camel-maildir-store.c:1
-#: camel/providers/local/camel-mh-store.c:1
+#: camel/providers/local/camel-maildir-store.c:114
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -4563,56 +4715,56 @@ msgstr ""
 "Nie mo©na stworzyФ folderu \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:1
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "\"%s\" nie jest katalogiem z listami w formacie maildir."
 
-#: camel/providers/local/camel-maildir-store.c:1
-#: camel/providers/local/camel-maildir-store.c:1
-#: camel/providers/local/camel-mh-store.c:1
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
+#: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nie mo©na usun╠Ф folderu \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-store.c:1
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "to nie katalog z listami w formacie maildir"
 
-#: camel/providers/local/camel-maildir-store.c:1
+#: camel/providers/local/camel-maildir-store.c:276
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nie mo©na przeszukaФ folderu \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-summary.c:1
-#: camel/providers/local/camel-maildir-summary.c:1
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Nie mo©na otworzyФ katalogu z listami ze scie©ki: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:1
-#: camel/providers/local/camel-spool-folder.c:1
+#: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Nie mo©na stworzyФ blokady folderu dla %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:1
-#: camel/providers/local/camel-spool-folder.c:1
+#: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Nie mo©na otworzyФ skrzynki: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:1
+#: camel/providers/local/camel-mbox-folder.c:259
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nie mo©na doЁ╠czyФ listu do pliku mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:1
-#: camel/providers/local/camel-mbox-folder.c:1
-#: camel/providers/local/camel-mbox-folder.c:1
-#: camel/providers/local/camel-spool-folder.c:1
-#: camel/providers/local/camel-spool-folder.c:1
-#: camel/providers/local/camel-spool-folder.c:1
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4621,17 +4773,17 @@ msgstr ""
 "Nie mo©na pobraФ listu: %s z folderu %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:1
-#: camel/providers/local/camel-spool-folder.c:1
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:1
-#: camel/providers/local/camel-spool-folder.c:1
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:1
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -4640,7 +4792,7 @@ msgstr ""
 "Nie mo©na otworzyФ pliku \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:1
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -4649,14 +4801,14 @@ msgstr ""
 "Nie mo©na stworzyФ pliku \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:1
-#: camel/providers/local/camel-mbox-store.c:1
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "\"%s\" nie jest zwykЁym plikiem."
 
-#: camel/providers/local/camel-mbox-store.c:1
-#: camel/providers/local/camel-mbox-store.c:1
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -4665,167 +4817,167 @@ msgstr ""
 "Nie mo©na usun╠Ф folderu \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:1
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Folder \"%s\" nie jest pusty. Nie zostaЁ usuniЙty."
 
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "Tworzenie zestawienia folderu"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 "Nie mo©na otworzyФ folderu: %s: tworzenie zestawienia od pozycji %ld: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Nie mo©na stworzyФ zestawienia folderu: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1 mail/mail-ops.c:1
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Synchronizowanie folderu"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:507
+#: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Nie mo©na otworzyФ folderu aby stworzyФ zestawienie: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nie mo©na otworzyФ tymczasowej skrzynki: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:557
+#: camel/providers/local/camel-mbox-summary.c:746
+#: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Niezgodno╤Ф folderu z zestawieniem, nawet po synchronizacji"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Nie powiСdЁ siЙ zapis do tymczasowej skrzynki: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nie mo©na zamkn╠Ф folderu ╪rСdЁowego %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nie mo©na zamkn╠Ф folderu tymczasowego: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nie mo©na zmieniФ nazwy folderu: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Nieznany bЁ╠d: %s"
 
-#: camel/providers/local/camel-mh-folder.c:1
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nie mo©na doЁ╠czyФ listu do folderu mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:1
+#: camel/providers/local/camel-mh-store.c:110
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "\"%s\" nie jest katalogiem."
 
-#: camel/providers/local/camel-mh-summary.c:1
+#: camel/providers/local/camel-mh-summary.c:218
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Nie mo©na otworzyФ ╤cie©ki katalogu MH: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:1
+#: camel/providers/local/camel-spool-folder.c:465
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Nie mo©na doЁ╠czyФ listu do pliku kolejki: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:1
+#: camel/providers/local/camel-spool-store.c:132
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "Kolejka \"%s\" nie istnieje lub nie jest zwykЁym plikiem"
 
-#: camel/providers/local/camel-spool-store.c:1
+#: camel/providers/local/camel-spool-store.c:159
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Folder \"%s/%s\" nie istnieje."
 
-#: camel/providers/local/camel-spool-store.c:1
+#: camel/providers/local/camel-spool-store.c:176
 msgid "Spool stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:1
+#: camel/providers/local/camel-spool-store.c:186
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Plik %s z kolejk╠ listСw"
 
-#: camel/providers/local/camel-spool-store.c:1
+#: camel/providers/local/camel-spool-store.c:222
 msgid "Spool folders cannot be renamed"
 msgstr "Nie mo©na zmieniaФ nazw folderСw kolejek"
 
-#: camel/providers/local/camel-spool-store.c:1
+#: camel/providers/local/camel-spool-store.c:230
 msgid "Spool folders cannot be deleted"
 msgstr "Nie mo©na usuwaФ folderСw kolejek"
 
-#: camel/providers/local/camel-spool-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Nie mo©na zsynchronizowaФ folderu tymczasowego %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-spool-summary.c:817
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Nie mo©na zsynchronizowaФ folderu kolejki %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
-#: camel/providers/local/camel-spool-summary.c:1
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -4834,62 +4986,62 @@ msgstr ""
 "Nie mo©na zsynchronizowaФ folderu kolejki %s: %s\n"
 "Folder mo©e byФ uszkodzony, zapisano kopiЙ w \"%s\""
 
-#: camel/providers/nntp/camel-nntp-auth.c:1
+#: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Podaj hasЁo NNTP dla %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:1
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "Swerwer odrzuciЁ nazwЙ u©ytkownika"
 
-#: camel/providers/nntp/camel-nntp-auth.c:1
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "WysЁanie nazwy u©ytkownika do serwera nie powiodЁo siЙ"
 
-#: camel/providers/nntp/camel-nntp-auth.c:1
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "Serwer odrzuciЁ nazwЙ u©ytkownika/hasЁo"
 
-#: camel/providers/nntp/camel-nntp-folder.c:1
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "Nie odnaleziono listu %s."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:1
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "Nie mo©na pobraФ z serwera listy grup."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:1
-#: camel/providers/nntp/camel-nntp-grouplist.c:1
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:1
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:1
+#: camel/providers/nntp/camel-nntp-provider.c:42
 msgid "USENET news"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:1
+#: camel/providers/nntp/camel-nntp-provider.c:44
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:1
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:1
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:1
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4897,63 +5049,63 @@ msgstr ""
 "Przy tej opcji uwierzytelnianie na serwerze NNTP bЙdzie przeprowadzane z "
 "u©yciem hasЁa w postaci czystego tekstu."
 
-#: camel/providers/nntp/camel-nntp-store.c:1
-#: camel/providers/nntp/camel-nntp-store.c:1
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Nie mo©na otworzyФ lub stworzyФ pliku .newsrc dla %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:149
 msgid "Retrieving POP summary"
 msgstr "Pobieranie zestawienia POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:155
 #, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "Nie mo©na sprawdziФ nowych listСw na serwerze POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:199
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Nie mo©na otworzyФ folderu: spis listСw byЁ niekompletny."
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:292
 #, c-format
 msgid "No message with uid %s"
 msgstr "Brak listu o warto╤ci uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:296
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Pobieranie listu %d z serwera POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:303
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Nie mo©na pobraФ listu: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:320
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nie mo©na pobraФ listu z serwera POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-provider.c:1
+#: camel/providers/pop3/camel-pop3-provider.c:37
 msgid "Message storage"
 msgstr "Przechowywanie listСw"
 
-#: camel/providers/pop3/camel-pop3-provider.c:1
+#: camel/providers/pop3/camel-pop3-provider.c:39
 msgid "Leave messages on server"
 msgstr "Pozostawianie listСw na serwerze"
 
-#: camel/providers/pop3/camel-pop3-provider.c:1
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "Usuwanie po %s dniach"
 
-#: camel/providers/pop3/camel-pop3-provider.c:1 mail/mail-config.glade.h:1
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:1
+#: camel/providers/pop3/camel-pop3-provider.c:50
 msgid ""
 "For connecting to POP servers. The POP protocol can also be used to retrieve "
 "mail from certain web mail providers and proprietary email systems."
@@ -4962,7 +5114,7 @@ msgstr ""
 "pobierania poczty z pewnych zamkniЙtych systemСw pocztowych i od dostawcСw "
 "poczty obsЁugiwanej poprzez www."
 
-#: camel/providers/pop3/camel-pop3-provider.c:1
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4971,7 +5123,7 @@ msgstr ""
 "u©yciem hasЁa w postaci czystego tekstu. Wiele serwerСw POP obsЁuguje tylko "
 "tЙ opcjЙ."
 
-#: camel/providers/pop3/camel-pop3-provider.c:1
+#: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -4981,34 +5133,34 @@ msgstr ""
 "u©yciu protokoЁu APOP. Mo©e on nie funkcjonowaФ dla wszystkich u©ytkownikСw, "
 "nawet, je╤li serwer teoretycznie obsЁuguje protokСЁ."
 
-#: camel/providers/pop3/camel-pop3-provider.c:1
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Przy tej opcji uwierzytelnianie na serwerze POP bЙdzie przeprowadzane przy "
 "u©yciu Kerberosa 4 ."
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Nie mo©na przeprowadziФ uwierzytelnienia na serwerze KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Nie mo©na nawi╠zaФ poЁ╠czenia z serwerem: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Nie mo©na nawi╠zaФ poЁ╠czenia z serwerem POP pod adresem %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sPodaj hasЁo POP3 dla %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -5017,18 +5169,18 @@ msgstr ""
 "Nie mo©na nawi╠zaФ poЁ╠czenia z serwerem POP.\n"
 "Wyst╠piЁ bЁ╠d przy wysyЁaniu nazwy u©ytkownika: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:1
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr "(Nieznane)"
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -5037,17 +5189,17 @@ msgstr ""
 "Nie mo©na nawi╠zaФ poЁ╠czenia z serwerem POP.\n"
 "Wyst╠piЁ bЁ╠d przy wysyЁaniu hasЁa: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Folder \"%s\" nie istnieje."
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:1
-#: mail/mail-config.glade.h:1
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:1
+#: camel/providers/sendmail/camel-sendmail-provider.c:39
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -5055,174 +5207,174 @@ msgstr ""
 "Do wysyЁania poczty poprzez przekazania jej dziaЁaj╠cemu lokalnie programowi "
 "\"sendmail\"."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:107
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Nie mo©na stworzyФ potoku do programu sendmail: %s: nie wysЁano poczty"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:124
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 "Nie mo©na stworzyФ procesu dla programu sendmail: %s: nie wysЁano poczty"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:150
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Nie mo©na wysЁaФ listu: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:163
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "Program sendmail zostaЁ przerwany przez sygnaЁ %s: nie wysЁano poczty."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:170
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Nie mo©na wykonaФ %s: nie wysЁano poczty."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:175
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 "Program sendmail zostaЁ zakoЯczony z kodem stanu %d: nie wysЁano poczty."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:194
 msgid "Could not find 'From' address in message"
 msgstr "Nie mo©na odnale╪Ф adresu \"Od\" w li╤cie"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:249
 msgid "Mail delivery via the sendmail program"
 msgstr "WysyЁanie listСw za pomoc╠ programu sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:1 mail/mail-config.glade.h:1
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:1
+#: camel/providers/smtp/camel-smtp-provider.c:40
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "BЁ╠d skЁadniowy. Nie rozpoznano polecenia."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "BЁ╠d skЁadniowy w╤rСd parametrСw lub argumentСw"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Niezaimplementowane polecenie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "Niezaimplementowany parametr polecenia"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "Komunikat pomocy"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "UsЁuga gotowa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr "UsЁuga zamyka kanaЁ transmisyjny"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "Transakcja nie powiodЁa siЙ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr "Potrzebna jest zmiana hasЁa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "Mechanizm uwierzytelniania jest zbyt sЁaby"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "Wymagane uwierzytelnienie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "BЁЙdna odpowied╪ na powitanie: %s: prawdopodobnie mo©na kontynuowaФ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "Serwer SMTP %s nie obsЁuguje wymaganego typu uwierzytelniania %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sPodaj hasЁo SMTP dla %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5233,157 +5385,171 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "Serwer SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "WysyЁanie listСw za pomoc╠ SMTP poprzez %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr "Nie mo©na wysЁaФ listu: nie podano adresu nadawcy."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr "Nie mo©na wysЁaФ listu: niepoprawny adres nadawcy."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "WysyЁanie listu"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "Nie mo©na wysЁaФ listu: nie podano odbiorcСw"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, fuzzy
+msgid "SMTP Greeting"
+msgstr "Spotkanie"
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "UpЁyn╠Ё czas oczekiwania po HELO: %s: mo©na kontynuowaФ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "BЁЙdna odpowied╪ na HELO: %s: mo©na kontynuowaФ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr "BЁ╠d przy tworzeniu obiektu uwierzytelniaj╠cego SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Uwierzytelnianie"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "UpЁyn╠Ё czas oczekiwania po AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:782
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "UpЁyn╠Ё czas oczekiwania po MAIL FROM: %s: nie wysЁano poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "BЁЙdna odpowied╪ na MAIL FROM: %s: nie wysЁano poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "UpЁyn╠Ё czas oczekiwania po RCPT TO: %s: nie wysЁano poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "BЁЙdna odpowied╪ na RCPT TO: %s: nie wysЁano poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "UpЁyn╠Ё czas oczekiwania po DATA: %s: nie wysЁano poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "BЁЙdna odpowied╪ na DATA: %s: nie wysЁano poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "UpЁyn╠Ё czas oczekiwania na wysЁanie DATA: przerwanie listu: %s: nie wysЁano "
 "poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "BЁЙdna odpowied╪ na DATA: przerwanie listu: %s: nie wysЁano poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "UpЁyn╠Ё czas oczekiwania po RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "BЁЙdna odpowied╪ na RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "UpЁyn╠Ё czas oczekiwania po QUIT: %s: mo©na kontynuowaФ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "BЁЙdna odpowied╪ na QUIT: %s: mo©na kontynuowaФ"
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 bajt"
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u bajtСw"
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fk"
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:1 mail/mail-display.c:1
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "zaЁ╠cznik"
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "Usuwa wybrane elementy z listy zaЁ╠cznikСw"
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Dodaj zaЁ╠cznik..."
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "ZaЁ╠cza plik do listu"
 
@@ -5391,77 +5557,77 @@ msgstr "ZaЁ╠cza plik do listu"
 msgid "Attachment properties"
 msgstr "WЁa╤ciwo╤ci zaЁ╠cznika"
 
-#: composer/e-msg-composer-attachment.glade.h:1
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Nazwa pliku:"
 
-#: composer/e-msg-composer-attachment.glade.h:1
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "Typ MIME:"
 
-#: composer/e-msg-composer-attachment.glade.h:1
-#: composer/e-msg-composer-select-file.c:1
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerowanie automatycznego wy╤wietlenia zaЁ╠cznika"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "Kliknij tu aby otworzyФ ksi╠©kЙ adresow╠"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "Odpowied╪ do:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Temat:"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "Dla:"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "Podaj adres odbiorcy listu"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Podaj adresy, pod ktСre zostanie przesЁana kopia listu"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
 "Podaj adresy, pod ktСre zostanie przesЁana kopia listu bez listy odbiorcСw."
 
-#: composer/e-msg-composer-select-file.c:1
-#: ui/evolution-message-composer.xml.h:1
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "ZaЁ╠czenie pliku"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -5470,7 +5636,7 @@ msgstr ""
 "Nie mo©na otworzyФ pliku %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:683
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -5479,44 +5645,44 @@ msgstr ""
 "BЁ╠d przy odczycie pliku %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Zapisz jako..."
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr "Ostrze©enie!"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:884
 msgid "File exists, overwrite?"
 msgstr "Plik istnieje, nadpisaФ?"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "BЁ╠d przy zapisie pliku: %s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "BЁ╠d przy odczycie pliku : %s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:997
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1047
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "BЁ╠d przy dostЙpie do pliku: %s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1055
 msgid "Unable to retrieve message from editor"
 msgstr "Nie mo©na pobraФ listu z edytora"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1061
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5525,7 +5691,7 @@ msgstr ""
 "Nie mo©na zmieniФ poЁo©enia w pliku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1067
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5534,7 +5700,7 @@ msgstr ""
 "Nie mo©na przyci╠Ф pliku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1076
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5543,7 +5709,7 @@ msgstr ""
 "BЁ╠d przy automatycznym zapisie listu: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1173
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
 "Would you like to attempt recovery?"
@@ -5551,12 +5717,7 @@ msgstr ""
 "Odnaleziono niezapisane pliki z poprzedniej sesji.\n"
 "Czy chcesz sprСbowaФ je odzyskaФ?"
 
-#: composer/e-msg-composer.c:1 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:1
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5566,33 +5727,38 @@ msgstr ""
 "\n"
 "Czy chcesz zapisaФ zmiany?"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Otwarcie pliku"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1500
 msgid "Insert File"
 msgstr "Wstawienie pliku"
 
-#: composer/e-msg-composer.c:1 composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Tworzenie listu"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "Nie mo©na stworzyФ okna tworzenia listu."
 
-#: composer/evolution-composer.c:1
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:1
+#: composer/evolution-composer.c:374
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
-#: data/evolution.desktop.in.h:1
+#: data/evolution.desktop.in.h:2
 msgid "The Evolution groupware suite"
 msgstr ""
 
@@ -5600,111 +5766,127 @@ msgstr ""
 msgid "address card"
 msgstr "karta adresowa"
 
-#: data/evolution.keys.in.h:1
+#: data/evolution.keys.in.h:2
 msgid "calendar information"
 msgstr "informacje kalendarza"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:1 e-util/e-time-utils.c:1
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:1
-#: widgets/misc/e-dateedit.c:1 widgets/misc/e-dateedit.c:1
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:1 e-util/e-time-utils.c:1
-#: e-util/e-time-utils.c:1
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:1 e-util/e-time-utils.c:1
-#: e-util/e-time-utils.c:1
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:1 e-util/e-time-utils.c:1
-#: e-util/e-time-utils.c:1 widgets/misc/e-dateedit.c:1
-#: widgets/misc/e-dateedit.c:1 widgets/misc/e-dateedit.c:1
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:1 e-util/e-time-utils.c:1
-#: e-util/e-time-utils.c:1 widgets/misc/e-dateedit.c:1
-#: widgets/misc/e-dateedit.c:1 widgets/misc/e-dateedit.c:1
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
 msgid "%H:%M"
 msgstr "%H:%M"
 
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %d/%m/%Y"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
+
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:1
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:1
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: e-util/e-time-utils.c:298
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:1
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:1
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "rok"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "lat"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "miesi╠c"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "miesiЙcy"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "tydzieЯ"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "tygodni"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "godzina"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "minuta"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "sekunda"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "sekund"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -5713,7 +5895,7 @@ msgstr ""
 "Data listu bЙdzie porСwnywana z czasem\n"
 "zastosowania filtra."
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5721,7 +5903,7 @@ msgstr ""
 "Data listu bЙdzie porСwnywana z czasem podanym\n"
 "poni©ej."
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5732,68 +5914,73 @@ msgstr ""
 "\"tydzieЯ temu\"."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "bie©╠cym czasem"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "podanym czasem"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "czasem podanym wzglЙdem bie©╠cego"
 
 #. The label
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "PorСwnanie z"
 
-#: filter/filter-datespec.c:1 filter/filter-datespec.c:1
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "teraz"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:575
 msgid " ago"
 msgstr " temu"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:621
+#, fuzzy
+msgid "ago"
+msgstr " temu"
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<kliknij, aby wybraФ datЙ>"
 
-#: filter/filter-editor.c:1 filter/filter.glade.h:1
+#: filter/filter-editor.c:132 filter/filter.glade.h:6
 msgid "Filter Rules"
 msgstr "ReguЁy filtrСw"
 
 #. and now for the action area
-#: filter/filter-filter.c:1
+#: filter/filter-filter.c:452
 msgid "Then"
 msgstr "Podejmowane czynno╤ci"
 
-#: filter/filter-filter.c:1
+#: filter/filter-filter.c:466
 msgid "Add action"
 msgstr "Dodaj czynno╤Ф"
 
-#: filter/filter-folder.c:1
+#: filter/filter-folder.c:147
 msgid ""
 "Oops, you forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:1 filter/vfolder-rule.c:1
-#: mail/mail-account-gui.c:1
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "WybСr folderu"
 
-#: filter/filter-folder.c:1
+#: filter/filter-folder.c:250
 msgid "Enter folder URI"
 msgstr "Podaj URI folderu"
 
-#: filter/filter-folder.c:1
+#: filter/filter-folder.c:296
 msgid "<click here to select a folder>"
 msgstr "<kliknij, aby wybraФ folder> "
 
-#: filter/filter-input.c:1
+#: filter/filter-input.c:193
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -5802,317 +5989,324 @@ msgstr ""
 "BЁ╠d w wyra©eniu regularnym \"%s\":\n"
 "%s"
 
-#: filter/filter-part.c:1
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr "Nazwa reguЁy: "
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr "Bez nazwy"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "Lista warunkСw"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Wykonywanie czynno╤ci"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "przy speЁnieniu wszystkich kryteriСw"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "przy speЁnieniu ktСregokolwiek z kryteriСw"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "Dodaj kryterium"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "poczta wchodz╠ca"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "poczta wychodz╠ca"
 
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Dodaj"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
 msgid "Edit"
 msgstr "Edycja"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Modyfikacja filtrСw"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:5
 msgid "Edit VFolders"
 msgstr "Modyfikacja VFolderСw"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:7
 msgid "Incoming"
 msgstr "Poczta wchodz╠ca"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:8
 msgid "Outgoing"
 msgstr "Poczta wychodz╠ca"
 
-#: filter/filter.glade.h:1 filter/vfolder-editor.c:1
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Wirtualne foldery"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:11
 msgid "specific folders only"
 msgstr "tylko okre╤lone foldery"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:12
 msgid "vFolder Sources"
 msgstr "╛rСdЁa VFolderСw"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:13
 msgid "with all active remote folders"
 msgstr "ze wszystkimi aktywnymi zdalnymi folderami"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:14
 msgid "with all local and active remote folders"
 msgstr "ze wszystkimi lokalnymi i aktywnymi zdalnymi folderami"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:15
 msgid "with all local folders"
 msgstr "ze wszystkimi lokalnymi folderami"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Przypisz kolor"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "ZaЁ╠czniki"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:7
 msgid "contains"
 msgstr "zawiera"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Skopiuj do folderu"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Data otrzymania"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Data wysЁania"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "UsuniЙty"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "nie zawiera"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "nie koЯczy siЙ na"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "nie istnieje"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:16
 msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:17
 msgid "does not start with"
 msgstr "nie rozpoczyna siЙ od"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr "Nie istnieje"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "Roboczy"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:20
 msgid "ends with"
 msgstr "koЯczy siЙ na"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:21
 msgid "Exist"
 msgstr "Istnieje"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:22
 msgid "exists"
 msgstr "istnieje"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:23
 msgid "Expression"
 msgstr "Wyra©enie"
 
-#: filter/libfilter-i18n.h:1
-msgid "Forward to Address"
-msgstr "Prze╤lij na adres"
-
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:24
 msgid "Important"
 msgstr "Wa©ny"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "jest"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "jest wiЙkszy ni©"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "jest mniejszy ni©"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "nie jest"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Lista dyskusyjna"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Tre╤Ф listu"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "NagЁСwek listu"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "List zostaЁ otrzymany"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "List zostaЁ wysЁany"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Przenie╤ do folderu"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr "w lub po"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr "w lub przed"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Przeczytany"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Lista odbiorcСw"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr ""
 
-#: filter/libfilter-i18n.h:1 filter/score-rule.c:1 filter/score-rule.c:1
-#: mail/message-list.etspec.h:1
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:1 mail/mail-callbacks.c:1
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Nadawca"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Ustaw stan"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:44
 msgid "Size (kB)"
 msgstr "Rozmiar (KB)"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "brzmi jak"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:46
 msgid "Source Account"
 msgstr "Konto ╪rСdЁowe"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr "Okre╤lony nagЁСwek"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:48
 msgid "starts with"
 msgstr "rozpoczyna siЙ od"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Zatrzymanie przetwarzania"
 
-#: filter/libfilter-i18n.h:1 mail/mail-format.c:1
-#: mail/message-list.etspec.h:1
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Temat"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "jest po"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:53
 msgid "was before"
 msgstr "jest przed"
 
-#: filter/rule-editor.c:1
+#: filter/rule-editor.c:147
 msgid "Rules"
 msgstr "ReguЁy"
 
-#: filter/rule-editor.c:1
+#: filter/rule-editor.c:240
 msgid "Add Rule"
 msgstr "Dodaj reguЁЙ"
 
-#: filter/rule-editor.c:1
+#: filter/rule-editor.c:299
 msgid "Edit Rule"
 msgstr "Zmodyfikuj reguЁЙ"
 
-#: filter/score-editor.c:1
+#: filter/score-editor.c:130
 msgid "Score Rules"
 msgstr ""
 
-#: importers/elm-importer.c:1 importers/evolution-gnomecard-importer.c:1
-#: importers/netscape-importer.c:1 importers/pine-importer.c:1
-#: shell/e-shell-importer.c:1 shell/importer/import.glade.h:1
-#: shell/importer/intelligent.c:1
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Import"
 
-#: importers/elm-importer.c:1 importers/netscape-importer.c:1
-#: importers/pine-importer.c:1 my-evolution/my-evolution.glade.h:1
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
 msgid "Mail"
 msgstr "Poczta"
 
-#: importers/elm-importer.c:1
+#: importers/elm-importer.c:498
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -6120,15 +6314,15 @@ msgstr ""
 "Odnaleziono pliki pocztowe programu Elm.\n"
 "Czy chcesz zaimportowaФ je do Evolution?"
 
-#: importers/elm-importer.c:1
+#: importers/elm-importer.c:527
 msgid "Elm mail"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:1 importers/pine-importer.c:1
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
 msgid "Addressbook"
 msgstr "Ksi╠©ka adresowa"
 
-#: importers/evolution-gnomecard-importer.c:1
+#: importers/evolution-gnomecard-importer.c:253
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6136,11 +6330,11 @@ msgstr ""
 "Odnaleziono pliki programu GnomeCard.\n"
 "Czy chcesz zaimportowaФ je do Evolution?"
 
-#: importers/netscape-importer.c:1
+#: importers/netscape-importer.c:824
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: importers/netscape-importer.c:1
+#: importers/netscape-importer.c:849
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -6148,7 +6342,7 @@ msgstr ""
 "Odnaleziono pliki pocztowe programu Netscape.\n"
 "Czy chcesz zaimportowaФ je do Evolution?"
 
-#: importers/pine-importer.c:1
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -6156,7 +6350,7 @@ msgstr ""
 "Odnaleziono pliki pocztowe programu Pine.\n"
 "Czy chcesz zaimportowaФ je do Evolution?"
 
-#: importers/pine-importer.c:1
+#: importers/pine-importer.c:691
 msgid "Pine mail"
 msgstr "Poczta Pine"
 
@@ -6164,179 +6358,194 @@ msgstr "Poczta Pine"
 msgid "Evolution component for handling mail."
 msgstr "Komponent Evolution obsЁuguj╠cy pocztЙ."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
 msgid "Evolution mail composer."
 msgstr "Edytor listСw Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
 msgid "Evolution mail executive summary component."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
 msgid "Evolution mail folder display component."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
 msgid "Evolution mail folder factory component."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Factory for the Evolution composer."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Factory for the Evolution mail component."
 msgstr "Generator komponentu pocztowego Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Factory for the Mail Summary component."
 msgstr "Generator komponentu zestawienia poczty."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Mail configuration interface"
 msgstr "Interfejs konfiguracji poczty"
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "_WЁa╤ciwo╤ci..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Zmienia wЁa╤ciwo╤ci folderu"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nie mo©na zainicjowaФ komponentu pocztowego Evolution."
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:1
+#: mail/folder-browser-ui.c:254
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "WЁa╤ciwo╤ci \"%s\""
 
-#: mail/folder-browser-ui.c:1
+#: mail/folder-browser-ui.c:256
 msgid "Properties"
 msgstr "WЁa╤ciwo╤ci"
 
-#: mail/folder-browser.c:1 mail/mail-display.c:1
+#: mail/folder-browser.c:231 mail/mail-display.c:278
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nie mo©na stworzyФ katalogu tymczasowego: %s"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "Zapisz wyszukiwanie jako vFolder"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr "VFolder w oparciu o _temat"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "VFolder w oparciu o _nadawcЙ"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "VFolder w oparciu o _odbiorcСw"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr "VFolder w oparciu o _listЙ dyskusyjn╠"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "Filtr w oparciu o t_emat"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "Filtr w oparciu o n_adawcЙ"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "Filtr w oparciu o o_dbiorcСw"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "Filtr w oparciu o li_stЙ dyskusyjn╠"
 
-#: mail/folder-browser.c:1
-msgid "_Open"
-msgstr "_OtwСrz"
-
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Wy╤lij ponownie"
 
-#: mail/folder-browser.c:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-mail-message.xml.h:1 ui/evolution-tasks.xml.h:1
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Zapisz j_ako..."
 
-#: mail/folder-browser.c:1 ui/evolution-tasks.xml.h:1
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "Wy_drukuj"
 
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "_Odpowiedz nadawcy"
 
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
 msgid "Reply to _List"
 msgstr "Odpowiedz na _listЙ"
 
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "Odpowiedz wszystki_m"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "_Prze╤lij"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "O_znacz jako przeczytany"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Oz_nacz jako nieprzeczytany"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1295
 msgid "Mark as _Important"
 msgstr "Oznacz jako _wa©ny"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Oznacz jako _wa©ny"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "P_rzenie╤ do folderu..."
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "_Skopiuj do folderu..."
 
-#: mail/folder-browser.c:1 ui/evolution-mail-message.xml.h:1
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "_Cofnij usuniЙcie"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1313
 msgid "Add Sender to Address Book"
 msgstr "Dodaj nadawcЙ do ksi╠©ki adresowej"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Zastosuj filtry"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "StwСrz _reguЁЙ na podstawie listu"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "Filtr w oparciu o listЙ dyskusyjn╠"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "VFolder w oparciu o listЙ dyskusyjn╠"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtr w oparciu o listЙ dyskusyjn╠ (%s)"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VFolder w oparciu o listЙ dyskusyjn╠ (%s)"
@@ -6345,7 +6554,7 @@ msgstr "VFolder w oparciu o listЙ dyskusyjn╠ (%s)"
 msgid "Factory to import mbox into Evolution"
 msgstr "Generator importu plikСw mbox do Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
 msgid "Imports mbox files into Evolution"
 msgstr "Impurtuje pliki mbox do Evolution."
 
@@ -6353,7 +6562,7 @@ msgstr "Impurtuje pliki mbox do Evolution."
 msgid "Factory to import Outlook Express 4 mails into Evolution"
 msgstr "Generator importu plikСw Outlook Express 4 do Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Impurtuje pliki Outlook Express 4 do Evolution."
 
@@ -6361,15 +6570,15 @@ msgstr "Impurtuje pliki Outlook Express 4 do Evolution."
 msgid "Current store format:"
 msgstr "Bie©╠cy format przechowywania:"
 
-#: mail/local-config.glade.h:1
+#: mail/local-config.glade.h:2
 msgid "Mailbox Format"
 msgstr "Format skrzynki"
 
-#: mail/local-config.glade.h:1
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "Nowy format przechowywania:"
 
-#: mail/local-config.glade.h:1
+#: mail/local-config.glade.h:4
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
@@ -6380,38 +6589,38 @@ msgstr ""
 "do stanu, w ktСrym automatyczne odtworzenie danych nie bЙdzie\n"
 "mo©liwe. Korzystaj wiЙc z tej opcji bardzo ostro©nie."
 
-#: mail/local-config.glade.h:1
+#: mail/local-config.glade.h:7
 msgid "maildir"
 msgstr "maildir"
 
-#: mail/local-config.glade.h:1
+#: mail/local-config.glade.h:8
 msgid "mbox"
 msgstr "mbox"
 
-#: mail/local-config.glade.h:1
+#: mail/local-config.glade.h:9
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:1 mail/mail-account-editor.c:1
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
 msgid "You have not filled in all of the required information."
 msgstr "Nie zostaЁy podane wszystkie wymagane informacje."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor-news.c:1
+#: mail/mail-account-editor-news.c:160
 #, fuzzy
 msgid "Evolution News Editor"
 msgstr "Modyfikacja konta Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:1
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Modyfikacja konta Evolution"
 
-#: mail/mail-account-gui.c:1
+#: mail/mail-account-gui.c:971
 msgid "Save signature"
 msgstr "Zapisz podpis"
 
-#: mail/mail-account-gui.c:1
+#: mail/mail-account-gui.c:977
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -6421,56 +6630,66 @@ msgstr ""
 "\n"
 "Czy chcesz je zapisaФ?"
 
-#: mail/mail-accounts.c:1
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr " (domy╤lne)"
 
-#: mail/mail-accounts.c:1
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "Unieaktywnij"
 
-#: mail/mail-accounts.c:1 mail/mail-config.glade.h:1
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "Uaktywnij"
 
-#: mail/mail-accounts.c:1 mail/mail-accounts.c:1
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "Czy na pewno chcesz usun╠Ф to konto?"
 
-#: mail/mail-accounts.c:1 mail/mail-accounts.c:1
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "UsuЯ"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "Ustawienie jako konto domy╤lne"
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr ""
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:1
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Mened©er kont Evolution"
 
-#: mail/mail-autofilter.c:1
+#: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "List do %s"
 
-#: mail/mail-autofilter.c:1
+#: mail/mail-autofilter.c:213
 #, c-format
 msgid "Subject is %s"
 msgstr "Tematem jest $s"
 
-#: mail/mail-autofilter.c:1
+#: mail/mail-autofilter.c:229
 #, c-format
 msgid "Mail from %s"
 msgstr "List on %s"
 
-#: mail/mail-autofilter.c:1
+#: mail/mail-autofilter.c:285
 #, c-format
 msgid "%s mailing list"
 msgstr "lista dyskusyjna %s"
 
-#: mail/mail-autofilter.c:1 mail/mail-autofilter.c:1
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
 msgid "Add Filter Rule"
 msgstr "Dodanie reguЁy filtra"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -6478,13 +6697,13 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -6492,11 +6711,11 @@ msgstr ""
 "Przed stworzeniem listu nale©y skonfigurowaФ\n"
 "sposСb przekazywania listСw."
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr "Nie zostaЁ ustawiony sposСb przekazywania listСw"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6504,7 +6723,7 @@ msgstr ""
 "List nie zawiera tematu.\n"
 "Rzeczywi╤cie wysЁaФ?"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:273
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6512,37 +6731,37 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr "Przed wysЁaniem listu nale©y podaФ jego odbiorcСw."
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr "Przed wysЁaniem listu nale©y skonfigurowaФ konto."
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "PrzesЁany list:\n"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "Przeniesienie listСw do folderu"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Kopiowanie listСw do folderu"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1374
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Czy na pewno chcesz zredagowaФ wszystkie %d listСw?"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6550,7 +6769,7 @@ msgstr ""
 "Mo©liwe jest redagowanie wyЁ╠cznie\n"
 "listСw zapisanych w folderze Poczta robocza."
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6558,24 +6777,24 @@ msgstr ""
 "Listy zapisane w folderze WysЁane\n"
 "mo©na tylko wysЁaФ ponownie."
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1442
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Czy na pewno chcesz ponownie wysЁaФ wszystkie %d listСw?"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1463
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Zapis listu pod podan╠ nazw╠"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Zapis listСw pod podan╠ nazw╠"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6584,24 +6803,24 @@ msgstr ""
 "BЁ╠d przy wczytywaniu informacji o filtrze:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1776
 msgid "Filters"
 msgstr "Filtry"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Wydruk listu"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "Wydrukowanie listu nie powiodЁo siЙ"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:1966
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Czy na pewno chcesz otworzyФ wszystkie %d listСw w osobnych oknach?"
 
-#: mail/mail-config-druid.c:1
+#: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -6611,21 +6830,21 @@ msgstr ""
 "\"opcjonalne\" nie musz╠ byФ wypeЁnione, chyba, ©e chcesz, aby znajduj╠ce "
 "siЙ w nich informacje byЁy zawarte w wysyЁanych listach."
 
-#: mail/mail-config-druid.c:1
+#: mail/mail-config-druid.c:101
 msgid ""
 "Please enter information about your incoming mail server below. If you don't "
 "know what kind of server you use, contact your system administrator or "
 "Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:1
+#: mail/mail-config-druid.c:105
 msgid ""
 "Please enter information about your outgoing mail protocol below. If you "
 "don't know which protocol you use, contact your system administrator or "
 "Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:1
+#: mail/mail-config-druid.c:107
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -6635,11 +6854,11 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:1
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-config.c:1 mail/mail-config.c:1
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 msgid "Connecting to server..."
 msgstr "Nawi╠zywanie poЁ╠czenia z serwerem..."
 
@@ -6647,63 +6866,68 @@ msgstr "Nawi╠zywanie poЁ╠czenia z serwerem..."
 msgid " Check for supported types "
 msgstr " Sprawd╪ obsЁugiwane typy "
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr " "
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Ten rodzaj szyfrowania nie obsЁuguje podpisywania"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Konto"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Informacje o koncie"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "Zarz╠dzanie kontami"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Konta"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:10
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:11
 msgid "Always load images off the net"
 msgstr "Pobieranie obrazСw z sieci w ka©dym przypadku"
 
-#: mail/mail-config.glade.h:1 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "ZaЁ╠cznik"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Uwierzytelnianie"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Typ uwierzytelniania: "
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "Automatyczne sprawdzanie nowych listСw co"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:16
 msgid "Certificate ID:"
 msgstr "ID certyfikatu:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:18
 msgid "Composer"
 msgstr "Nowe listy"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6718,504 +6942,523 @@ msgstr ""
 "\n"
 "Kliknij \"ZakoЯcz\", aby zapisaФ ustawienia."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "_Domy╤lne"
 
-#: mail/mail-config.glade.h:1
-msgid "Default \"Forward\" style is: "
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Default Forward style is: "
 msgstr "Domy╤lny sposСb \"przesyЁania\" listСw: "
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:27
 msgid "Default character set: "
 msgstr "Domy╤lny zestaw znakСw: "
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Gotowe"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Szkice"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Folder ze szkicami:"
 
-#: mail/mail-config.glade.h:1 widgets/misc/e-filter-bar.h:1
-#: widgets/misc/e-filter-bar.h:1
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Edycja..."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "Adres e-mail:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:37
 msgid "Empty trash folders on exit"
 msgstr "OprС©nianie folderСw ╤mietnika przy zakoЯczeniu"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "Uaktywnij"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "PeЁna nazwa:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:41
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:42
 msgid "HTML Signature:"
 msgstr "Podpis w HTML-u"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:43
 msgid "Highlight citations with"
 msgstr "Oznaczanie cytatСw za pomoc╠ koloru"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Dane osobowe"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:47
 msgid "In HTML mail"
 msgstr "Listy napisane w HTML-u"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:48
 msgid "Inline"
 msgstr "Tre╤Ф listu"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:50
 msgid "Load images if sender is in addressbook"
 msgstr "Pobieranie obrazСw, je╤li nadawca jest w ksi╠©ce adresowej"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "Konfiguracja poczty"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Format skrzynki"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "Ustawienie jako konto domy╤lne"
 
-#: mail/mail-config.glade.h:1
-msgid "Mark messages as \"Read\" after"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "Oznaczanie listСw jako \"przeczytanych\" po"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
 msgid "NNTP Server:"
 msgstr "Serwer NNTP:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:59
 msgid "Never load images off the net"
 msgstr "Bez pobierania jakichkolwiek obrazСw z sieci"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "Informacje opcjonalne"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organizacja:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:65
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "╕cie©ka programu PGP:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:70
 msgid "Pick a color"
 msgstr "WybСr koloru"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:71
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:72
 msgid "Prompt when sending messages with an empty subject"
 msgstr "Potwierdzanie przy wysyЁaniu listu bez tematu"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "Potwierdzanie przy wysyЁaniu listu bez tematu"
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:75
 msgid "Quoted"
 msgstr "Jako cytat"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "Odbieranie poczty"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "Odbieranie poczty"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "Opcje odbioru"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:79
 msgid "Remember PGP Passphrase until exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "Wymagane informacje"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:83
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:84
 msgid "Security"
 msgstr "BezpieczeЯstwo"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "Domy╤lne wysyЁanie listСw w formacie HTML."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "WysyЁanie listСw"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "WysyЁanie listСw"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "WysЁane"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "Folder z wysЁanymi listami"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Konfiguracja serwera"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Typ serwera:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Serwer wymaga uwierzytelnienia"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Plik z podpisem:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:97
 msgid "Source"
 msgstr "╛rСdЁo"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:98
 msgid "Source Information"
 msgstr "Informacje o ╪rСdle"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "╛rСdЁa"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "Foldery specjalne"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "Wykorzystanie bezpiecznego poЁ╠czenia (SSL)"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "nazwa u©ytkownika:"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:112
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:113
 msgid "placeholder"
 msgstr "placeholder"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:114
 msgid "seconds."
 msgstr "sekund."
 
-#: mail/mail-crypto.c:1
+#: mail/mail-crypto.c:60
 msgid "Could not create a PGP signature context."
 msgstr "Nie mo©na stworzyФ kontekstu podpisu PGP."
 
-#: mail/mail-crypto.c:1
+#: mail/mail-crypto.c:86
 msgid "Could not create a PGP verification context."
 msgstr "Nie mo©na stworzyФ kontekstu weryfikacji PGP."
 
-#: mail/mail-crypto.c:1
+#: mail/mail-crypto.c:116
 msgid "Could not create a PGP encryption context."
 msgstr "Nie mo©na stworzyФ kontekstu szyfrowania PGP."
 
-#: mail/mail-crypto.c:1
+#: mail/mail-crypto.c:142
 msgid "Could not create a PGP decryption context."
 msgstr "Nie mo©na stworzyФ kontekstu odszyfrowania PGP."
 
-#: mail/mail-crypto.c:1
+#: mail/mail-crypto.c:177
 msgid "Could not create a S/MIME signature context."
 msgstr "Nie mo©na stworzyФ kontekstu podpisu S/MIME."
 
-#: mail/mail-crypto.c:1
+#: mail/mail-crypto.c:209
 msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-crypto.c:1
+#: mail/mail-crypto.c:240
 msgid "Could not create a S/MIME encryption context."
 msgstr "Nie mo©na stworzyФ kontekstu szyfrowania S/MIME."
 
-#: mail/mail-crypto.c:1
+#: mail/mail-crypto.c:271
 msgid "Could not create a S/MIME envelope context."
 msgstr ""
 
-#: mail/mail-crypto.c:1
+#: mail/mail-crypto.c:301
 msgid "Could not create a S/MIME decode context."
 msgstr "Nie mo©na stworzyФ kontekstu dekodowania S/MIME."
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Zapis zaЁ╠cznika"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Zapisz na dysk..."
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "Wy╤wietl na miejscu"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:342
 #, c-format
 msgid "Open in %s..."
 msgstr "OtwСrz za pomoc╠ programu %s..."
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Wy╤wietl na miejscu (za pomoc╠ programu %s)"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Ukryj"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:424
 msgid "External Viewer"
 msgstr "ZewnЙtrzna przegl╠darka"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:1048
 msgid "Loading message content"
 msgstr "Wczytywanie tre╤ci listu"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:1404
 msgid "Open Link in Browser"
 msgstr "OtwСrz odno╤nik w przegl╠darce"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:1406
 msgid "Copy Link Location"
 msgstr "Skopiuj adres odno╤nika"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:1408
 msgid "Save Link as (FIXME)"
 msgstr "Zapisz odno╤nik jako (FIXME)"
 
-#: mail/mail-display.c:1
-msgid "Save Image as"
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
 msgstr "Zapisz obraz jako"
 
-#: mail/mail-folder-cache.c:1
+#: mail/mail-folder-cache.c:170
 #, c-format
 msgid "%d new"
 msgstr "nowych: %d"
 
-#: mail/mail-folder-cache.c:1 mail/mail-folder-cache.c:1
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
 msgid ", "
 msgstr ", "
 
-#: mail/mail-folder-cache.c:1
+#: mail/mail-folder-cache.c:177
 #, c-format
 msgid "%d hidden"
 msgstr "ukrytych: %d"
 
-#: mail/mail-folder-cache.c:1
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr "nowych: %d"
+
+#: mail/mail-folder-cache.c:188
 #, c-format
 msgid "%d total"
 msgstr "ogСЁem: %d"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "ZaЁ╠cznik %s"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Nie mo©na przetworzyФ jako list MIME. Wy╤wietlanie w postaci ╪rСdЁowej."
 
-#: mail/mail-format.c:1 mail/message-list.etspec.h:1
+#: mail/mail-format.c:746
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:1 mail/message-list.etspec.h:1
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "Adres e-mail:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:867
 msgid "Reply-To"
 msgstr "Odpowied╪ do"
 
-#: mail/mail-format.c:1 mail/message-list.etspec.h:1
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Dla"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:873
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "Nie skonfigurowano programu GPG/PGP."
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "Nie wy╤wietlono zaszyfrowanego listu"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "List zaszyfrowany"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Kliknij ikonЙ aby rozszyfrowaФ."
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Wska╪nik do witryny FTP (%s)"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Wska╪nik do lokalnego pliku (%s)"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Wska╪nik do witryny FTP (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Wska╪nik na nieznane zewnЙtrzne dane (typu \"%s\")"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "Otwieranie \"%s\""
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Konwertowanie folderu \"%s\" na format \"%s\""
 
-#: mail/mail-local.c:1
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Przekonwertuj folder \"%s\" na format \"%s\""
-
-#: mail/mail-local.c:1
-msgid "Reconfiguring folder"
-msgstr "Przekonfigurowywanie folder"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:1
-msgid "Closing current folder"
-msgstr "Zamykanie bie©╠cego folderu"
-
-#: mail/mail-local.c:1
-msgid "Renaming old folder and opening"
-msgstr "Zmiana nazwy starego folderu i otwieranie"
-
-#: mail/mail-local.c:1
-msgid "Creating new folder"
-msgstr "Tworzenie nowego folderu"
-
-#: mail/mail-local.c:1
-msgid "Copying messages"
-msgstr "Kopiowanie listСw"
-
-#: mail/mail-local.c:1
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "Nie mo©na kopiowaФ listСw z tego folderu ╤mietnka."
+
+#: mail/mail-local.c:1011
 #, c-format
 msgid "Reconfigure %s"
 msgstr "Zmiana konfiguracji %s"
 
-#: mail/mail-mt.c:1
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -7224,7 +7467,7 @@ msgstr ""
 "BЁ╠d podczas operacji \"%s\":\n"
 "%s"
 
-#: mail/mail-mt.c:1
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -7233,110 +7476,104 @@ msgstr ""
 "BЁ╠d przy wykonywaniu operacji:\n"
 "%s"
 
-#: mail/mail-mt.c:1 mail/mail-mt.c:1 mail/mail-mt.c:1
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Przetwarzanie"
 
-#: mail/mail-mt.c:1
-msgid "Evolution progress"
-msgstr "PostЙp Evolution"
-
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "WysyЁanie \"%s\""
 
-#: mail/mail-ops.c:1
-msgid "Sending message"
-msgstr "WysyЁanie listu"
-
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "WysyЁanie %d. listu z %d"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Niepowodzenie przy %d. li╤cie z %d"
 
-#: mail/mail-ops.c:1 mail/mail-send-recv.c:1
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "Gotowe."
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Zapisywanie listu w folderze"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Przenoszenie listСw do %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiowanie listСw do %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Przenoszenie"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Kopiowanie"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Aanlizowanie folderСw w \"%s\""
 
-#: mail/mail-ops.c:1
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "╕mietnik"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "PrzesЁane listy"
 
-#: mail/mail-ops.c:1 mail/mail-ops.c:1
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otwieranie folderu %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1436
 #, c-format
 msgid "Removing folder %s"
 msgstr "Usuwanie folderu %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1568
 msgid "Refreshing folder"
 msgstr "Od╤wie©anie folderu"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "Oczyszczanie folderu"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Pobieranie listu %s"
 
-#: mail/mail-ops.c:1
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Pobieranie listСw"
 
-#: mail/mail-ops.c:1
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Pobieranie %d. listu z %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Zapisywanie listСw"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -7345,12 +7582,7 @@ msgstr ""
 "Nie mo©na stworzyФ pliku wyj╤ciowego: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Zapisywanie %d. listu z %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -7359,11 +7591,11 @@ msgstr ""
 "BЁ╠d przy zapisie listСw do: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "Zapisywanie zaЁ╠cznika"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7372,215 +7604,218 @@ msgstr ""
 "Nie mo©na stworzyФ pliku wyj╤ciowego: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie mo©na zapisaФ danych: %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2101
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "OdЁ╠czanie od %s"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:138
 msgid "(Untitled Message)"
 msgstr "(List bez nazwy)"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(List bez nazwy)"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "List"
+
+#: mail/mail-search.c:284
 msgid "Find in Message"
 msgstr "Wyszukiwanie w li╤cie"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:314
 msgid "Case Sensitive"
 msgstr "Z rozrС©nianiem maЁych i wielkich liter"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:315
 msgid "Search Forward"
 msgstr "Wyszukiwanie w przСd"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:332
 msgid "Find:"
 msgstr "Znajd╪:"
 
-#: mail/mail-search.c:1
+#: mail/mail-search.c:335
 msgid "Matches:"
 msgstr "Dopasowania:"
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Anulowanie..."
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "Wy╤lij i odbierz pocztЙ"
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "Odbieranie"
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:302
 msgid "Updating..."
 msgstr "Aktualizowanie..."
 
-#: mail/mail-send-recv.c:1 mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
 msgid "Waiting..."
 msgstr "Oczekiwanie..."
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "WysyЁanie"
 
-#: mail/mail-send-recv.c:1
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "Anulowano."
 
-#: mail/mail-session.c:1
+#: mail/mail-session.c:171
 msgid "User canceled operation."
 msgstr "Operacja anulowana przez u©ytkownika."
 
-#: mail/mail-tools.c:1
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-tools.c:1
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (przesЁany list)"
-
-#: mail/mail-tools.c:1
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (bez tematu)"
-
-#: mail/mail-tools.c:1
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "PrzesЁany list - %s"
 
-#: mail/mail-tools.c:1
-msgid "Forwarded message (no subject)"
-msgstr "PrzesЁany list (bez tematu)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "PrzesЁane listy"
 
-#: mail/mail-tools.c:1
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----PrzesЁany list-----<br><b>Od:</b> %s<br><b>Do:</b> %s<br><b>Temat:</b> "
-"%s<br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "PrzesЁane listy"
 
-#: mail/mail-vfolder.c:1
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "VFoldery"
 
-#: mail/mail-vfolder.c:1
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Nowy VFolder"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "Niewidziany"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "Widziany"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:1
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:1
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "Wiele listСw"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:1
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:1
+#: mail/message-list.c:626
 #, fuzzy
 msgid "Higher"
 msgstr "Wysoko╤Ф:"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:627
 #, fuzzy
 msgid "Highest"
 msgstr "Wysoko╤Ф:"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "Dzi╤ %l:%M %p"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "Wczoraj %l:%M %p"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.etspec.h:1
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Zapisywanie listСw"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Oznaczony"
 
-#: mail/message-list.etspec.h:1
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Odebrany"
 
-#: mail/message-list.etspec.h:1
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "Rozmiar"
 
-#: mail/subscribe-dialog.c:1 shell/e-storage-set-view.etspec.h:1
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Folder"
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:77
 msgid "Store"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:138
 msgid "Display folders starting with:"
 msgstr "Wy╤wietlanie folderСw rozpoczynaj╠cych siЙ od:"
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:168
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:271
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:273
 #, fuzzy, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Zapisywanie listСw z folderu \"%s\""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:878
 #, fuzzy
 msgid "Manage Subscriptions"
 msgstr "Opis:"
@@ -7589,210 +7824,186 @@ msgstr "Opis:"
 msgid "Evolution component for the executive summary."
 msgstr ""
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
 msgid "Factory for the Evolution executive summary component."
 msgstr ""
 
-#: my-evolution/component-factory.c:1
+#: my-evolution/component-factory.c:140
 #, fuzzy
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Nie mo©na zainicjowaФ komponentu pocztowego Evolution."
 
-#: my-evolution/e-summary-calendar.c:1 my-evolution/e-summary-calendar.c:1
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
 msgid "Appointments"
 msgstr "Terminy"
 
-#: my-evolution/e-summary-calendar.c:1
+#: my-evolution/e-summary-calendar.c:177
 msgid "No appointments"
 msgstr "Brak terminСw"
 
-#: my-evolution/e-summary-calendar.c:1
+#: my-evolution/e-summary-calendar.c:226
 msgid "%l:%M%p"
 msgstr "%l:%M%p"
 
-#: my-evolution/e-summary-calendar.c:1
+#: my-evolution/e-summary-calendar.c:228
 msgid "%a %l:%M%p"
 msgstr "%a %l:%M%p"
 
-#: my-evolution/e-summary-mail.c:1
+#: my-evolution/e-summary-mail.c:104
 msgid "Mail summary"
 msgstr "Zestawienie poczty"
 
-#: my-evolution/e-summary-preferences.c:1
+#: my-evolution/e-summary-preferences.c:420
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1
+#: my-evolution/e-summary-preferences.c:442
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "Dodaj ╪rСdЁo nowo╤ci"
 
-#: my-evolution/e-summary-preferences.c:1
+#: my-evolution/e-summary-preferences.c:877
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Podaj URL ╪rСdЁa nowo╤ci, ktСre chcesz dodaФ"
 
-#: my-evolution/e-summary-rdf.c:1 my-evolution/e-summary-rdf.c:1
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "_Ustawienia Mojego Evolution..."
+
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>BЁ╠d przy pobieraniu RDF-a</b>"
 
-#: my-evolution/e-summary-tasks.c:1
+#: my-evolution/e-summary-tasks.c:206
 msgid "No tasks"
 msgstr "Brak zadaЯ"
 
-#: my-evolution/e-summary-weather.c:1
+#: my-evolution/e-summary-weather.c:57
 msgid "My Weather"
 msgstr "Moja pogoda"
 
-#: my-evolution/e-summary-weather.c:1
-msgid "<b>Error downloading Metar</b>"
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:1
+#: my-evolution/e-summary-weather.c:643
 msgid "Regions"
 msgstr "Regiony"
 
-#: my-evolution/e-summary.c:1
+#: my-evolution/e-summary.c:145
 msgid "%A, %d %B %Y"
 msgstr "%A, %d %B %Y"
 
-#: my-evolution/e-summary.c:1 ui/my-evolution.xml.h:1
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 msgid "Print My Evolution"
 msgstr "Drukowanie Mojego Evolution"
 
-#: my-evolution/e-summary.c:1
+#: my-evolution/e-summary.c:518
 msgid "Printing of My Evolution failed"
 msgstr "Wydrukowanie Mojego Evolution nie powiodЁo siЙ"
 
-#: my-evolution/main.c:1
+#: my-evolution/main.c:52
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): nie mo©na zainicjowaФ Bonobo"
 
-#: my-evolution/metar.c:1
-msgid "╟F"
-msgstr "╟F"
-
-#: my-evolution/metar.c:1
-msgid "╟C"
-msgstr "╟C"
-
-#: my-evolution/metar.c:1
-msgid "knots"
-msgstr ""
-
-#: my-evolution/metar.c:1
-msgid "kph"
-msgstr "km/h"
-
-# [cyba] mo©e raczej calHg??
-#: my-evolution/metar.c:1
-msgid "inHg"
-msgstr "inHG"
-
-#: my-evolution/metar.c:1
-msgid "mmHg"
-msgstr "mmHg"
-
-#: my-evolution/metar.c:1
-msgid "miles"
-msgstr "mile"
-
-#: my-evolution/metar.c:1
-msgid "kilometers"
-msgstr "kilometry"
-
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Czyste niebo"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:45
 msgid "Broken clouds"
 msgstr "Niepewne chmury"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:46
 msgid "Scattered clouds"
 msgstr "Rzadkie chmury"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:47
 msgid "Few clouds"
 msgstr "Kilka chmur"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:48
 msgid "Overcast"
 msgstr ""
 
-#: my-evolution/metar.c:1 my-evolution/metar.c:1 my-evolution/metar.c:1
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
 msgid "Invalid"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:63
 msgid "Variable"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:64
 msgid "North"
 msgstr "PСЁnoc"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:64
 msgid "North - NorthEast"
 msgstr "PСЁnoc - pСЁnocny wschСd"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:64
 msgid "Northeast"
 msgstr "PСЁnocny wschСd"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:64
 msgid "East - NorthEast"
 msgstr "WschСd - pСЁnocny wschСd"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:65
 msgid "East"
 msgstr "WschСd"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:65
 msgid "East - Southeast"
 msgstr "WschСd - poЁudniowy wschСd"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:65
 msgid "Southeast"
 msgstr "PoЁudniowy wschСd"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:65
 msgid "South - Southeast"
 msgstr "PoЁudnie - poЁudniowy wschСd"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:66
 msgid "South"
 msgstr "PoЁudnie"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:66
 msgid "South - Southwest"
 msgstr "PoЁudnie - poЁudniowy zachСd"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:66
 msgid "Southwest"
 msgstr "PoЁudniowy zachСd"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:66
 msgid "West - Southwest"
 msgstr "ZachСd - poЁudniowy zachСd"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:67
 msgid "West"
 msgstr "ZachСd"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:67
 msgid "West - Northwest"
 msgstr "ZachСd - pСЁnocny zachСd"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:67
 msgid "Northwest"
 msgstr "PСЁnocny zachСd"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:67
 msgid "North - Northwest"
 msgstr "PСЁnoc - pСЁnocny zachСd"
 
@@ -7800,1173 +8011,1161 @@ msgstr "PСЁnoc - pСЁnocny zachСd"
 #. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
 #. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:100
 msgid "Drizzle"
 msgstr "M©awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:100
 msgid "Drizzle in the vicinity"
 msgstr "Nadchodz╠ca m©awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:100
 msgid "Light drizzle"
 msgstr "ёagodna m©awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:100
 msgid "Moderate drizzle"
 msgstr "Umiarkowana m©awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:100
 msgid "Heavy drizzle"
 msgstr "Obfita m©awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:100
 msgid "Shallow drizzle"
 msgstr "SЁaba m©awka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:100
 msgid "Patches of drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:100
 msgid "Partial drizzle"
 msgstr "CzЙ╤ciowa m©awka"
 
-#: my-evolution/metar.c:1 my-evolution/metar.c:1
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
 msgid "Thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:100
 msgid "Windy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:100
 msgid "Showers"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:100
 msgid "Drifting drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:100
 msgid "Freezing drizzle"
 msgstr ""
 
 #. RAIN
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:101
 msgid "Rain"
 msgstr "Deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:101
 msgid "Rain in the vicinity"
 msgstr "Nadchodz╠cy deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:101
 msgid "Light rain"
 msgstr "ёagodny deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:101
 msgid "Moderate rain"
 msgstr "Umiarkowany deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:101
 msgid "Heavy rain"
 msgstr "Obfity deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:101
 msgid "Shallow rain"
 msgstr "SЁaby deszcz"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:101
 msgid "Patches of rain"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:101
 msgid "Partial rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:101
 msgid "Blowing rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:101
 msgid "Rain showers"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:101
 msgid "Drifting rain"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:101
 msgid "Freezing rain"
 msgstr ""
 
 #. SNOW
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:102
 msgid "Snow"
 msgstr "╕nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:102
 msgid "Snow in the vicinity"
 msgstr "Nadchodz╠cy ╤nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:102
 msgid "Light snow"
 msgstr "ёagodny ╤nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:102
 msgid "Moderate snow"
 msgstr "Umiarkowany ╤nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:102
 msgid "Heavy snow"
 msgstr "Obfity ╤nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:102
 msgid "Shallow snow"
 msgstr "SЁaby ╤nieg"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:102
 msgid "Patches of snow"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:102
 msgid "Partial snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:1 my-evolution/metar.c:1
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
 msgid "Snowstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:102
 msgid "Blowing snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:102
 msgid "Snow showers"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:102
 msgid "Drifting snow"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:102
 msgid "Freezing snow"
 msgstr ""
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Snow grains in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Light snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Moderate snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Heavy snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Shallow snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Patches of snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Partial snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Blowing snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Snow grain showers"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Drifting snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:103
 msgid "Freezing snow grains"
 msgstr ""
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Ice crystals in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Few ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Moderate ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Heavy ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Patches of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Partial ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Ice crystal storm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Blowing ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Showers of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Drifting ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:104
 msgid "Freezing ice crystals"
 msgstr ""
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Ice pellets in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Few ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Moderate ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Heavy ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Shallow ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Patches of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Partial ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Ice pellet storm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Blowing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Showers of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Drifting ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:105
 msgid "Freezing ice pellets"
 msgstr ""
 
 #. HAIL
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:106
 msgid "Hail"
 msgstr "Grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:106
 msgid "Hail in the vicinity"
 msgstr "Nadchodz╠cy grad"
 
-#: my-evolution/metar.c:1 my-evolution/metar.c:1
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
 msgid "Light hail"
 msgstr "ёagodny grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:106
 msgid "Moderate hail"
 msgstr "Umiarkowany grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:106
 msgid "Heavy hail"
 msgstr "Obfity grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:106
 msgid "Shallow hail"
 msgstr "SЁaby grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:106
 msgid "Patches of hail"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:106
 msgid "Partial hail"
 msgstr "CzЙ╤ciowy grad"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:106
 msgid "Hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:106
 msgid "Blowing hail"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:106
 msgid "Hail showers"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:106
 msgid "Drifting hail"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:106
 msgid "Freezing hail"
 msgstr ""
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:107
 msgid "Small hail"
 msgstr "Gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:107
 msgid "Small hail in the vicinity"
 msgstr "Nadchodz╠cy gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:107
 msgid "Moderate small hail"
 msgstr "Umiarkowany gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:107
 msgid "Heavy small hail"
 msgstr "Obfity gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:107
 msgid "Shallow small hail"
 msgstr "SЁaby gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:107
 msgid "Patches of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:107
 msgid "Partial small hail"
 msgstr "CzЙ╤ciowy gradzik"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:107
 msgid "Small hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:107
 msgid "Blowing small hail"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:107
 msgid "Showers of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:107
 msgid "Drifting small hail"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:107
 msgid "Freezing small hail"
 msgstr ""
 
 #. PRECIPITATION
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:108
 msgid "Unknown precipitation"
 msgstr "Nieznane opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:108
 msgid "Precipitation in the vicinity"
 msgstr "Nadchodz╠ce opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:108
 msgid "Light precipitation"
 msgstr "ёagodne opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:108
 msgid "Moderate precipitation"
 msgstr "Umiarkowane opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:108
 msgid "Heavy precipitation"
 msgstr "Obfite opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:108
 msgid "Shallow precipitation"
 msgstr "SЁabe opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:108
 msgid "Patches of precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:108
 msgid "Partial precipitation"
 msgstr "CzЙ╤ciowe opady"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:108
 msgid "Unknown thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:108
 msgid "Blowing precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:108
 msgid "Showers, type unknown"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:108
 msgid "Drifting precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:108
 msgid "Freezing precipitation"
 msgstr ""
 
 #. MIST
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:109
 msgid "Mist"
 msgstr "MgieЁka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:109
 msgid "Mist in the vicinity"
 msgstr "Nadchodz╠ca mgieЁka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:109
 msgid "Light mist"
 msgstr "ёagodna mgieЁka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:109
 msgid "Moderate mist"
 msgstr "Umiarkowana mgieЁka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:109
 msgid "Thick mist"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:109
 msgid "Shallow mist"
 msgstr "SЁaba mgieЁka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:109
 msgid "Patches of mist"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:109
 msgid "Partial mist"
 msgstr "CzЙ╤ciowa mgieЁka"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:109
 msgid "Mist with wind"
 msgstr "MgieЁka z wiatrem"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:109
 msgid "Drifting mist"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:109
 msgid "Freezing mist"
 msgstr ""
 
 #. FOG
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:110
 msgid "Fog"
 msgstr "MgЁa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:110
 msgid "Fog in the vicinity"
 msgstr "Nadchodz╠ca mgЁa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:110
 msgid "Light fog"
 msgstr "ёagodna mgЁa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:110
 msgid "Moderate fog"
 msgstr "Umiarkowana mgЁa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:110
 msgid "Thick fog"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:110
 msgid "Shallow fog"
 msgstr "SЁaba mgЁa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:110
 msgid "Patches of fog"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:110
 msgid "Partial fog"
 msgstr "CzЙ╤ciowa mgЁa"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:110
 msgid "Fog with wind"
 msgstr "MgЁa z wiatrem"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:110
 msgid "Drifting fog"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:110
 msgid "Freezing fog"
 msgstr ""
 
 #. SMOKE
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:111
 msgid "Smoke"
 msgstr "Dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:111
 msgid "Smoke in the vicinity"
 msgstr "Nadchodz╠cy dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:111
 msgid "Thin smoke"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:111
 msgid "Moderate smoke"
 msgstr "Umiarkowany dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:111
 msgid "Thick smoke"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:111
 msgid "Shallow smoke"
 msgstr "SЁaby dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:111
 msgid "Patches of smoke"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:111
 msgid "Partial smoke"
 msgstr "CzЙ╤ciowy dym"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:111
 msgid "Smoke w/ thunders"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:111
 msgid "Smoke with wind"
 msgstr "Dym z wiatrem"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:111
 msgid "Drifting smoke"
 msgstr ""
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Volcanic ash in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Moderate volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Thick volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Shallow volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Patches of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Partial volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Volcanic ash w/ thunders"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Blowing volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Showers of volcanic ash "
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Drifting volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:112
 msgid "Freezing volcanic ash"
 msgstr ""
 
 #. SAND
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:113
 msgid "Sand"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:113
 msgid "Sand in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:113
 msgid "Light sand"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:113
 msgid "Moderate sand"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:113
 msgid "Heavy sand"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:113
 msgid "Patches of sand"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:113
 msgid "Partial sand"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:113
 msgid "Blowing sand"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:113
 msgid "Drifting sand"
 msgstr ""
 
 #. HAZE
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Haze"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Haze in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Light haze"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Moderate haze"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Thick haze"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Shallow haze"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Patches of haze"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Partial haze"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Haze with wind"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Drifting haze"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:114
 msgid "Freezing haze"
 msgstr ""
 
 #. SPRAY
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Sprays"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Sprays in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Light sprays"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Moderate sprays"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Heavy sprays"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Shallow sprays"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Patches of sprays"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Partial sprays"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Blowing sprays"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Drifting sprays"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:115
 msgid "Freezing sprays"
 msgstr ""
 
 #. DUST
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:116
 msgid "Dust"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:116
 msgid "Dust in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:116
 msgid "Light dust"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:116
 msgid "Moderate dust"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:116
 msgid "Heavy dust"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:116
 msgid "Patches of dust"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:116
 msgid "Partial dust"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:116
 msgid "Blowing dust"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:116
 msgid "Drifting dust"
 msgstr ""
 
 #. SQUALL
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:117
 msgid "Squall"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:117
 msgid "Squall in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:117
 msgid "Light squall"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:117
 msgid "Moderate squall"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:117
 msgid "Heavy squall"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:117
 msgid "Partial squall"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:117
 msgid "Thunderous squall"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:117
 msgid "Blowing squall"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:117
 msgid "Drifting squall"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:117
 msgid "Freezing squall"
 msgstr ""
 
 #. SANDSTORM
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Sandstorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Light standstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Moderate sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Heavy sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Shallow sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Partial sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Thunderous sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Blowing sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Drifting sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:118
 msgid "Freezing sandstorm"
 msgstr ""
 
 #. DUSTSTORM
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Duststorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Light duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Moderate duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Heavy duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Shallow duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Partial duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Thunderous duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Blowing duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Drifting duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:119
 msgid "Freezing duststorm"
 msgstr ""
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:120
 msgid "Funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:120
 msgid "Funnel cloud in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:120
 msgid "Light funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:120
 msgid "Moderate funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:120
 msgid "Thick funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:120
 msgid "Shallow funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:120
 msgid "Patches of funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:120
 msgid "Partial funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:120
 msgid "Funnel cloud w/ wind"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:120
 msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:121
 msgid "Tornado"
 msgstr "Tornado"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:121
 msgid "Tornado in the vicinity"
 msgstr "Nadchodz╠ce tornado"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:121
 msgid "Moderate tornado"
 msgstr "Umiarkowane tornado"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:121
 msgid "Raging tornado"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:121
 msgid "Partial tornado"
 msgstr "CzЙ╤ciowe tornado"
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:121
 msgid "Thunderous tornado"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:121
 msgid "Drifting tornado"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:121
 msgid "Freezing tornado"
 msgstr ""
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:122
 msgid "Dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:122
 msgid "Dust whirls in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:122
 msgid "Light dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:122
 msgid "Moderate dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:122
 msgid "Heavy dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:122
 msgid "Shallow dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:122
 msgid "Patches of dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:122
 msgid "Partial dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:122
 msgid "Blowing dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:1
+#: my-evolution/metar.c:122
 msgid "Drifting dust whirls"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:1
-msgid "Add ->"
-msgstr "Dodaj ->"
-
-#: my-evolution/my-evolution.glade.h:1
 msgid "Add new feed"
 msgstr "Dodaj ╪rСdЁo"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:2
 msgid "All folders:"
 msgstr "Wszystkie foldery:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:3
 msgid "All news feeds:"
 msgstr "Wszystkie ╪rСdЁa nowo╤ci:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:4
 msgid "All stations:"
 msgstr "Wszystkie stacje:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:6
 msgid "Display folders:"
 msgstr "Wy╤wietlane foldery"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:7
 msgid "Display stations:"
 msgstr "Wy╤wietlane stacje:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:8
 msgid "Displayed feeds:"
 msgstr "Wy╤wietlane ╪rСdЁa:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:9
 msgid "Five days"
 msgstr "PiЙФ dni"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:10
 msgid "How many days should the calendar display at once?"
 msgstr "Liczba dni wy╤wietlanych jednocze╤nie w kalendarzu"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:12
 msgid "Max number of items shown:"
 msgstr "Maksymalna liczba wy╤wietlanych elementСw:"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:13
 msgid "News Feed Settings"
 msgstr "Ustawienia ╪rСdeЁ nowinek"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:14
 msgid "News Feeds"
 msgstr "╛rСdЁa nowo╤ci"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:15
 msgid "One day"
 msgstr "Jeden dzieЯ"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:16
 msgid "One month"
 msgstr "Jeden miesi╠c"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:17
 msgid "One week"
 msgstr "Jeden tydzieЯ"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:18
 msgid "Refresh time (seconds):"
 msgstr "Okres od╤wie©ania (sekundy):"
 
-#: my-evolution/my-evolution.glade.h:1
-msgid "Remove <-"
-msgstr "UsuЯ <-"
-
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:19
 msgid "Schedule"
 msgstr "Planowanie"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:20
 msgid "Show all tasks"
 msgstr "Wy╤wietlanie wszystkich zadaЯ"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:21
 msgid "Show full path for folders"
 msgstr "Wy╤wietlanie peЁnych ╤cie©ek folderСw"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:22
 msgid "Show today's tasks"
 msgstr "Wy╤wietlanie dzisiejszych zadaЯ"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:23
 msgid "Tasks "
 msgstr "Zadania "
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:24
 msgid "Units: "
 msgstr "Jednostki: "
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:25
 msgid "Weather"
 msgstr "Pogoda"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:26
 msgid "Weather settings"
 msgstr "Ustawienia pogody"
 
-#: my-evolution/my-evolution.glade.h:1
-msgid "Wipe trackers"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:27
 msgid "imperial"
 msgstr "imperialne"
 
-#: my-evolution/my-evolution.glade.h:1
+#: my-evolution/my-evolution.glade.h:28
 msgid "metric"
 msgstr "metryczne"
 
@@ -8974,19 +9173,24 @@ msgstr "metryczne"
 msgid "The Evolution shell."
 msgstr "PowЁoka Evolution."
 
-#: shell/e-activity-handler.c:1
+#: shell/e-activity-handler.c:198
 msgid "Show Details"
 msgstr "Wy╤wietl szczegСЁy"
 
-#: shell/e-activity-handler.c:1
+#: shell/e-activity-handler.c:200
 msgid "Cancel Operation"
 msgstr "Anuluj operacjЙ"
 
-#: shell/e-setup.c:1 shell/e-setup.c:1
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Foldery specjalne"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Instalacja Evolution"
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -8994,23 +9198,23 @@ msgstr ""
 "Uruchomiona wЁa╤nie nowa wersja Evolution wymaga zainstalowania\n"
 "dodatkowych plikСw w osobistym katalogu Evolution"
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "Kliknij \"OK\" aby zainstalowaФ pliki lub \"Anuluj\" aby zakoЯczyФ."
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "Nie mo©na poprawnie uaktualniФ plikСw"
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Wygl╠da na to, ©e Evolution zostaЁo uruchomione po raz pierwszy."
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "Kliknij \"OK\", aby zainstalowaФ pliki u©ytkownika Evolution w"
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -9021,7 +9225,7 @@ msgstr ""
 "%s\n"
 "BЁ╠d: %s"
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:235
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -9030,7 +9234,7 @@ msgstr ""
 "Wyst╠piЁ bЁ╠d przy kopiowaniu plikСw do\n"
 "\"%s\"."
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -9041,7 +9245,7 @@ msgstr ""
 "Przenie╤ go w inne miejsce, aby umo©liwiФ\n"
 "instalacjЙ plikСw u©ytkownika Evolution."
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:322
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -9054,7 +9258,7 @@ msgstr ""
 "jego usuniЙcie.\n"
 "Czy chcesz usun╠Ф ten katalog?"
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -9065,52 +9269,52 @@ msgstr ""
 "Evolution. Przenie╤ go w inne miejsce, aby umo©liwiФ\n"
 "instalacjЙ plikСw u©ytkownika Evolution."
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:160
 msgid "Cannot move a folder over itself."
 msgstr "Nie mo©na przenie╤Ф folderu do niego samego."
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:162
 msgid "Cannot copy a folder over itself."
 msgstr "Nie mo©na skopiowaФ folderu do niego samego."
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Nie mo©na skopiowaФ folderu do jego folderu podrzЙdnego."
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:270
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Wybierz folder, do ktСrego chcesz skopiowaФ \"%s\":"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:275
 msgid "Copy folder"
 msgstr "Kopiowanie folderu"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:313
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Wybierz folder, do ktСrego chcesz przenie╤Ф \"%s\":"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:318
 msgid "Move folder"
 msgstr "Przeniesienie folderu"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:354
 #, c-format
 msgid "Delete folder '%s'"
 msgstr "UsuniЙcie folderu \"%s\""
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:363
 #, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "Czy na pewno chcesz usun╠Ф folder \"%s\"?"
 
-#: shell/e-shell-folder-commands.c:1
+#: shell/e-shell-folder-commands.c:422
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "Zmiana nazwy folderu \"%s\""
 
-#: shell/e-shell-folder-creation-dialog.c:1
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -9119,15 +9323,15 @@ msgstr ""
 "Nie mo©na stworzyФ podanego folderu:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:1
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "Podana nazwa folderu nie jest poprawna."
 
-#: shell/e-shell-folder-creation-dialog.c:1
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - tworzenie nowego folderu"
 
-#: shell/e-shell-folder-selection-dialog.c:1
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -9135,15 +9339,15 @@ msgstr ""
 "Typ wybranego folderu nie jest poprawny w odniesieniu\n"
 "do ©╠danej operacji."
 
-#: shell/e-shell-folder-selection-dialog.c:1
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Nowy..."
 
-#: shell/e-shell-folder-title-bar.c:1 shell/e-shell-folder-title-bar.c:1
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Bez nazwy)"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:97
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -9154,7 +9358,7 @@ msgstr ""
 
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:192
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -9165,7 +9369,7 @@ msgstr ""
 "Importer nie jest gotowy.\n"
 "Oczekiwanie przez 5 sekund przed ponowieniem."
 
-#: shell/e-shell-importer.c:1 shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -9174,18 +9378,18 @@ msgstr ""
 "Importowanie %s\n"
 "Importowanie %d. elementu."
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:352
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:362
 msgid "Importing"
 msgstr "Importowanie"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:370
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -9194,17 +9398,17 @@ msgstr ""
 "Importowanie %s.\n"
 "Rozpoczynanie %s"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:383
 #, c-format
 msgid "Error starting %s"
 msgstr "BЁ╠d przy uruchamianiu %s"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:402
 #, c-format
 msgid "Error loading %s"
 msgstr "BЁ╠d odczycie %s"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:417
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -9213,47 +9417,47 @@ msgstr ""
 "Importowanie %s\n"
 "Importowanie 1. elementu."
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:488
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:538
 msgid "Filename:"
 msgstr "Nazwa pliku:"
 
-#: shell/e-shell-importer.c:1 shell/importer/import.glade.h:1
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
 msgid "Select a file"
 msgstr "WybСr pliku"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:553
 msgid "File type:"
 msgstr "Typ pliku:"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:599
 msgid "Select folder"
 msgstr "WybСr folderu"
 
-#: shell/e-shell-importer.c:1
+#: shell/e-shell-importer.c:600
 msgid "Select a destination folder for importing this data"
 msgstr "Wybierz folder, do ktСrego powinny zostaФ zaimportowane te dane"
 
-#: shell/e-shell-offline-handler.c:1
+#: shell/e-shell-offline-handler.c:554
 msgid "Closing connections..."
 msgstr "Zamykanie poЁ╠czeЯ..."
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy nie znajduje siЙ w ╤cie©ce."
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Nie mo©na uruchomiФ Bug buddy."
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -9269,71 +9473,73 @@ msgstr ""
 "prosimy wysyЁaФ na adres:\n"
 "translators@gnome.pl"
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Przej╤cie do innego folderu..."
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:438
 msgid "Select the folder that you want to open"
 msgstr "Wybierz folder, ktСry chcesz otworzyФ"
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:583
 msgid "Create a new shortcut"
 msgstr "Tworzy nowy skrСt"
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:584
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Wybierz folder, na ktСry ma wskazywaФ skrСt:"
 
-#: shell/e-shell-view-menu.c:1
-msgid "Work online"
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
 msgstr "Praca z podЁ╠czeniem"
 
-#: shell/e-shell-view-menu.c:1 shell/e-shell-view-menu.c:1
-msgid "Work offline"
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
 msgstr "Praca bez podЁ╠czenia"
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr "(Nie wy╤wietlono folderu)"
 
 #. Special case for My Evolution
-#: shell/e-shell-view.c:1 shell/e-storage-set-view.c:1
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
 msgid "My Evolution"
 msgstr "Moje Evolution"
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:1411
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:1413
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:1451
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution dziaЁa obecnie w trybie z podЁ╠czeniem do sieci. Aby przej╤Ф w "
 "tryb bez podЁ╠czenia, kliknij ten przycisk."
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:1458
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution przechodzi obecnie w tryb bez podЁ╠czenia do sieci."
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:1464
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Evolution dziaЁa obecnie w trybie bez podЁ╠czenia do sieci. Aby przej╤Ф w "
 "tryb z podЁ╠czeniem, kliknij ten przycisk."
 
-#: shell/e-shell.c:1
+#: shell/e-shell.c:446
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nie mo©na ustawiФ lokalnego pojemnika -- %s"
 
-#: shell/e-shell.c:1
+#: shell/e-shell.c:1311
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -9342,15 +9548,15 @@ msgstr ""
 "Widok \"%s\" nieoczekiwanie zakoЯczyЁ dziaЁanie. :-(\n"
 "Prawdopodobnie oznacza to bЁ╠d komponentu %s."
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Tworzenie nowej grupy skrСtСw"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Nazwa grupy:"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -9359,165 +9565,168 @@ msgstr ""
 "Czy na pewno chcesz usun╠Ф z paska skrСtСw\n"
 "grupЙ \"%s\"?"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "Nie usuwaj"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:300
 msgid "Rename Shortcut Group"
 msgstr "Zmiana nazwy grupy skrСtСw"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:301
 msgid "Rename selected shortcut group to:"
 msgstr "ZmieЯ nazwЙ wybranej grupy skrСtСw na:"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "_MaЁe ikony"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Wy╤wietla skrСty jako maЁe ikony"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "_Du©e ikony"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Wy╤wietla skrСty jako du©e ikony"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_Nowa grupa..."
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Tworzy now╠ grupЙ skrСtСw"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:332
 msgid "_Remove this Group..."
 msgstr "_UsuЯ grupЙ..."
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Usuwa tЙ grupЙ skrСtСw"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:335
 msgid "Re_name this Group..."
 msgstr "_ZmieЯ nazwЙ grupy..."
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:336
 msgid "Rename this shortcut group"
 msgstr "Zmienia nazwЙ grupy skrСtСw"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "_Ukryj pasek skrСtСw"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Ukrywa pasek skrСtСw"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:461
 msgid "Rename shortcut"
 msgstr "Zmiana nazwy skrСtu"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:462
 msgid "Rename selected shortcut to:"
 msgstr "ZmieЯ nazwЙ wybranego skrСtu na:"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "OtwСrz"
+
+#: shell/e-shortcuts-view.c:474
 msgid "Open the folder linked to this shortcut"
 msgstr "Otwiera folder powi╠zany ze skrСtem"
 
-#: shell/e-shortcuts-view.c:1 ui/evolution.xml.h:1
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "OtwСrz w nowym oknie"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:476
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Otwiera w nowym oknie folder powi╠zany ze skrСtem"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:479
 msgid "Rename"
 msgstr "ZmieЯ nazwЙ"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:479
 msgid "Rename this shortcut"
 msgstr "Zmienia nazwЙ skrСtu"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Usuwa skrСt z paska skrСtСw"
 
-#: shell/e-shortcuts.c:1
+#: shell/e-shortcuts.c:585
 msgid "Error saving shortcuts."
 msgstr "BЁ╠d przy zapisywaniu skrСtСw."
 
-#: shell/e-shortcuts.c:1
+#: shell/e-shortcuts.c:982
 msgid "Shortcuts"
 msgstr "SkrСty"
 
-#: shell/e-shortcuts.c:1
+#: shell/e-shortcuts.c:984
 msgid "Inbox"
 msgstr "NadesЁane"
 
-#: shell/e-shortcuts.c:1
+#: shell/e-shortcuts.c:987
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Bez nazwy)"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "bez bЁЙdu"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "Folder o tej nazwie ju© istnieje"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "Podany typ folderu nie jest poprawny"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "BЁ╠d We/Wy"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "Brak miejsca na stworzenie folderu"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "Nie odnaleziono okre╤lonego folderu"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "NieobsЁugiwana operacja"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-task-widget.c:1
+#: shell/e-task-widget.c:168
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:1
-#, c-format
+#: shell/e-task-widget.c:173
 msgid "%s (%d%% complete)"
 msgstr "%s (zakoЯczono %d%)"
 
@@ -9525,17 +9734,17 @@ msgstr "%s (zakoЯczono %d%)"
 msgid "Active connections"
 msgstr "Aktywne poЁ╠czenia"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 "Kliknij OK, aby zamkn╠Ф powy©sze poЁ╠czenia i przej╤Ф w tryb bez podЁ╠czenia "
 "do sieci"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/glade/e-active-connection-dialog.glade.h:3
 msgid "Host"
 msgstr "Komputer"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/glade/e-active-connection-dialog.glade.h:4
 msgid "The following connections are currently active:"
 msgstr "Obecnie aktywne s╠ nastЙpuj╠ce poЁ╠czenia:"
 
@@ -9543,11 +9752,11 @@ msgstr "Obecnie aktywne s╠ nastЙpuj╠ce poЁ╠czenia:"
 msgid "Folder name:"
 msgstr "Nazwa folderu:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "Typ folderu:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Specify where to create the folder:"
 msgstr "Okre╤l miejsce stworzenia folderu:"
 
@@ -9555,38 +9764,38 @@ msgstr "Okre╤l miejsce stworzenia folderu:"
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Kliknij \"Zaimportuj\" aby rozpocz╠Ф import pliku do Evolution. "
 
-#: shell/importer/import.glade.h:1
+#: shell/importer/import.glade.h:2
 msgid "Evolution Import Utility"
 msgstr "Evolution - narzЙdzie importuj╠ce"
 
-#: shell/importer/import.glade.h:1
+#: shell/importer/import.glade.h:3
 msgid "Evolution Importer Utility"
 msgstr "Evolution - narzЙdzie importuj╠ce"
 
-#: shell/importer/import.glade.h:1
+#: shell/importer/import.glade.h:6
 msgid ""
 "Welcome to the Evolution Import Utility.\n"
 "With this wizard you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:1
+#: shell/importer/intelligent.c:191
 msgid "Importers"
 msgstr "Importery"
 
-#: shell/importer/intelligent.c:1
+#: shell/importer/intelligent.c:197
 msgid "Don't import"
 msgstr "Nie importuj"
 
-#: shell/importer/intelligent.c:1
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "Nie pytaj o to ponownie"
 
-#: shell/importer/intelligent.c:1
+#: shell/importer/intelligent.c:209
 msgid "Evolution has found the following data sources:"
 msgstr "Odnaleziono nastЙpuj╠ce ╪rСdЁa danych:"
 
-#: shell/main.c:1
+#: shell/main.c:96
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -9615,7 +9824,7 @@ msgstr ""
 "Mamy nadziejЙ, ©e Evolution bЙdzie dla Ciebie przydatn╠ aplikacj╠\n"
 "i niecierpliwie oczekujemy Twoich komentarzy oraz pomocy!\n"
 
-#: shell/main.c:1
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -9623,417 +9832,365 @@ msgstr ""
 "DziЙkujemy\n"
 "ZespСЁ twСrcСw Evolution\n"
 
-#: shell/main.c:1
+#: shell/main.c:155
 msgid "Cannot access the Evolution shell."
 msgstr "Nie mo©na uzyskaФ dostЙpu do powЁoki Evolution."
 
-#: shell/main.c:1
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "Ukrywa okno powitalne"
 
-#: shell/main.c:1
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 "Zapisuje do pliku informacje dotycz╠ce przebiegu wykonania komponentСw."
 
-#: shell/main.c:1
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nie mo©na zainicjowaФ systemu komponentСw Bonobo."
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
-msgid "C_ut"
-msgstr "_Wytnij"
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Skopiuj"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
 msgstr "Kopiuje zaznaczenie"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "Tworzy nowy kontakt"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:5
 msgid "Create new contact list"
 msgstr "Tworzy now╠ listЙ kontaktСw"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Wytnij"
+
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
 msgid "Cut the selection"
 msgstr "Wycina zaznaczenie"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Usuwa zaznaczone kontakty"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Nowy Kontakt"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:11
 msgid "New list"
 msgstr "Nowa lista"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Wklej"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Wkleja zawarto╤Ф schowka"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:14
 msgid "Previews the contacts to be printed"
 msgstr "Wy╤wietla podgl╠d kontaktСw w postaci przygotowanej do druku"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:17
 msgid "Print selected contacts"
 msgstr "Drukuje zaznaczone kontakty"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:18
 msgid "Select All"
 msgstr "Zaznacz wszystkie"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:19
 msgid "Select all contacts"
 msgstr "Zaznacza wszystkie kontakty"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Zatrzymuje wczytywanie"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "╛rСdЁa ksi╠©ki adresowej..."
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:24
 msgid "_Contact Group"
 msgstr "Grupa _kontaktСw"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
-msgid "_Copy"
-msgstr "S_kopiuj"
-
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
-msgid "_Paste"
-msgstr "Wk_lej"
-
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/my-evolution.xml.h:1
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "Wy_drukuj..."
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "_Szukaj kontaktСw"
 
-#: ui/evolution-addressbook.xml.h:1
+#: ui/evolution-addressbook.xml.h:29
 msgid "_Select All"
 msgstr "Zaznacz _wszystko"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-mail-messagedisplay.xml.h:1 ui/evolution.xml.h:1
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_NarzЙdzia"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 dni"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "Alter preferences"
-msgstr "Pozwala na zmianЙ ustawieЯ"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:1
-msgid "Create a new all day Event"
+#: ui/evolution-calendar.xml.h:4
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "Tworzy nowe zdarzenie caЁodniowe"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "Create a new appointment"
+#: ui/evolution-calendar.xml.h:5
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Tworzy nowy termin"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "Create a new calendar"
-msgstr "Tworzy nowy termianrz"
+#: ui/evolution-calendar.xml.h:6
+msgid "Create a new appointment"
+msgstr "Tworzy nowy termin"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "Day"
-msgstr "DzieЯ"
+#: ui/evolution-calendar.xml.h:7
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Przejd╪ do"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Przemieszcza w czasie wstecz"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Przemieszcza w czasie naprzСd"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "Przejd╪ do _daty"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "Go to _Today"
-msgstr "Przejd╪ do d_zisiaj"
-
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Przechodzi do podanej daty"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Przemieszcza do bie©╠cego czasu"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "Month"
-msgstr "Miesi╠c"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "New _Event"
-msgstr "Nowe _zdarzenie"
-
-#: ui/evolution-calendar.xml.h:1 ui/evolution-mail-message.xml.h:1
-msgid "Next"
-msgstr "NastЙpny"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "Open Calendar"
-msgstr "OtwСrz kalendarz"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "Prev"
-msgstr "Poprzedni"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Nowy termin"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Wy╤wietla podgl╠d kalendarza w postaci przygotowanej do druku"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Wydrukuj kalendarz"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Drukuje zawarto╤Ф kalendarza"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:22
 #, fuzzy
 msgid "Publish Free/Busy Information"
 msgstr "Wymagane informacje"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:23
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:1 ui/evolution-message-composer.xml.h:1
-msgid "Save As"
-msgstr "Zapisz jako"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "Save calendar as something else"
-msgstr "Zapisuje kalendarz w innej formie"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "Settings..."
-msgstr "Ustawienia..."
-
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Wy╤wietla jeden dzieЯ"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Wy╤wietla jeden miesi╠c"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Wy╤wietla jeden tydzieЯ"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Wy╤wietla tydzieЯ roboczy"
 
-#: ui/evolution-calendar.xml.h:1 widgets/misc/e-cell-date-edit.c:1
-#: widgets/misc/e-dateedit.c:1
-msgid "Today"
-msgstr "Dzi╤"
-
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "TydzieЯ _roboczy"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "Week"
-msgstr "TydzieЯ"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "_Terminy"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "_Ustawienia poczty..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "_DzieЯ"
 
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "_Miesi╠c"
 
-#: ui/evolution-calendar.xml.h:1 ui/evolution.xml.h:1
-msgid "_New"
-msgstr "_Nowy"
-
-#: ui/evolution-calendar.xml.h:1
-msgid "_Open Calendar"
-msgstr "_OtwСrz kalendarz"
-
-#: ui/evolution-calendar.xml.h:1
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "_TydzieЯ"
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:1 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Zamknij"
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:3
 msgid "Close this appointment"
 msgstr "Zamyka termin"
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:5
 msgid "Delete this appointment"
 msgstr "Usuwa termin"
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution.xml.h:1
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
 msgid "Main toolbar"
 msgstr "GЁСwny pasek narzЙdziowy"
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:7
 msgid "Preview the printed item"
 msgstr "Wy╤wietla podgl╠d elementu w postaci przygotowanej do druku"
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
 msgid "Print Pre_view"
 msgstr "Podgl╠d wy_druku"
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:11
 msgid "Print S_etup"
 msgstr "U_stawienia wydruku"
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr "Drukuje bie©╠cy element"
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
 msgid "Print..."
 msgstr "Wydrukuj..."
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
 msgid "Save and Close"
 msgstr "Zapisz i zamknij"
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:16
 msgid "Save the appointment and close the dialog box"
 msgstr "Zapisuje termin i zamyka okno"
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:17
 msgid "Save this item to disk"
 msgstr "Zapisuje bie©╠cy element na dysku"
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:18
 msgid "Setup the page settings for your current printer"
 msgstr "Ustala ustawienia strony bie©╠cej drukarki"
 
-#: ui/evolution-comp-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:19
 msgid "_Action"
 msgstr "_Czynno╤Ф"
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1 ui/evolution-subscribe.xml.h:1
-#: ui/evolution.xml.h:1
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
 msgid "_File"
 msgstr "_Plik"
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:1
-msgid "_Help"
-msgstr "Pomo_c"
-
-#: ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Usuwa bie©╠cy element"
 
-#: ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "UsuЯ..."
 
-#: ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-editor.xml.h:4
 msgid "Help"
 msgstr "Pomoc"
 
-#: ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "Wydrukuj _kopertЙ..."
 
-#: ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Zapisz j_ako..."
 
-#: ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Zapisuje kontakt i zamyka okno dialogowe"
 
-#: ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-editor.xml.h:11
 msgid "Se_nd contact to other..."
 msgstr "_Wy╤lij kontakt do innej osoby..."
 
-#: ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-editor.xml.h:12
 msgid "See online help"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-editor.xml.h:13
 msgid "Send _message to contact..."
 msgstr "Wy╤lij _list do kontaktu..."
 
-#: ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-message-composer.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Zapisz"
 
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:2
 msgid "Delete this list"
 msgstr "Usuwa tЙ listЙ"
 
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:6
 msgid "Save the list and close the dialog box"
 msgstr "Zapisuje listЙ i zamyka okno dialogowe"
 
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:7
 msgid "Se_nd list to other..."
 msgstr "_Wy╤lij listЙ do innej osoby..."
 
-#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Send _message to list..."
 msgstr "Wy╤lij _list do listy..."
 
@@ -10041,36 +10198,36 @@ msgstr "Wy╤lij _list do listy..."
 msgid "Cancel Mee_ting"
 msgstr "Anuluj _spotkanie"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
 msgid "Cancel the meeting for this item"
 msgstr "Anuluje spotkanie zwi╠zane z tym elementem"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
 msgid "Forward as i_Calendar"
 msgstr "Prze╤lij jako i_Calendar"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
 msgid "Forward this item via email"
 msgstr "Prze╤lij ten element w li╤cie"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
 msgid "Obtain the latest meeting information"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:6
 msgid "Re_fresh Meeting"
 msgstr "_Od╤wie© spotkanie"
 
-#: ui/evolution-event-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:7
 msgid "Schedule _Meeting"
 msgstr "Zaplanuj _spotkanie"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor.xml.h:1
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
 msgid "Schedule a meeting for this item"
 msgstr "Zaplanuj spotkanie zwi╠zane z tym elementem"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-task-editor.xml.h:1 ui/evolution.xml.h:1
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Actions"
 msgstr "C_zynno╤ci"
 
@@ -10082,88 +10239,93 @@ msgstr "Dopasuj Moje Evolution"
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Anuluje bie©╠c╠ operacjЙ na listach"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:3
 msgid "Compose"
 msgstr "Nowy list"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Tworzenie listu"
+
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 "Pozwala na stworzenie i modyfikacjЙ kont pocztowych oraz innych ustawieЯ"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
 msgstr "Pozwala na stworzenie lub modyfikacjЙ reguЁ filtrowania listСw"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:7
 msgid "Create or edit virtual folder definitions"
 msgstr "Pozwala na stworzenie lub modyfikacjЙ definicji wirtualnych folderСw"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
 msgstr "OprС©nij ╤mie_tnik"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget _Passwords"
 msgstr "Zapomnij _hasЁa"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:10
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Zapomina zapamiЙtane hasЁa, co spowoduje ponowne pytanie o nie"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:11
 msgid "Manage _Subscriptions..."
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:12
 msgid "Open a window for composing a mail message"
 msgstr "Otwiera okno umo©liwiaj╠ce napisanie nowego listu"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:13
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Trwale usuwa listy oznaczone do usuniЙcia ze wszystkich folderСw"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send / Receive"
 msgstr "Wy╤lij / Odbierz"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:15
 msgid "Send queued mail and retrieve new mail"
 msgstr "WysyЁa listy w kolejce i pobiera nowe"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "Wy╤wietla podgl╠d listu w wydzielonej czЙ╤ci okna"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:17
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:18
 msgid "Virtual Folder _Editor..."
 msgstr "_Edytor wirtualnych folderСw..."
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Filters..."
 msgstr "_Filtry..."
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:20
 msgid "_Mail Message"
 msgstr "_List"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:21
 msgid "_Mail Settings..."
 msgstr "_Ustawienia poczty..."
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:22
 msgid "_Preview Pane"
 msgstr "_Podgl╠d listu"
 
-#: ui/evolution-mail-global.xml.h:1
+#: ui/evolution-mail-global.xml.h:23
 msgid "_Send / Receive"
 msgstr "_Wy╤lij / Odbierz"
 
@@ -10171,106 +10333,107 @@ msgstr "_Wy╤lij / Odbierz"
 msgid "Change the properties of this folder"
 msgstr "Zmienia wЁa╤ciwo╤ci folderu"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:3
 msgid "Copy selected messages"
 msgstr "Kopiuje zaznaczone listy"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:5
 msgid "Cut selected messages"
 msgstr "Wycina zaznaczone listy do schowka"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide S_elected Messages"
 msgstr "Ukrycie _zaznaczonych listСw"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:7
 msgid "Hide _Deleted Messages"
 msgstr "Ukrycie _usuniЙtych listСw"
 
-#: ui/evolution-mail-list.xml.h:1
-msgid "Hide _Read messages"
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
 msgstr "Ukrywanie prz_eczytanych listСw"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:9
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 "Ukrywa listy oznaczone do usuniЙcia, zamiast wy╤wietlania ich z "
 "przekre╤leniem"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:10
 msgid "Mark All as R_ead"
 msgstr "Oznacz wszystkie jako przeczy_tane"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:11
 msgid "Mark all visible messages as read"
 msgstr "Oznacza wszystkie widoczne listy jako przeczytane"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:13
 msgid "Paste message in the clipboard"
 msgstr "Wkleja list ze schowka"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:14
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Trwale usuwa listy oznaczone do usuniЙcia z bie©╠cego folderu"
 
-#: ui/evolution-mail-list.xml.h:1 ui/evolution-subscribe.xml.h:1
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Zaznacz w_szystkie"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:16
 msgid "Select _Thread"
 msgstr "Zaznacz _w╠tek"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:17
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Zaznacza wszystkie listy (i tylko te), ktСre obecnie nie s╠ zaznaczone"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:18
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Zaznacza wszystkie listy w bie©╠cym w╠tku"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:19
 msgid "Select all visible messages"
 msgstr "Zaznacza wszystkie widoczne listy"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:20
 msgid "Show _All"
 msgstr "Wy╤wietl _wszystkie"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:21
 msgid "Show messages that have been temporarily hidden"
 msgstr "Wy╤wietla listy, ktСre byЁy czasowo ukryte"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:22
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Czasowo ukrywa listy, ktСre zostaЁy przeczytane"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:23
 msgid "Temporarily hide the selected messages"
 msgstr "Czasowo ukrywa zaznaczone listy"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:24
 msgid "Threaded Message list"
 msgstr "PrzeЁ╠cza grupowanie listСw w w╠tki"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:25
 msgid "_Expunge"
 msgstr "Wy_czy╤Ф"
 
-#: ui/evolution-mail-list.xml.h:1 ui/evolution.xml.h:1
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
 msgid "_Folder"
 msgstr "_Folder"
 
-#: ui/evolution-mail-list.xml.h:1 ui/evolution-subscribe.xml.h:1
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_OdwrСФ zaznaczenie"
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Properties..."
 msgstr "_WЁa╤ciwo╤ci..."
 
-#: ui/evolution-mail-list.xml.h:1
+#: ui/evolution-mail-list.xml.h:29
 msgid "_Threaded Message List"
 msgstr "Grupowanie listСw w w╠t_ki"
 
@@ -10278,337 +10441,380 @@ msgstr "Grupowanie listСw w w╠t_ki"
 msgid "Apply filter rules to the selected messages"
 msgstr "Zastosowuje reguЁy filtru w odniesieniu do zaznaczonych listСw"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:2
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Odpowiada wszystkim odbiorcom zaznaczonego listu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:3
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Odpowiada na listЙ dyskusyjn╠ zwi╠zan╠ z zaznaczonym listem"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:4
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Odpowiada nadawcy zaznaczonego listu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:6
 msgid "Copy selected messages to another folder"
 msgstr "Kopiuje zaznaczone listy do innego folderu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:7
 msgid "Create _Virtual Folder From Message"
 msgstr "StwСrz _wirtualny folder na podstawie listu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:8
 msgid "Create a rule to filter messages from this sender"
 msgstr "Tworzy reguЁЙ, filtruj╠c╠ listy od tego nadawcy"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:9
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Tworzy reguЁЙ, filtruj╠c╠ listy do tych odbiorcСw"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Tworzy reguЁЙ, filtruj╠c╠ listy z tej listy dyskusyjnej"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages with this subject"
 msgstr "Tworzy reguЁЙ, filtruj╠c╠ listy o tym temacie"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a virtual folder for these recipients"
 msgstr "Tworzy wirtualny folder dla tych odbiorcСw"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a virtual folder for this mailing list"
 msgstr "Tworzy wirtualny folder dla tej listy dyskusyjnej"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a virtual folder for this sender"
 msgstr "Tworzy wirtualny folder dla tego nadawcy"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for this subject"
 msgstr "Tworzy wirtualny folder dla tego tematu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:17
 msgid "Display the next important message"
 msgstr "Wy╤wietla kolejny wa©ny list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:18
 msgid "Display the next message"
 msgstr "Wy╤wietla kolejny list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:19
 msgid "Display the next unread message"
 msgstr "Wy╤wietla kolejny nieprzeczytany list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:20
 msgid "Display the next unread thread"
 msgstr "Wy╤wietla kolejny nieprzeczytany w╠tek"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the previous important message"
 msgstr "Wy╤wietla poprzedni wa©ny list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the previous message"
 msgstr "Wy╤wietla poprzedni list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the previous unread message"
 msgstr "Wy╤wietla poprzedni nieprzeczytany list"
 
-#: ui/evolution-mail-message.xml.h:1
-msgid "Filter on Mailing _List"
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "Filtr w oparciu o li_stЙ dyskusyjn╠"
 
-#: ui/evolution-mail-message.xml.h:1
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "Filtr w oparciu o n_adawcЙ"
 
-#: ui/evolution-mail-message.xml.h:1
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "Filtr w oparciu o o_dbiorcСw"
 
-#: ui/evolution-mail-message.xml.h:1
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "Filtr w oparciu o t_emat"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:28
 msgid "Force images in HTML mail to be loaded"
 msgstr "Wymusza pobranie obrazСw pojawiaj╠cych siЙ w HTML-u"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:29
 msgid "Forward"
 msgstr "Prze╤lij"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "Prze╤lij jako"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:31
 msgid "Forward _Attached"
 msgstr "Prze╤lij _zaЁ╠czony"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:32
 msgid "Forward _Inline"
 msgstr "Prze╤lij _wstawiony"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:33
 msgid "Forward _Quoted"
 msgstr "Prze╤lij z_acytowany"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:34
 msgid "Forward the selected message in the body of a new message"
 msgstr "PrzesyЁa zaznaczony list do innej osoby w tre╤ci nowego listu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:35
 msgid "Forward the selected message quoted like a reply"
 msgstr "PrzesyЁa zaznaczony list do innej osoby zacytowany jak przy odpowiedzi"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:36
 msgid "Forward the selected message to someone"
 msgstr "PrzesyЁa zaznaczony list do innej osoby"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message to someone as an attachment"
 msgstr "PrzesyЁa zaznaczony list do innej osoby w postaci zaЁ╠cznika"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:39
 msgid "Load _Images"
 msgstr "Pobierz _obrazy"
 
-#: ui/evolution-mail-message.xml.h:1
-msgid "Mar_k As Read"
-msgstr "Oznacz jako p_rzeczytane"
-
-#: ui/evolution-mail-message.xml.h:1
-msgid "Mark As I_mportant"
-msgstr "Oznacz jako wa©n_e"
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "Oznacz jako _wa©ny"
 
-#: ui/evolution-mail-message.xml.h:1
-msgid "Mark As U_nread"
-msgstr "Oznacz jako _nieprzeczytane"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
+msgstr "Oznacz jako _wa©ny"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "Oznacza zaznaczone listy jako przeczytane"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark the selected messages as important"
 msgstr "Oznacza zaznaczone listy jako wa©ne"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "Oznacza zaznaczone listy jako nieprzeczytane"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Oznacza zaznaczone listy jako wa©ne"
+
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages for deletion"
 msgstr "Oznacza zaznaczone listy do usuniЙcie"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Przenie╤"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "Przenosi zaznaczone listy do nowego folderu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "NastЙpny"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Wy╤wietla kolejny wa©ny list"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "List"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Zaznacz _w╠tek"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "(List bez nazwy)"
+
+#: ui/evolution-mail-message.xml.h:56
 msgid "Open the selected message in a new window"
 msgstr "Otwiera zaznaczony list w nowym oknie"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:57
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
 "Otwiera zaznaczony list w oknie redagowania umo©liwiaj╠c jego ponowne "
 "wysЁanie"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:58
 msgid "Previews the message to be printed"
 msgstr "Wy╤wietla podgl╠d listu w postaci przygotowanej do druku"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:59
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Wy╤wietla poprzedni wa©ny list"
+
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Wydruk listu"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Wy╤wietla poprzedni nieprzeczytany list"
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Print Message..."
 msgstr "Wydrukuj list..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:65
 msgid "Print Preview..."
 msgstr "Podgl╠d wydruku..."
 
-#: ui/evolution-mail-message.xml.h:1
-msgid "Print message to the printer"
-msgstr "Drukuje list na drukarce"
-
-#: ui/evolution-mail-message.xml.h:1
-msgid "Redirect (FIXME: implement me)"
-msgstr "Przekieruj (FIXME)"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "Wydruk listu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:68
 msgid "Reply to All"
 msgstr "Wszystkim"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:71
 msgid "S_earch Message"
 msgstr "_Przeszukaj list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:72
 msgid "Save the message as a text file"
 msgstr "Zapisuje list w pliku tekstowym"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:73
 msgid "Search for text in the body of the displayed message"
 msgstr "Wyszukuje tekst w tre╤ci wy╤wietlanego listu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "Wy╤wietlanie postaci ╪_rСdЁowej listu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:75
 msgid "Show Full _Headers"
 msgstr "Wy╤wietlanie wszystkich _nagЁСwkСw"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:76
 msgid "Show message in the normal style"
 msgstr "Wy╤wietla list w zwykЁy sposСb"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:77
 msgid "Show message with all email headers"
 msgstr "Wy╤wietla list wraz ze wszystkimi nagЁСwkami"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:78
 msgid "Show the raw email source of the message"
 msgstr "Wy╤wietla list w surowej, ╪rСdЁowej postaci"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "Cofa oznaczenie do usuniЙcia dla wszystkich zaznaczonych listСw"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:80
 msgid "VFolder on Mailing _List..."
 msgstr "VFolder w oparciu o _listЙ dyskusyjn╠..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:81
 msgid "VFolder on Se_nder..."
 msgstr "VFolder w oparciu o _nadawcЙ..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:82
 msgid "VFolder on _Recipients..."
 msgstr "VFolder w oparciu o _odbiorcСw..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:83
 msgid "VFolder on _Subject..."
 msgstr "VFolder w oparciu o _temat..."
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_Zastosuj filtry"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Copy to Folder"
 msgstr "S_kopiuj do folderu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "_StwСrz filtr na podstawie listu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:88
 msgid "_Forward Message"
 msgstr "_Prze╤lij list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:89
 msgid "_Message Display"
 msgstr "Wy╤wietlanie lis_tu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Move to Folder"
 msgstr "P_rzenie╤ do folderu"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Normal Display"
 msgstr "_ZwykЁe wy╤wietlanie"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Open Message"
 msgstr "_OtwСrz list"
 
-#: ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Re-send Message"
 msgstr "Wy╤lij list pono_wnie"
 
-#: ui/evolution-mail-messagedisplay.xml.h:1 ui/evolution.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Zamyka bie©╠ce okno"
 
-#: ui/evolution-mail-messagedisplay.xml.h:1 ui/evolution.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
 msgid "Customi_ze Toolbars..."
 msgstr "_Dopasuj paski narzЙdziowe..."
 
-#: ui/evolution-mail-messagedisplay.xml.h:1 ui/evolution.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
 msgid "Customize"
 msgstr "Dopasuj"
 
-#: ui/evolution-mail-messagedisplay.xml.h:1 ui/evolution.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
 msgid "Customize toolbars"
 msgstr "Pozwala na dopasowanie paskСw narzЙdziowych"
 
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1 ui/evolution-subscribe.xml.h:1
-#: ui/evolution.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
 msgid "_Close"
 msgstr "Zam_knij"
 
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:1 ui/evolution.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
 msgid "_View"
 msgstr "_Widok"
 
@@ -10616,215 +10822,225 @@ msgstr "_Widok"
 msgid "Attach"
 msgstr "ZaЁ╠cz"
 
-#: ui/evolution-message-composer.xml.h:1 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Zamyka bie©╠cy plik"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:5
 msgid "Delete all but signature"
 msgstr "Czy╤ci wszystko za wyj╠tkiem podpisu"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Szyfruje list przy u©yciu PGP"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Szyfruje list za pomoc╠ cerftyfikatu szyfruj╠cego S/MIME"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "_Format"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "Wstaw plik tekstowy.."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Wstawia zawarto╤Ф pliku jako tekst do listu"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Wstaw plik tekstowy.."
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Otwiera plik"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "Szyfrowanie PGP"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "Podpis PGP"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
 msgstr "Szyfrowanie S/MIME"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr "Podpis S/MIME"
 
-#: ui/evolution-message-composer.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1 widgets/misc/e-filter-bar.c:1
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
 msgid "Save"
 msgstr "Zapisz"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Zapisz jako"
+
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save _Draft"
 msgstr "Zapisz _szkic"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Zapisz w folderze..."
 
-#: ui/evolution-message-composer.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save the current file"
 msgstr "Zapisuje bie©╠cy plik"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Zapisuje bie©╠cy plik pod inn╠ nazw╠"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Zapisuje list w podanym folderze"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Wy╤lij"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Wy╤lij pС╪_niej"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Wy╤lij pС╪_niej"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Okre╤la, czy list powinien zostaФ wysЁany w formacie HTML"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "WysyЁa list pС╪niej"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "WysyЁa list natychmiast"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Wy╤wietla / ukrywa zaЁ╠czniki"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Wy╤wietlanie _zaЁ╠cznikСw"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "PrzeЁ╠cza wy╤wietlanie zaЁ╠cznikСw"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "Podpisuje list za pomoc╠ klucza PGP"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:37
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Podpisuje list za pomoc╠ certyfikatu podpisuj╠cego S/MIME"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr "PrzeЁ╠cza wy╤wietlanie pola BCC"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr "PrzeЁ╠cza wy╤wietlanie pola CC"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "PrzeЁ╠cza wy╤wietlanie listy wyboru w polu Od"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "PrzeЁ╠cza wy╤wietlanie pola Odpowied╪ do (Reply-To)"
 
-#: ui/evolution-message-composer.xml.h:1
-msgid "_Attachment"
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
 msgstr "_ZaЁ╠cznik"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "Pole _Bcc"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "Pole _Cc"
 
-#: ui/evolution-message-composer.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
 msgid "_Debug"
 msgstr "╕ledzenie przebiegu _wykonania"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
 msgstr "_UsuЯ wszystko"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "Pole _Od"
 
-#: ui/evolution-message-composer.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Wstaw"
 
-#: ui/evolution-message-composer.xml.h:1
-msgid "_Insert text file..."
-msgstr "_Wstaw plik tekstowy.."
-
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_OtwСrz..."
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "Pole _Odpowied╪ do"
 
-#: ui/evolution-message-composer.xml.h:1
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "_BezpieczeЯstwo"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "Pomo_c"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:1
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Folder"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Od╤wie© listЙ"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Od╤wie©a listЙ folderСw"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:1
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Zapisz"
 
-#: ui/evolution-subscribe.xml.h:1
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Wypisz"
 
@@ -10832,51 +11048,52 @@ msgstr "Wypisz"
 msgid "Cancel Task"
 msgstr "Anuluj zadanie"
 
-#: ui/evolution-task-editor.xml.h:1
+#: ui/evolution-task-editor.xml.h:3
 msgid "Delegate Task"
 msgstr "Oddeleguj zadanie"
 
-#: ui/evolution-task-editor.xml.h:1
+#: ui/evolution-task-editor.xml.h:7
 msgid "Re_fresh Task"
 msgstr "_Od╤wie© zadanie"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopiuje zaznaczone zadanie"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Tworzy nowe zadanie"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Wycina zaznaczone zadanie"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
+msgstr "Usuwa zaznaczone zadanie"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Nowe zadanie"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:9
 msgid "Paste task from the clipboard"
 msgstr "Wkleja zadanie ze schowka"
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Zapisuje zadanie w innej formie"
 
-#: ui/evolution-tasks.xml.h:1
-msgid "Set task view preferences"
-msgstr "Ustawienia widoku zadania"
-
-#: ui/evolution-tasks.xml.h:1
-msgid "Tasks Preferences..."
-msgstr "Ustawienia zadania..."
-
-#: ui/evolution-tasks.xml.h:1
-msgid "TasksPreferences"
-msgstr "UstawieniaZadania"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "_Ustawienia poczty..."
 
-#: ui/evolution-tasks.xml.h:1
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_Zadanie"
 
@@ -10884,188 +11101,188 @@ msgstr "_Zadanie"
 msgid "About Evolution..."
 msgstr "Informacje o Evolution..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:2
 msgid "Add to _Shortcut Bar"
 msgstr "Dodaj do paska _skrСtСw"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:3
 msgid "Change the name of this folder"
 msgstr "Zmienia nazwЙ folderu"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:6
 msgid "Copy this folder"
 msgstr "Kopiuje folder"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:7
 msgid "Create _New Folder..."
 msgstr "StwСrz _nowy folder..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:8
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Tworzy na pasku skrСtСw odno╤nik do bie©Йcego folderu"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:9
 msgid "Create a new folder"
 msgstr "Tworzy nowy folder"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Usuwa folder"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Wy╤wietla inny folder"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_ZakoЯcz"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:16
 msgid "Evolution _FAQ"
 msgstr "_NajczЙ╤ciej zadawane pytania"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "_Okno Evolution"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "KoЯczy pracЙ programu"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "Pi_erwsze kroki"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Importuje zewnЙtrzny plik w wybranym formacie"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:22
 msgid "Move this folder to another place"
 msgstr "Przenosi folder w inne miejsce"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "OtwСrz w nowym _oknie"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Otwiera folder w nowym oknie"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Wy╤wietla informacje o Evolution"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Wy╤lij zgЁoszenie bЁЙdu"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "Wy╤lij zgЁoszenie _bЁЙdu"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "WysyЁa zgЁoszenie bЁЙdu za pomoc╠ Bug Buddy."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:30
 msgid "Toggle"
 msgstr "PrzeЁ╠cz"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "PrzeЁ╠cza wy╤wietlanie paska folderСw"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "PrzeЁ╠cza wy╤wietlanie paska skrСtСw"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr ""
 "PrzeЁ╠cza pomiЙdzy trybami pracy z podЁ╠czeniem i bez podЁ╠czenia do sieci."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "Korzystanie z _mened©era kontaktСw"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "Korzystanie z _kalendarza"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "Korzystanie z programu p_ocztowego"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:37
 msgid "View the selected folder"
 msgstr "Wy╤wietla zaznaczony folder"
 
-#: ui/evolution.xml.h:1
-msgid "Work Offline"
-msgstr "Praca bez podЁ╠czenia"
-
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "_Informacje o Evolution..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:41
 msgid "_Appointment (FIXME)"
 msgstr "_Termin (FIXME)"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:43
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt (FIXME)"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "S_kopiuj..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "Pasek _folderСw"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Przejd╪ do folderu..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "Za_importuj plik..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "I_ndeks"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "_List e-mail"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:55
 msgid "_Move..."
 msgstr "_Przenie╤..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Nowy"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "_Nowy folder"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "_ZmieЯ nazwЙ..."
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:59
 msgid "_Shortcut"
 msgstr "_SkrСt"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "Pasek _skrСtСw"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:61
 msgid "_Task (FIXME)"
 msgstr "_Zadanie (FIXME)"
 
-#: ui/evolution.xml.h:1
+#: ui/evolution.xml.h:64
 msgid "_Work Offline"
 msgstr "Praca _bez podЁ╠czenia"
 
@@ -11073,7 +11290,7 @@ msgstr "Praca _bez podЁ╠czenia"
 msgid "Change the settings for My Evolution"
 msgstr "Zmienia ustawienia Mojego Evolution"
 
-#: ui/my-evolution.xml.h:1
+#: ui/my-evolution.xml.h:4
 msgid "_My Evolution Settings..."
 msgstr "_Ustawienia Mojego Evolution..."
 
@@ -11081,11 +11298,11 @@ msgstr "_Ustawienia Mojego Evolution..."
 msgid "Address Cards"
 msgstr "Karty adresowe"
 
-#: views/addressbook/galview.xml.h:1
+#: views/addressbook/galview.xml.h:2
 msgid "By Company"
 msgstr "WedЁug firmy"
 
-#: views/addressbook/galview.xml.h:1
+#: views/addressbook/galview.xml.h:3
 msgid "Phone List"
 msgstr "Lista telefonСw"
 
@@ -11093,256 +11310,256 @@ msgstr "Lista telefonСw"
 msgid "By Sender"
 msgstr "WedЁug nadawcy"
 
-#: views/mail/galview.xml.h:1
+#: views/mail/galview.xml.h:2
 msgid "By Status"
 msgstr "WedЁug stanu"
 
-#: views/mail/galview.xml.h:1
+#: views/mail/galview.xml.h:3
 msgid "By Subject"
 msgstr "WedЁug tematu"
 
-#: views/mail/galview.xml.h:1
+#: views/mail/galview.xml.h:4
 msgid "Messages"
 msgstr "Listy"
 
-#: views/tasks/galview.xml.h:1
+#: views/tasks/galview.xml.h:2
 msgid "With Category"
 msgstr "Wraz z kategoriami"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:1
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
-msgid "Tentative"
-msgstr ""
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "ZajЙty"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "Poza biurem"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr "Brak informacji"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr "_Zapro╤ innych..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 msgid "_Options"
 msgstr "_Opcje"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
 msgstr "Wy╤wietlanie _tylko godzin roboczych"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
 msgstr "_Wszyscy ludzie i zasoby"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr "Wszyscy _ludzie i jeden zasСb"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
 msgstr "_Wymagani ludzie"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
 msgstr "Wymagani ludzie i j_eden zasСb"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 msgid "Meeting _start time:"
 msgstr "Czas p_ocz╠tku spotkania:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 msgid "Meeting _end time:"
 msgstr "Czas _koЯca spotkania:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
 msgstr "Wszyscy uczestnicy"
 
-#: widgets/menus/gal-view-menus.c:1
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "_Bie©╠cy widok"
 
-#: widgets/menus/gal-view-menus.c:1
+#: widgets/menus/gal-view-menus.c:259
 msgid "Define Views"
 msgstr "Zdefiniuj widoki"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:1
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "PW╕CPSN"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1 widgets/misc/e-calendar-item.c:1
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-cell-date-edit.c:1 widgets/misc/e-dateedit.c:1
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Teraz"
 
-#: widgets/misc/e-cell-date-edit.c:1
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Dzi╤"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: widgets/misc/e-cell-date-edit.c:1
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Czas musi byФ podany w formacie: %s"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:59
 msgid "Baltic"
 msgstr "BaЁtycki"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:60
 msgid "Central European"
 msgstr "╕rodkowoeuropejski"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:61
 msgid "Chinese"
 msgstr "ChiЯski"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:62
 msgid "Cyrillic"
 msgstr "Cyrylica"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:63
 msgid "Greek"
 msgstr "Grecki"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr "JapoЯski"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:65
 msgid "Korean"
 msgstr "KoreaЯski"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:66
 msgid "Turkish"
 msgstr "Turecki"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:67
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:68
 msgid "Western European"
 msgstr "Zachodnioeuropejski"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:85
 msgid "Traditional"
 msgstr "Tradycyjny"
 
-#: widgets/misc/e-charset-picker.c:1 widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
 msgid "Simplified"
 msgstr "Uproszczony"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:91
 msgid "Ukrainian"
 msgstr "UkraiЯski"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:102
 msgid "New"
 msgstr "Nowy"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:160
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Nieznany zestaw znakСw: %s"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:202
 msgid "Enter the character set to use"
 msgstr "Podaj wykorzystywany zestaw znakСw"
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:277
 msgid "Other..."
 msgstr "Inny..."
 
-#: widgets/misc/e-charset-picker.c:1
+#: widgets/misc/e-charset-picker.c:394
 msgid "Character Encoding"
 msgstr "Standard kodowania znakСw"
 
-#: widgets/misc/e-clipped-label.c:1
+#: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:1
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Edytor kontaktСw"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "Zapisz wyszukiwanie"
 
-#: widgets/misc/e-filter-bar.c:1
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "Zaawansowane wyszukiwanie"
 
-#: widgets/misc/e-filter-bar.h:1 widgets/misc/e-filter-bar.h:1
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Wy╤wietl wszystkie"
 
-#: widgets/misc/e-filter-bar.h:1 widgets/misc/e-filter-bar.h:1
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Zaawansowane..."
 
-#: widgets/misc/e-messagebox.c:1
+#: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informacje"
 
-#: widgets/misc/e-messagebox.c:1
+#: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Ostrze©enie"
 
-#: widgets/misc/e-messagebox.c:1
+#: widgets/misc/e-messagebox.c:166
 msgid "Error"
 msgstr "BЁ╠d"
 
-#: widgets/misc/e-messagebox.c:1
+#: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Pytanie"
 
-#: widgets/misc/e-messagebox.c:1
+#: widgets/misc/e-messagebox.c:180
 msgid "Message"
 msgstr "List"
 
 #. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:1
+#: widgets/misc/e-messagebox.c:224
 msgid "Don't show this message again."
 msgstr "Bez wy╤wietlania tego komunikatu w przyszЁo╤ci."
 
-#: widgets/misc/e-search-bar.c:1
+#: widgets/misc/e-search-bar.c:155
 msgid "Sear_ch"
 msgstr "_Wyszukiwanie"
 
@@ -11350,18 +11567,194 @@ msgstr "_Wyszukiwanie"
 msgid "The Personal Addressbook Server"
 msgstr "Osobisty serwer ksi╠©ki adresowej"
 
-#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Osobisty serwer ksi╠©ki adresowej; generator kalendarza"
 
-#: wombat/wombat.c:1
+#: wombat/wombat.c:173
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): nie mo©na zainicjowaФ GNOME-VFS"
 
-#: wombat/wombat.c:1
+#: wombat/wombat.c:185
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): nie mo©na zainicjowaФ GNOME"
 
-#: wombat/wombat.c:1
+#: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nie mo©na zainicjowaФ Bonobo"
+
+#~ msgid "Set task view preferences"
+#~ msgstr "Ustawienia widoku zadania"
+
+#~ msgid "TasksPreferences"
+#~ msgstr "UstawieniaZadania"
+
+#~ msgid "(none)"
+#~ msgstr "(brak)"
+
+#~ msgid "File not found"
+#~ msgstr "Nie odnaleziono pliku"
+
+#~ msgid "Open calendar"
+#~ msgstr "OtwСrz kalendarz"
+
+#~ msgid "Save calendar"
+#~ msgstr "Zapisz kalendarz"
+
+#~ msgid "Edit this task"
+#~ msgstr "Zredaguj zadanie"
+
+#~ msgid "Go to Today"
+#~ msgstr "Przejd╪ do dzisiaj"
+
+#~ msgid "Delete all Occurrences"
+#~ msgstr "UsuЯ wszystkie wyst╠pienia"
+
+#~ msgid "Summary contains"
+#~ msgstr "Zestawienie zawiera"
+
+#~ msgid "Description contains"
+#~ msgstr "Opis zawiera"
+
+#~ msgid "Comment contains"
+#~ msgstr "Komentarz zawiera"
+
+#~ msgid "Has category"
+#~ msgstr "Ma kategoriЙ"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Skanowanie folderu IMAP"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Prze╤lij na adres"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "Przekonwertuj folder \"%s\" na format \"%s\""
+
+#~ msgid "Reconfiguring folder"
+#~ msgstr "Przekonfigurowywanie folder"
+
+#~ msgid "Closing current folder"
+#~ msgstr "Zamykanie bie©╠cego folderu"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Zmiana nazwy starego folderu i otwieranie"
+
+#~ msgid "Creating new folder"
+#~ msgstr "Tworzenie nowego folderu"
+
+#~ msgid "Copying messages"
+#~ msgstr "Kopiowanie listСw"
+
+#~ msgid "Evolution progress"
+#~ msgstr "PostЙp Evolution"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Pobieranie %d. listu z %d (uid \"%s\")"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Zapisywanie %d. listu z %d (uid \"%s\")"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (przesЁany list)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Fwd: (bez tematu)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "PrzesЁany list (bez tematu)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----PrzesЁany list-----<br><b>Od:</b> %s<br><b>Do:</b> %s<br><b>Temat:</b> "
+#~ "%s<br>"
+
+#~ msgid "╟F"
+#~ msgstr "╟F"
+
+#~ msgid "╟C"
+#~ msgstr "╟C"
+
+#~ msgid "kph"
+#~ msgstr "km/h"
+
+# [cyba] mo©e raczej calHg??
+#~ msgid "inHg"
+#~ msgstr "inHG"
+
+#~ msgid "mmHg"
+#~ msgstr "mmHg"
+
+#~ msgid "miles"
+#~ msgstr "mile"
+
+#~ msgid "kilometers"
+#~ msgstr "kilometry"
+
+#~ msgid "Add ->"
+#~ msgstr "Dodaj ->"
+
+#~ msgid "Remove <-"
+#~ msgstr "UsuЯ <-"
+
+#~ msgid "Work offline"
+#~ msgstr "Praca bez podЁ╠czenia"
+
+#~ msgid "5 Days"
+#~ msgstr "5 dni"
+
+#~ msgid "Alter preferences"
+#~ msgstr "Pozwala na zmianЙ ustawieЯ"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Tworzy nowy termianrz"
+
+#~ msgid "Day"
+#~ msgstr "DzieЯ"
+
+#~ msgid "Month"
+#~ msgstr "Miesi╠c"
+
+#~ msgid "New _Event"
+#~ msgstr "Nowe _zdarzenie"
+
+#~ msgid "Open Calendar"
+#~ msgstr "OtwСrz kalendarz"
+
+#~ msgid "Prev"
+#~ msgstr "Poprzedni"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Zapisuje kalendarz w innej formie"
+
+#~ msgid "Settings..."
+#~ msgstr "Ustawienia..."
+
+#~ msgid "Week"
+#~ msgstr "TydzieЯ"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_OtwСrz kalendarz"
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "Oznacz jako p_rzeczytane"
+
+#~ msgid "Mark As I_mportant"
+#~ msgstr "Oznacz jako wa©n_e"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Oznacz jako _nieprzeczytane"
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Drukuje list na drukarce"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "Przekieruj (FIXME)"
+
+#~ msgid "_Insert text file..."
+#~ msgstr "_Wstaw plik tekstowy.."
+
+#~ msgid "Tasks Preferences..."
+#~ msgstr "Ustawienia zadania..."
diff --git a/po/pt.po b/po/pt.po
index d807b4803a..47cde15dd0 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,11 +2,10 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Tiago AntЦo <tiagoantao@bigfoot.com>, 2000.
 #
-#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2001-01-17 18:47-0500\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2000-04-16 16:33+01:00\n"
 "Last-Translator: Tiago AntЦo <tiagoantao@bigfoot.com>\n"
 "Language-Team: Gnome Portuguese <gnome@poli.org>\n"
@@ -14,370 +13,210 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "NЦo consigo inicializar o componente de mail do Evolution."
-
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1090
-#: addressbook/gui/component/addressbook-factory.c:38
-#: addressbook/gui/widgets/test-minicard-view.c:45
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
-msgid "Could not initialize Bonobo"
-msgstr "NЦo se consegui inicializar Bonobo"
-
-#: addressbook/gui/widgets/test-minicard-view.c:100
-msgid "Reflow Test"
-msgstr ""
-
-#: addressbook/gui/widgets/test-minicard-view.c:101
-#, fuzzy
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Copyright 1999, 2000 Helix Code, Inc."
-
-#: addressbook/gui/widgets/test-minicard-view.c:103
-msgid "This should test the reflow canvas item"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:36
-msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
-msgstr ""
-
-#: camel/providers/vee/camel-vee-folder.c:604
-#, fuzzy, c-format
-msgid "No such message: %s"
-msgstr "Enviar a mensagem"
-
-#: executive-summary/component/e-summary-callbacks.c:267
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:61
-#: executive-summary/component/e-summary-url.c:66
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:62
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:63
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Enviar"
-
-#: executive-summary/component/e-summary-url.c:64
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:65
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:67
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Cores"
-
-#: executive-summary/component/e-summary-url.c:68
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Ir para a _pasta..."
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:70
-#, fuzzy, c-format
-msgid "Move %s into the previous row"
-msgstr "Ir para o item anterior"
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Move %s into the next row"
-msgstr "Ir para o prСximo item"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "_Nova pasta"
-
-#: executive-summary/component/e-summary.c:919
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr "NЦo consigo abrir a localizaГЦo: %s"
-
-#: executive-summary/component/e-summary.c:933
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "Erro a gravar os atalhos."
-
-#: executive-summary/component/e-summary.c:951
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/main.c:59
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:443
-#: executive-summary/test-service/rdf-summary.c:479
-#: executive-summary/test-service/rdf-summary.c:524
-msgid "Error"
-msgstr ""
-
-#: mail/mail-config.c:799
-msgid "Connecting to server"
-msgstr ""
-
-#: mail/mail-config.c:801
-msgid "Connect to server"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
 msgstr ""
 
-#: notes/component-factory.c:27
-msgid "New"
-msgstr "Novo"
-
-#: notes/component-factory.c:27
-#, fuzzy
-msgid "Create a new note"
-msgstr "Criar um novo contacto"
-
-#: notes/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "NЦo consigo inicializar o componente de mail do Evolution."
-
-#: notes/main.c:30
-#, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Component de correio: NЦo consegui inicializar Bonobo"
-
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3605
 #, fuzzy
 msgid "Card: "
 msgstr "Carro"
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3607
 #, fuzzy
 msgid ""
 "\n"
 "Name: "
 msgstr "Nome"
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3054
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3055
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3070
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3637
 #, fuzzy
 msgid ""
 "\n"
 "Address:"
 msgstr "EndereГo"
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3089
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3102
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3117
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3697
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr "Correio electrСnico 2"
 
-#: addressbook/backend/ebook/e-card.c:3144
+#: addressbook/backend/ebook/e-card.c:3700
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:"
 msgstr "Correio electrСnico 2"
 
-#: addressbook/backend/ebook/e-card.c:3163
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3169
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3177
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3196
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3203
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -393,730 +232,1339 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3219
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
 msgstr ""
 
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
+#: addressbook/backend/ebook/e-card.c:4037
+msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Sincronizar"
+#: addressbook/backend/ebook/e-card.c:4045
+#, c-format
+msgid "VCard for %s"
+msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+#: addressbook/backend/ebook/load-pine-addressbook.c:22
+#: addressbook/backend/ebook/test-client-list.c:23
+#: addressbook/backend/ebook/test-client.c:33
+#: addressbook/conduit/address-conduit.c:1092
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
+msgid "Could not initialize Bonobo"
+msgstr "NЦo se consegui inicializar Bonobo"
+
+#: addressbook/conduit/address-conduit.c:201
+msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
+#: addressbook/conduit/address-conduit.c:214
+msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
+msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
+#: addressbook/conduit/address-conduit.c:655
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
+#, fuzzy
+msgid "Could not start wombat"
+msgstr "NЦo se consegui inicializar Bonobo"
+
+#: addressbook/conduit/address-conduit.c:687
+#: addressbook/conduit/address-conduit.c:690
+msgid "Could not read pilot's Address application block"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Atalho para _barra do Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#, fuzzy
+msgid "Evolution component for handling contacts."
+msgstr "Uma pasta contendo contactos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Addressbook Minicard control"
+msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution addressbook component."
+msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#, fuzzy
+msgid "Factory for the sample Addressbook control"
+msgstr "Pressione aqui para o livro de endereГos"
+
+#: addressbook/gui/component/addressbook-config.c:148
+#, fuzzy
+msgid "LDAP Server"
+msgstr "Servidor:"
+
+#: addressbook/gui/component/addressbook-config.c:150
+#, fuzzy
+msgid "File"
+msgstr "_Pasta"
+
+#: addressbook/gui/component/addressbook-config.c:153
+#, fuzzy
+msgid "Unknown addressbook type"
+msgstr "ImpossМvel abrir o livro de endereГos"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Password"
+msgstr "Esquecer _Senhas"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
+#: addressbook/gui/component/addressbook-config.c:177
 #, fuzzy
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998 Free Software Foundation"
+msgid "Base"
+msgstr "Colar"
 
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
+#: addressbook/gui/component/addressbook-config.c:181
+#, fuzzy
+msgid "Subtree"
+msgstr "Fontes"
 
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
 #, fuzzy
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
+msgid "Host:"
+msgstr "Horas"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
 msgstr ""
-"Um excepГЦo ocorreu enquanto se tentava carregar dados no componente com "
-"PersistStream"
 
-#: addressbook/conduit/address-conduit.c:201
-msgid "Cursor could not be loaded\n"
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:214
-msgid "EBook not loaded\n"
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:729
-#: calendar/conduits/todo/todo-conduit.c:544
-msgid "Could not start wombat server"
+#: addressbook/gui/component/addressbook-config.c:411
+#, fuzzy
+msgid "Port:"
+msgstr "Prioridade:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/gui/component/addressbook-config.c:432
 #, fuzzy
-msgid "Could not start wombat"
-msgstr "NЦo se consegui inicializar Bonobo"
+msgid "Search Scope:"
+msgstr "Ano"
 
-#: addressbook/conduit/address-conduit.c:686
-#: addressbook/conduit/address-conduit.c:689
-msgid "Could not read pilot's Address application block"
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "AutenticaГЦo"
+
+#: addressbook/gui/component/addressbook-config.c:501
+#, fuzzy
+msgid "Advanced LDAP Options"
+msgstr "Encontrar avanГado"
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Caminho"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:663
+#, fuzzy
+msgid "Edit Addressbook"
+msgstr "ImpossМvel abrir o livro de endereГos"
+
+#: addressbook/gui/component/addressbook-config.c:665
+#, fuzzy
+msgid "Add Addressbook"
+msgstr "ImpossМvel abrir o livro de endereГos"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+#, fuzzy
+msgid "Name:"
+msgstr "Nome"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+#, fuzzy
+msgid "Description:"
+msgstr "Nenhuma descriГЦo"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:1
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "Adicionar Fonte"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Apagar"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+#, fuzzy
+msgid "Name"
+msgstr "Nome"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
 #, fuzzy
 msgid "_Add"
 msgstr "Adicionar"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-contact-editor.xml:37
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
 #, fuzzy
-msgid "_Delete"
-msgstr "Apagar"
+msgid "_Edit"
+msgstr "Editar..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
+#: addressbook/gui/component/addressbook-storage.c:118
+#, fuzzy
+msgid "Other Contacts"
+msgstr "_Novo Contacto"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "ImpossМvel abrir o livro de endereГos"
+
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-msgid "Add"
-msgstr "Adicionar"
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
+#: addressbook/gui/component/addressbook.c:554
 #, fuzzy
-msgid "Contact Editor"
-msgstr "_Contacto"
+msgid "Any field contains"
+msgstr "Uma pasta contendo tarefas"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
+#: addressbook/gui/component/addressbook.c:556
 #, fuzzy
-msgid "_Full Name..."
-msgstr "Nome completo:"
+msgid "Email contains"
+msgstr "мcone_s pequenos"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
-msgid "File As:"
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "мcone_s pequenos"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "O URI que o navegador de pastas mostrarА"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "EndereГo principal de correio electrСnico"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "Correio electrСnico 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "Correio electrСnico 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "Apagar um contacto"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Criar um novo contacto"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
+#: addressbook/gui/component/e-address-popup.c:859
 #, fuzzy
-msgid "Web page address:"
+msgid "Querying Addressbook..."
+msgstr "ImpossМvel abrir o livro de endereГos"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "_Novo Contacto"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
 msgstr "EndereГo de correio:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr ""
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Remover"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
 #, fuzzy
-msgid "_Home"
-msgstr "Casa"
+msgid "Remove All"
+msgstr "Remover"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "Enviar"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "_Novo Contacto"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
+#: addressbook/gui/component/select-names/select-names.glade.h:1
 #, fuzzy
-msgid "_Mobile"
-msgstr "TelemСvel"
+msgid "Message Recipients"
+msgstr "SituaГЦo das mensagens"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
-msgid "Primary Email"
-msgstr "EndereГo principal de correio electrСnico"
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+#, fuzzy
+msgid "Select Names"
+msgstr "_Items seleccionados"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "_Items seleccionados"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "_Category:"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+#, fuzzy
+msgid "_Search"
+msgstr "Ano"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+msgid "Anni_versary:"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+msgid "Business _Fax"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
+msgid "Ca_tegories..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 #, fuzzy
-msgid "C_ontacts..."
+msgid "Contact Editor"
 msgstr "_Contacto"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-msgid "Ca_tegories..."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
+msgid "Details"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-msgid "_Job title:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+msgid "File As:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+msgid "General"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+msgid "New phone type"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 #, fuzzy
-msgid "_Company:"
-msgstr "Empresa"
+msgid "No_tes:"
+msgstr "_Nota"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "OrganizaГЦo:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+msgid "Phone Types"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+msgid "Wants to receive _HTML mail"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#, fuzzy
+msgid "Web page address:"
+msgstr "EndereГo de correio:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "_Address..."
 msgstr "EndereГo"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-msgid "General"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+msgid "_Assistant's name:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
-msgid "_Department:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+msgid "_Birthday:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
-msgid "_Office:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+msgid "_Business"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
-msgid "_Profession:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+#, fuzzy
+msgid "_Contacts..."
+msgstr "_Contacto"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
+#, fuzzy
+msgid "_Delete"
+msgstr "Apagar"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+msgid "_Department:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#, fuzzy
+msgid "_Full Name..."
+msgstr "Nome completo:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#, fuzzy
+msgid "_Home"
+msgstr "Casa"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+msgid "_Job title:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
-msgid "_Spouse:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#, fuzzy
+msgid "_Mobile"
+msgstr "TelemСvel"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+msgid "_Nickname:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+msgid "_Office:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+msgid "_Profession:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+msgid "_Spouse:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+msgid "_This is the mailing address"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 #, fuzzy
-msgid "No_tes:"
-msgstr "_Nota"
+msgid "Delete Contact?"
+msgstr "Apagar um contacto"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-msgid "Details"
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
+msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/contact-editor/e-contact-editor.c:1379
-#: addressbook/gui/widgets/e-addressbook-view.c:568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Carro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Empresa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
-#: addressbook/contact-editor/e-contact-editor.c:1380
-#: addressbook/gui/widgets/e-addressbook-view.c:569
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Casa 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Fax de casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "RDIS"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "TelemСvel"
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:578
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Outro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1287
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Outro Fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Bip"
 
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "PrimАrio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1290
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1291
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1292
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Email 2"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#, fuzzy
+msgid "Edit Full"
+msgstr "_Pastas"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
+#, fuzzy
+msgid "Full Name"
+msgstr "Nome completo:"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#, fuzzy
+msgid "E-mail"
 msgstr "Correio electrСnico 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Email 3"
-msgstr "Correio electrСnico 3"
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#, fuzzy
+msgid "Address _2:"
+msgstr "EndereГo"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#, fuzzy
+msgid "Canada"
+msgstr "Novo Ca_lendАrio"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#, fuzzy
+msgid "Check Address"
+msgstr "EndereГo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Countr_y:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#, fuzzy
+msgid "Finland"
+msgstr "Encontrar"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "USA"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#, fuzzy
+msgid "_Address:"
+msgstr "EndereГo"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#, fuzzy
+msgid "_City:"
+msgstr "Prioridade:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+msgid "_PO Box:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+msgid "_State/Province:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+msgid "_ZIP Code:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 #, fuzzy
 msgid "Check Full Name"
 msgstr "Nome completo:"
 
-#: addressbook/contact-editor/fullname-strings.h:8
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
+#: addressbook/gui/contact-editor/fullname.glade.h:2
+msgid "Dr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
+#: addressbook/gui/contact-editor/fullname.glade.h:3
+msgid "Esq."
+msgstr ""
+
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+msgid "I"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fullname.glade.h:5
+msgid "II"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fullname.glade.h:6
+msgid "III"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fullname.glade.h:7
+msgid "Jr."
+msgstr ""
+
+#: addressbook/gui/contact-editor/fullname.glade.h:8
+msgid "Miss"
+msgstr ""
+
+#: addressbook/gui/contact-editor/fullname.glade.h:9
+msgid "Mr."
+msgstr ""
+
+#: addressbook/gui/contact-editor/fullname.glade.h:10
+msgid "Mrs."
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/gui/contact-editor/fullname.glade.h:11
+msgid "Ms."
+msgstr ""
+
+#: addressbook/gui/contact-editor/fullname.glade.h:12
+msgid "Sr."
+msgstr ""
+
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 #, fuzzy
 msgid "_First:"
 msgstr "_Pasta"
 
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
+#: addressbook/gui/contact-editor/fullname.glade.h:14
+msgid "_Last:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 #, fuzzy
 msgid "_Middle:"
 msgstr "_Correio"
 
-#: addressbook/contact-editor/fullname-strings.h:26
-msgid "_Last:"
+#: addressbook/gui/contact-editor/fullname.glade.h:16
+msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:27
-msgid "_Suffix:"
+#: addressbook/gui/contact-editor/fullname.glade.h:17
+msgid "_Title:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:231
-msgid "As _Minicards"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "Utilizador:"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+msgid "Members"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:237
-msgid "As _Table"
-msgstr "Como _Tabela"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:374
-#, c-format
-msgid "Enter password for %s"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:402
-msgid "Unable to open addressbook"
-msgstr "ImpossМvel abrir o livro de endereГos"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
+msgstr "Remover"
 
-#: addressbook/gui/component/addressbook.c:407
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "_Contacto"
+
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "_Contacto"
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
-msgid "Show All"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
 #, fuzzy
-msgid "Advanced..."
-msgstr "Adicionar..."
+msgid "New Contact:"
+msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
 #, fuzzy
-msgid "Any field contains"
-msgstr "Uma pasta contendo tarefas"
+msgid "Original Contact:"
+msgstr "_Novo Contacto"
 
-#: addressbook/gui/component/addressbook.c:563
-msgid "Name contains"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
+msgid ""
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:564
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
-msgid "Email contains"
-msgstr "мcone_s pequenos"
+msgid "Changed Contact:"
+msgstr "_Novo Contacto"
 
-#: addressbook/gui/component/addressbook.c:707
-msgid "The URI that the Folder Browser will display"
-msgstr "O URI que o navegador de pastas mostrarА"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:95
+#: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 #, fuzzy
-msgid "Other Contacts"
-msgstr "_Novo Contacto"
+msgid "Search"
+msgstr "Ano"
 
-#: addressbook/gui/component/addressbook-config.c:139
+#: addressbook/gui/widgets/alphabet.glade.h:1
+msgid "123"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:2
 #, fuzzy
-msgid "LDAP Server"
-msgstr "Servidor:"
+msgid "a"
+msgstr "am"
 
-#: addressbook/gui/component/addressbook-config.c:141
+#: addressbook/gui/widgets/alphabet.glade.h:3
 #, fuzzy
-msgid "File"
-msgstr "_Pasta"
+msgid "b"
+msgstr "%b"
 
-#: addressbook/gui/component/addressbook-config.c:144
+#: addressbook/gui/widgets/alphabet.glade.h:4
 #, fuzzy
-msgid "Unknown addressbook type"
-msgstr "ImpossМvel abrir o livro de endereГos"
+msgid "c"
+msgstr "Cc"
 
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "None (anonymous mode)"
+#: addressbook/gui/widgets/alphabet.glade.h:5
+msgid "d"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:249
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
+#: addressbook/gui/widgets/alphabet.glade.h:6
 #, fuzzy
-msgid "Password"
-msgstr "Esquecer _Senhas"
+msgid "e"
+msgstr "Qa"
 
-#: addressbook/gui/component/addressbook-config.c:157
-msgid "SASL"
+#: addressbook/gui/widgets/alphabet.glade.h:7
+msgid "f"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:160
-msgid "Unknown auth type"
+#: addressbook/gui/widgets/alphabet.glade.h:8
+msgid "g"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:169
-#, fuzzy
-msgid "Base"
-msgstr "Colar"
+#: addressbook/gui/widgets/alphabet.glade.h:9
+msgid "h"
+msgstr "h"
 
-#: addressbook/gui/component/addressbook-config.c:171
-msgid "One"
+#: addressbook/gui/widgets/alphabet.glade.h:10
+msgid "i"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:11
+msgid "j"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:173
+#: addressbook/gui/widgets/alphabet.glade.h:12
 #, fuzzy
-msgid "Subtree"
-msgstr "Fontes"
+msgid "k"
+msgstr "Ok"
 
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "Unknown scope type"
+#: addressbook/gui/widgets/alphabet.glade.h:13
+msgid "l"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:309
-msgid "Bind DN:"
+#: addressbook/gui/widgets/alphabet.glade.h:14
+#, fuzzy
+msgid "m"
+msgstr "am"
+
+#: addressbook/gui/widgets/alphabet.glade.h:15
+#, fuzzy
+msgid "n"
+msgstr "Seg"
+
+#: addressbook/gui/widgets/alphabet.glade.h:16
+#, fuzzy
+msgid "o"
+msgstr "Para"
+
+#: addressbook/gui/widgets/alphabet.glade.h:17
+#, fuzzy
+msgid "p"
+msgstr "pm"
+
+#: addressbook/gui/widgets/alphabet.glade.h:18
+msgid "q"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:311
-msgid "Remember this password"
+#: addressbook/gui/widgets/alphabet.glade.h:19
+#, fuzzy
+msgid "r"
+msgstr "Sx"
+
+#: addressbook/gui/widgets/alphabet.glade.h:20
+msgid "s"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:360
+#: addressbook/gui/widgets/alphabet.glade.h:21
 #, fuzzy
-msgid "Host:"
-msgstr "Horas"
+msgid "t"
+msgstr "h"
 
-#: addressbook/gui/component/addressbook-config.c:361
+#: addressbook/gui/widgets/alphabet.glade.h:22
 #, fuzzy
-msgid "Port:"
-msgstr "Prioridade:"
+msgid "u"
+msgstr "Do"
 
-#: addressbook/gui/component/addressbook-config.c:364
-msgid "Root DN:"
+#: addressbook/gui/widgets/alphabet.glade.h:23
+msgid "v"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:384
+#: addressbook/gui/widgets/alphabet.glade.h:24
+msgid "w"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:25
+msgid "x"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:26
+msgid "y"
+msgstr ""
+
+#: addressbook/gui/widgets/alphabet.glade.h:27
+msgid "z"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
+msgid "Save as VCard"
+msgstr "Gravar como VCard"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
+msgid "Send contact to other"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 #, fuzzy
-msgid "Search Scope:"
-msgstr "Ano"
+msgid "Send message to contact"
+msgstr "Enviar mensagem em formato HTML"
 
-#: addressbook/gui/component/addressbook-config.c:438
-msgid "Authentication:"
-msgstr "AutenticaГЦo"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
+msgid "Print"
+msgstr "Imprimir"
 
-#: addressbook/gui/component/addressbook-config.c:455
-msgid "Path:"
-msgstr "Caminho"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
+#, fuzzy
+msgid "Print Envelope"
+msgstr "Imprimir..."
 
-#: addressbook/gui/component/addressbook-config.c:460
-msgid "Create path if it doesn't exist."
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Apagar"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:593
+#: addressbook/gui/widgets/e-addressbook-util.c:34
 #, fuzzy
-msgid "Edit Addressbook"
-msgstr "ImpossМvel abrir o livro de endereГos"
+msgid "Success"
+msgstr "Fontes"
 
-#: addressbook/gui/component/addressbook-config.c:595
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+msgid "Repository offline"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 #, fuzzy
-msgid "Add Addressbook"
-msgstr "ImpossМvel abrir o livro de endereГos"
+msgid "Card not found"
+msgstr "Ficheiro nЦo encontrado"
 
-#: addressbook/gui/component/addressbook-config.c:611
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:616
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 #, fuzzy
-msgid "Name:"
-msgstr "Nome"
+msgid "Canceled"
+msgstr "Novo Ca_lendАrio"
 
-#: addressbook/gui/component/addressbook-config.c:617
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 #, fuzzy
-msgid "Description:"
-msgstr "Nenhuma descriГЦo"
+msgid "Other error"
+msgstr "Outro"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
+#: addressbook/gui/widgets/e-addressbook-util.c:59
 #, fuzzy
-msgid "Search"
-msgstr "Ano"
+msgid "Error adding list"
+msgstr "Erro a gravar os atalhos."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
-msgid "Save as VCard"
-msgstr "Gravar como VCard"
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Erro a gravar os atalhos."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:565
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+msgid "Error modifying list"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 #, fuzzy
-msgid "Name"
-msgstr "Nome"
+msgid "Error removing list"
+msgstr "Erro a gravar os atalhos."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr "Erro a gravar os atalhos."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+msgid "* Click here to add a contact *"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:702
+#, fuzzy
+msgid "File As"
+msgstr "_Pasta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:566
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 #, fuzzy
 msgid "Email"
 msgstr "Correio electrСnico 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:570
+#: addressbook/gui/widgets/e-addressbook-view.c:705
+#, fuzzy
+msgid "Primary Phone"
+msgstr "PrimАrio"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:706
+msgid "Assistant Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:707
+msgid "Business Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:708
+msgid "Callback Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:709
+#, fuzzy
+msgid "Company Phone"
+msgstr "Empresa"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:710
+#, fuzzy
+msgid "Home Phone"
+msgstr "Casa 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "OrganizaГЦo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/gui/widgets/e-addressbook-view.c:712
+#, fuzzy
+msgid "Business Address"
+msgstr "EndereГo"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:713
+#, fuzzy
+msgid "Home Address"
+msgstr "EndereГo"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:714
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "TelemСvel"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:715
+msgid "Car Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+msgid "Business Phone 2"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, fuzzy
+msgid "Home Phone 2"
+msgstr "Casa 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:721
+#, fuzzy
+msgid "Other Phone"
+msgstr "_Novo Contacto"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:726
+msgid "TTY"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:727
+#, fuzzy
+msgid "Other Address"
+msgstr "EndereГo"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 #, fuzzy
 msgid "Department"
 msgstr "Data"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 #, fuzzy
 msgid "Office"
 msgstr "Fora do escritСrio"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 #, fuzzy
 msgid "Title"
 msgstr "_Pasta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 #, fuzzy
 msgid "Manager"
 msgstr "Bip"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 #, fuzzy
 msgid "Nickname"
 msgstr "Nome"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 #, fuzzy
 msgid "Spouse"
 msgstr "Fontes"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 #, fuzzy
 msgid "Note"
 msgstr "Nenhuma"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:280
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "Nenhuma"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+msgid "Removing cards..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 #, fuzzy
 msgid "Save in addressbook"
 msgstr "ImpossМvel abrir o livro de endereГos"
 
-#: addressbook/gui/widgets/e-minicard-view.c:129
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1125,136 +1573,528 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 #, fuzzy
-msgid "Evolution Calendar Conduit"
-msgstr "Atalho para _barra do Evolution"
+msgid "Card View"
+msgstr "Carro"
+
+#: addressbook/printing/e-contact-print.glade.h:1
+msgid "10 pt. Tahoma"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:2
+msgid "8 pt. Tahoma"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:3
+msgid "Blank forms at end:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:4
+#, fuzzy
+msgid "Body"
+msgstr "Hoje"
+
+#: addressbook/printing/e-contact-print.glade.h:5
+msgid "Bottom:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:6
+#, fuzzy
+msgid "Dimensions:"
+msgstr "Nenhuma descriГЦo"
+
+#: addressbook/printing/e-contact-print.glade.h:7
+#, fuzzy
+msgid "F_ont..."
+msgstr "Imprimir..."
+
+#: addressbook/printing/e-contact-print.glade.h:8
+#, fuzzy
+msgid "Fonts"
+msgstr "MЙs"
+
+#: addressbook/printing/e-contact-print.glade.h:9
+#, fuzzy
+msgid "Footer:"
+msgstr "_Pastas"
+
+#: addressbook/printing/e-contact-print.glade.h:10
+#, fuzzy
+msgid "Format"
+msgstr "F_ormato"
+
+#: addressbook/printing/e-contact-print.glade.h:11
+#, fuzzy
+msgid "Header"
+msgstr "Ano"
+
+#: addressbook/printing/e-contact-print.glade.h:12
+#, fuzzy
+msgid "Header/Footer"
+msgstr "Ano"
+
+#: addressbook/printing/e-contact-print.glade.h:13
+#, fuzzy
+msgid "Headings"
+msgstr "CabeГalhos:"
+
+#: addressbook/printing/e-contact-print.glade.h:14
+msgid "Headings for each letter"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:15
+#, fuzzy
+msgid "Height:"
+msgstr "CabeГalhos:"
+
+#: addressbook/printing/e-contact-print.glade.h:16
+msgid "Immediately follow each other"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:17
+msgid "Include:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:18
+msgid "Landscape"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:19
+msgid "Left:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:20
+msgid "Letter tabs on side"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:21
+#, fuzzy
+msgid "Margins"
+msgstr "мcones _grandes"
+
+#: addressbook/printing/e-contact-print.glade.h:22
+msgid "Number of columns:"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:23
+#, fuzzy
+msgid "Options"
+msgstr "_OpГУes"
+
+#: addressbook/printing/e-contact-print.glade.h:24
+#, fuzzy
+msgid "Orientation"
+msgstr "OrganizaГЦo"
+
+#: addressbook/printing/e-contact-print.glade.h:25
+#, fuzzy
+msgid "Page"
+msgstr "Bip"
+
+#: addressbook/printing/e-contact-print.glade.h:26
+#, fuzzy
+msgid "Page Setup:"
+msgstr "Imprimir"
+
+#: addressbook/printing/e-contact-print.glade.h:27
+#, fuzzy
+msgid "Paper"
+msgstr "Bip"
+
+#: addressbook/printing/e-contact-print.glade.h:28
+#, fuzzy
+msgid "Paper source:"
+msgstr "Fontes de correio"
+
+#: addressbook/printing/e-contact-print.glade.h:29
+#, fuzzy
+msgid "Portrait"
+msgstr "Prioridade"
+
+#: addressbook/printing/e-contact-print.glade.h:30
+#, fuzzy
+msgid "Preview:"
+msgstr "Prever impressЦo"
+
+#: addressbook/printing/e-contact-print.glade.h:31
+msgid "Print using gray shading"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:32
+msgid "Reverse on even pages"
+msgstr ""
+
+#: addressbook/printing/e-contact-print.glade.h:33
+#, fuzzy
+msgid "Right:"
+msgstr "CabeГalhos:"
+
+#: addressbook/printing/e-contact-print.glade.h:34
+#, fuzzy
+msgid "Sections:"
+msgstr "Segundos"
+
+#: addressbook/printing/e-contact-print.glade.h:35
+#, fuzzy
+msgid "Shading"
+msgstr "CabeГalhos:"
+
+#: addressbook/printing/e-contact-print.glade.h:36
+#, fuzzy
+msgid "Size:"
+msgstr "Tamanho"
+
+#: addressbook/printing/e-contact-print.glade.h:37
+#, fuzzy
+msgid "Start on a new page"
+msgstr "Enviar uma nova mensagem"
+
+#: addressbook/printing/e-contact-print.glade.h:38
+#, fuzzy
+msgid "Style name:"
+msgstr "Nome completo:"
+
+#: addressbook/printing/e-contact-print.glade.h:39
+#, fuzzy
+msgid "Top:"
+msgstr "Para:"
+
+#: addressbook/printing/e-contact-print.glade.h:40
+#, fuzzy
+msgid "Type:"
+msgstr "Para:"
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
+#: addressbook/printing/e-contact-print.glade.h:41
+msgid "Width:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:685
-#: calendar/conduits/todo/todo-conduit.c:500
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Imprimir..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:784
-#: calendar/conduits/calendar/calendar-conduit.c:787
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
+msgid "Could not read pilot's ToDo application block"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
 #, fuzzy
-msgid "Evolution ToDo Conduit"
+msgid "Evolution calendar executive summary component."
+msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Atalho para _barra do Evolution"
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:599
-#: calendar/conduits/todo/todo-conduit.c:602
-msgid "Could not read pilot's ToDo application block"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#, fuzzy
+msgid "Factory for the Calendar Summary component."
+msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the calendar iTip view control"
+msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the sample Calendar control"
+msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, c-format
+msgid "Notification about your appointment ending on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+msgid "Notification about your appointment"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, c-format
+msgid "Notification about your task starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, c-format
+msgid "Notification about your task ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+msgid "Notification about your task"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Cores"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "Tamanho"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "_Editar Compromisso"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "Nenhum sumАrio"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
 msgid "Reminder of your appointment at "
 msgstr ""
 
-#: calendar/gui/alarm-notify.c:876
+#: calendar/gui/alarm-notify/alarm-queue.c:991
 #, fuzzy
 msgid "Snooze"
 msgstr "Tamanho"
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-#: mail/mail-search-dialogue.c:104
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
 msgid "Ok"
 msgstr "Ok"
 
-#: calendar/gui/calendar-commands.c:245
-msgid "File not found"
-msgstr "Ficheiro nЦo encontrado"
+#: calendar/gui/alarm-notify/notify-main.c:58
+#, c-format
+msgid ""
+"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+"know."
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:269
-msgid "Open calendar"
-msgstr "Abrir calendАrio"
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "NЦo se consegui inicializar Bonobo"
 
-#: calendar/gui/calendar-commands.c:311
-msgid "Save calendar"
-msgstr "Gravar calendАrio"
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "NЦo se consegui inicializar Bonobo"
 
-#: calendar/gui/calendar-commands.c:448
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
+#: calendar/gui/alarm-notify/notify-main.c:115
+msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:332
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
+#: calendar/gui/calendar-commands.c:402
+msgid "%A %d %B %Y"
 msgstr ""
 
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
-msgid "%a %m/%d/%Y %H:%M:%S"
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
 msgstr ""
 
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
-msgid "%a %m/%d/%Y %I:%M:%S %p"
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+msgid "%a %d %b %Y"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:374
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:586
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
+msgstr ""
+
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:377
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 #, fuzzy
 msgid "Private"
 msgstr "Imprimir"
 
-#: calendar/gui/calendar-model.c:380
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:497
 #, fuzzy
 msgid "S"
 msgstr "Do"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:499
 #, fuzzy
 msgid "W"
 msgstr "Qa"
 
-#: calendar/gui/calendar-model.c:545
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
+#, fuzzy
+msgid "High"
+msgstr "CabeГalhos:"
+
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
+#, fuzzy
+msgid "Normal"
+msgstr "F_ormato"
+
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
+#, fuzzy
+msgid "Low"
+msgstr "Novo"
+
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 #, fuzzy
 msgid "Transparent"
 msgstr "Transportes"
 
-#: calendar/gui/calendar-model.c:548
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:774
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
+#, fuzzy
+msgid "Not Started"
+msgstr "_ComeГando"
+
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
+msgid "In Progress"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
+#, fuzzy
+msgid "Completed"
+msgstr "Cores"
+
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: camel/camel-service.c:580
+msgid "Cancelled"
+msgstr ""
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr ""
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1262,894 +2102,2620 @@ msgid ""
 "%s"
 msgstr ""
 
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
+#: calendar/gui/calendar-model.c:981
+msgid ""
+"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+msgstr ""
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
+msgid "None"
+msgstr "Nenhuma"
+
+#: calendar/gui/calendar-model.c:1087
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
 msgstr ""
 
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:893
-msgid "%I:%M:%S %p%n"
+#: calendar/gui/calendar-model.c:1127
+msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:896
-msgid "%H:%M:%S%n"
+#: calendar/gui/calendar-model.c:1168
+msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:900
-msgid "%I:%M %p%n"
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
+msgid "Undefined"
 msgstr ""
 
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:903
-msgid "%H:%M%n"
+#: calendar/gui/calendar-model.c:1222
+msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1023
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
+#: calendar/gui/calendar-model.c:1710
+msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1063
-msgid "The percent value must be between 0 and 100, inclusive"
+#: calendar/gui/calendar-model.c:1712
+msgid "Assigned"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
+msgid "Yes"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
+#, fuzzy
+msgid "No"
+msgstr "Novo"
+
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "_Novo"
+
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "Semana"
+
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "Semana"
+
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "MЙs"
+
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "O URI que o calendАrio mostrarА"
+
+#: calendar/gui/dialogs/alarm-options.c:354
+msgid "Audio Alarm Options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "SituaГЦo das mensagens"
+
+#: calendar/gui/dialogs/alarm-options.c:372
+msgid "Mail Alarm Options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "SituaГЦo das mensagens"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Esquecer _Senhas"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+msgid "Run program:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#, fuzzy
+msgid "days"
+msgstr "DiasRascunhos"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+msgid "extra times every"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#, fuzzy
+msgid "hours"
+msgstr "Horas"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#, fuzzy
+msgid "minutes"
+msgstr "Minutos"
+
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr "DiasRascunhos"
+
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr "Hoje"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr "Semanas"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr "Semana"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr "Horas"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr "Hora"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr "Minutos"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr "Minutos"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr " segundos"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr " segundos"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "Descartar esta mensagem?"
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an email"
+msgstr "Enviar"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr "Novo compromisso"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr "Novo compromisso"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr "Novo compromisso"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr "_Editar Compromisso"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "Colar"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+msgid "Date/Time:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Reminders"
+msgstr "Enviar"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+#, fuzzy
+msgid "Summary:"
+msgstr "SumАrio:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_OpГУes"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "after"
+msgstr "Data"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#, fuzzy
+msgid "day(s)"
+msgstr "DiasRascunhos"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+#, fuzzy
+msgid "end of appointment"
+msgstr "_Editar Compromisso"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+#, fuzzy
+msgid "hour(s)"
+msgstr "Horas"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#, fuzzy
+msgid "minute(s)"
+msgstr "Minutos"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+#, fuzzy
+msgid "start of appointment"
+msgstr "_Editar Compromisso"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#, fuzzy
+msgid "05 minutes"
+msgstr "Minutos"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
+#, fuzzy
+msgid "10 minutes"
+msgstr "Minutos"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
+#, fuzzy
+msgid "12 hour (am/pm)"
+msgstr "12 horas (AM/PM)"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
+#, fuzzy
+msgid "15 minutes"
+msgstr "Minutos"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
+#, fuzzy
+msgid "24 hour"
+msgstr "24 horas"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "30 minutes"
+msgstr "Minutos"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "60 minutes"
+msgstr "Minutos"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+msgid "Beep when alarm windows appear."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1103
-msgid "The priority must be between 1 and 9, inclusive"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
+#, fuzzy
+msgid "Calendar"
+msgstr "Novo Ca_lendАrio"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "Calendar Preferences"
+msgstr "PreferЙncias"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:97
-msgid "%A, %e %B %Y"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
-msgid "%I:%M%p"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+msgid "Colors for Tasks"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:302
-msgid "<b>Error loading calendar</b>"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "Compress weekends in month view"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:314
-msgid "<b>Error loading calendar:<br>Method not supported"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Date Navigator"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:484
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Defaults"
+msgstr "Apagar"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Display"
 msgstr "Dia"
 
-#: calendar/gui/calendar-summary.c:489
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "End of day:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+msgid "First day of week:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+msgid "Fri"
+msgstr "Sex"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 #, fuzzy
-msgid "Show appointments"
+msgid "Friday"
+msgstr "Sex"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+msgid "Mon"
+msgstr "Seg"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
+msgid "Monday"
+msgstr "Segunda-feira"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+msgid "Overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#, fuzzy
+msgid "Remind me of all appointments"
 msgstr "Compromisso - %s"
 
-#: calendar/gui/calendar-summary.c:497
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "Sat"
+msgstr "SАb"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 #, fuzzy
-msgid "Show tasks"
-msgstr "Ver _anexos"
+msgid "Saturday"
+msgstr "Domingo"
 
-#: calendar/gui/calendar-summary.c:583
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+msgid "Show appointment end times in week and month views"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 #, fuzzy
-msgid "Loading Calendar"
-msgstr "Imprimir calendАrio"
+msgid "Show week numbers"
+msgstr "Mostrar 1 semana"
 
-#: calendar/gui/control-factory.c:127
-msgid "The URI that the calendar will display"
-msgstr "O URI que o calendАrio mostrarА"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#, fuzzy
+msgid "Start of day:"
+msgstr "Hora de Мn_icio de encontro"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+msgid "Sun"
+msgstr "Dom"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
+msgid "Sunday"
+msgstr "Domingo"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "Lista de tarefas"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "Tasks due today"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+msgid "Thu"
+msgstr "Qui"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
+#, fuzzy
+msgid "Thursday"
+msgstr "Hoje"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Time"
+msgstr "_Pasta"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "Time divisions:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+msgid "Time format:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
-msgid "No summary available."
-msgstr "Nenhum sumАrio"
+msgid "Time zone:"
+msgstr "Nome completo:"
 
-#: calendar/gui/dialogs/delete-comp.c:63
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+msgid "Tue"
+msgstr "Ter"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
+#, fuzzy
+msgid "Tuesday"
+msgstr "Hoje"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+msgid "Wed"
+msgstr "Qua"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
+msgid "Wednesday"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:66
-msgid "Are you sure you want to delete this untitled appointment?"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
+msgstr "Semana"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+msgid "minutes before they occur."
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:72
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
-msgid "Are you sure you want to delete the task `%s'?"
+msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:75
-msgid "Are you sure you want to delete this untitled task?"
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:81
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
+msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:84
-msgid "Are you sure want to delete this untitled journal entry?"
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:690
-msgid "Edit Task"
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+#, fuzzy
+msgid " to "
+msgstr "Ir para"
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
-msgid "No summary"
-msgstr "Nenhum sumАrio"
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+msgid "Completed "
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+msgid "Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "_Editar Compromisso"
+
+#: calendar/gui/dialogs/comp-editor.c:454
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
+#: calendar/gui/dialogs/comp-editor.c:457
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
+#: calendar/gui/dialogs/comp-editor.c:460
 #, fuzzy, c-format
 msgid "Journal entry - %s"
 msgstr "_Entrada diАria?"
 
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
-msgid "Do you want to save changes?"
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Nenhum sumАrio"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:154
-msgid "Categories"
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:155
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
+#, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:87
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:93
+#, c-format
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:96
+msgid "Are you sure you want to delete this untitled task?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:102
+#, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:105
+msgid "Are you sure want to delete this untitled journal entry?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:120
+#, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:125
+#, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:130
+#, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr ""
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "_Items seleccionados"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Segundos"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+msgid "Time Zones"
+msgstr ""
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:154
+#, fuzzy
+msgid "Appointment"
+msgstr "Compromissos:"
+
+#: calendar/gui/dialogs/event-editor.c:159
+#, fuzzy
+msgid "Reminder"
+msgstr "Enviar"
+
+#: calendar/gui/dialogs/event-editor.c:164
+#, fuzzy
+msgid "Recurrence"
+msgstr "Apagar todas as ocurrЙncias"
+
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "Seg"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:156
-msgid "Completion Date"
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
+#, fuzzy
+msgid "Date & Time"
+msgstr "Data"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "Pri_vate"
+msgstr "Activar"
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
+msgid "Pu_blic"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 #, fuzzy
-msgid "End Date"
+msgid "Su_mmary:"
+msgstr "SumАrio:"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
+msgid "_Confidential"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:10
+#, fuzzy
+msgid "_End time:"
 msgstr "Hora de _fim de _encontro"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/dialogs/event-page.glade.h:11
 #, fuzzy
-msgid "Start Date"
+msgid "_Start time:"
 msgstr "Hora de Мn_icio de encontro"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "Geographical Position"
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Grupo %i"
+
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Fontes"
+
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+#, fuzzy
+msgid "Chair"
+msgstr "Carro"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+#, fuzzy
+msgid "Required Participant"
+msgstr "Pessoas _NecessЦrias"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "Prioridade"
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
 #, fuzzy
-msgid "Summary"
-msgstr "SumАrio"
+msgid "Needs Action"
+msgstr "Remover grupo"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Accepted"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
 #, fuzzy
-msgid "Transparency"
-msgstr "Transportes"
+msgid "Declined"
+msgstr "Receber"
 
-#: calendar/gui/e-calendar-table.c:165
-msgid "URL"
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
 #, fuzzy
-msgid "Alarms"
-msgstr "Alarmes"
+msgid "Delegated"
+msgstr "Apagar"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+msgid "In Process"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:397
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Chair Persons"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+msgid "Required Participants"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Optional Participants"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Non-Participants"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:891
+msgid "Sent By:"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:1442
 #, fuzzy
-msgid "Open..."
-msgstr "_Abrir"
+msgid "_Delegate To..."
+msgstr "Apagar"
 
-#: calendar/gui/e-calendar-table.c:398
-msgid "Open the task"
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:400
-msgid "Mark Complete"
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+msgid "Common Name"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:401
-msgid "Mark the task complete"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "Apagar"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "Apagar"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "Bip"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+msgid "Member"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:673 mail/mail-view.c:150
-msgid "Delete"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#, fuzzy
+msgid "Role"
+msgstr "TelemСvel"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Status"
+msgstr "SАb"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+#, fuzzy
+msgid "Organizer:"
+msgstr "OrganizaГЦo:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+msgid "_Change Organizer"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+msgid "_Invite Others"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+msgid "_Other Organizer"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+#, fuzzy
+msgid "on"
+msgstr "Seg"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+#, fuzzy
+msgid "day"
+msgstr "Hoje"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+#, fuzzy
+msgid "on the"
+msgstr "MЙs"
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+#, fuzzy
+msgid "th"
+msgstr "h"
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+#, fuzzy
+msgid "occurrences"
+msgstr "Apagar todas as ocurrЙncias"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#, fuzzy
+msgid "Custom recurrence"
+msgstr "Apagar todas as ocurrЙncias"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "Exceptions"
+msgstr "_AcГУes"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#, fuzzy
+msgid "No recurrence"
+msgstr "Apagar todas as ocurrЙncias"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#, fuzzy
+msgid "Preview"
+msgstr "Prever impressЦo"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+#, fuzzy
+msgid "Recurrence Rule"
+msgstr "Apagar todas as ocurrЙncias"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "Segunda-feira"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#, fuzzy
+msgid "for"
+msgstr "Hora"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#, fuzzy
+msgid "month(s)"
+msgstr "MЙs"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#, fuzzy
+msgid "until"
+msgstr "(Sem tМtulo)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#, fuzzy
+msgid "week(s)"
+msgstr "Semanas"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#, fuzzy
+msgid "year(s)"
+msgstr "Ano"
+
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "_Items seleccionados"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
 msgstr "Apagar"
 
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "Nenhuma"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:130
 #, fuzzy
-msgid "Delete the task"
+msgid "Task"
+msgstr "_Tarefa"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:14
+#, fuzzy
+msgid "Progress"
+msgstr "Propriedades do alarme"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
+#, fuzzy
+msgid "Sta_rt Date:"
+msgstr "Hora de Мn_icio de encontro"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:22
+#, fuzzy
+msgid "_Priority:"
+msgstr "Prioridade:"
+
+#: calendar/gui/dialogs/task-page.glade.h:23
+#, fuzzy
+msgid "_Status:"
+msgstr "SАb"
+
+#: calendar/gui/e-calendar-table.c:351
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:352
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:353
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:354
+#, c-format
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:355
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:356
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:357
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:358
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:359
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:360
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:361
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+#, fuzzy
+msgid "_Open"
+msgstr "_Abrir"
+
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+#, fuzzy
+msgid "C_ut"
+msgstr "Cortar"
+
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+#, fuzzy
+msgid "_Copy"
+msgstr "Copiar"
+
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+#, fuzzy
+msgid "_Paste"
+msgstr "Colar"
+
+#: calendar/gui/e-calendar-table.c:861
+msgid "_Mark as Complete"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Apagar este item"
 
-#: calendar/gui/e-day-view-time-item.c:517
+#: calendar/gui/e-calendar-table.c:866
+msgid "_Mark Tasks as Complete"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
+msgstr "Apagar este item"
+
+#: calendar/gui/e-calendar-table.c:1137
+#, fuzzy
+msgid "Click here to add a task"
+msgstr "Pressione aqui para o livro de endereГos"
+
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+#, fuzzy
+msgid "Alarms"
+msgstr "Alarmes"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+#, fuzzy
+msgid "Complete"
+msgstr "Cores"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+#, fuzzy
+msgid "End Date"
+msgstr "Hora de _fim de _encontro"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Prioridade"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+#, fuzzy
+msgid "Start Date"
+msgstr "Hora de Мn_icio de encontro"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+#, fuzzy
+msgid "Summary"
+msgstr "SumАrio"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "Lista de tarefas"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+#, fuzzy
+msgid "Transparency"
+msgstr "Transportes"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr ""
+
+#: calendar/gui/e-day-view-time-item.c:519
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
-#: calendar/gui/e-week-view-main-item.c:321
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr ""
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr ""
-
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
-#: calendar/gui/e-week-view-main-item.c:344
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
+#: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:610
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:609
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
-#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
-#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
-msgid "New appointment..."
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
-#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
-msgid "Edit this appointment..."
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
-msgid "Delete this appointment"
-msgstr ""
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+#, fuzzy
+msgid "Go to _Today"
+msgstr "Hoje"
 
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
-msgid "Make this appointment movable"
-msgstr ""
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
+msgstr "Ir para a _pasta..."
+
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
+msgstr "Novo compromisso"
 
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
-msgid "Delete this occurrence"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Apagar esta ocurrЙncia"
 
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
-msgid "Delete all occurrences"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
+msgstr "Apagar esta ocurrЙncia"
+
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "Apagar todas as ocurrЙncias"
 
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
-#: calendar/gui/e-tasks.c:492
-msgid "All"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:146
-msgid "Category:"
+#: calendar/gui/e-itip-control.c:697
+msgid "This is a meeting request."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:285
-#, fuzzy, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Criar um novo calendАrio"
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
+msgstr ""
 
-#: calendar/gui/e-tasks.c:297
-#, c-format
-msgid "The method required to load `%s' is not supported"
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
 msgstr ""
 
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
 msgstr ""
 
-#: calendar/gui/event-editor.c:331
-msgid "Edit Appointment"
-msgstr "_Editar Compromisso"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
 
-#: calendar/gui/event-editor.c:409
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 #, fuzzy
-msgid "on"
-msgstr "Seg"
+msgid "The message is not understandable."
+msgstr "Ficheiro nЦo encontrado"
+
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
+#: calendar/gui/e-itip-control.c:740
 #, fuzzy
-msgid "day"
-msgstr "Hoje"
+msgid "This is a task request."
+msgstr "_Pedido de tarefa"
 
-#: calendar/gui/event-editor.c:435
-msgid "Monday"
-msgstr "Segunda-feira"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
 
-#: calendar/gui/event-editor.c:436
-#, fuzzy
-msgid "Tuesday"
-msgstr "Hoje"
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/event-editor.c:437
-msgid "Wednesday"
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
 msgstr ""
 
-#: calendar/gui/event-editor.c:438
-#, fuzzy
-msgid "Thursday"
-msgstr "Hoje"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/event-editor.c:439
-#, fuzzy
-msgid "Friday"
-msgstr "Sex"
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:834
+msgid "The message does not appear to be properly formed"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/event-editor.c:440
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1015
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:4
 #, fuzzy
-msgid "Saturday"
-msgstr "Domingo"
+msgid "Calendar Message"
+msgstr "Novo Ca_lendАrio"
 
-#: calendar/gui/event-editor.c:441
-msgid "Sunday"
-msgstr "Domingo"
+#: calendar/gui/e-itip-control.glade.h:5
+#, fuzzy
+msgid "Date:"
+msgstr "Data"
 
-#: calendar/gui/event-editor.c:561
+#: calendar/gui/e-itip-control.glade.h:7
 #, fuzzy
-msgid "on the"
-msgstr "MЙs"
+msgid "Loading Calendar"
+msgstr "Imprimir calendАrio"
 
-#: calendar/gui/event-editor.c:568
+#: calendar/gui/e-itip-control.glade.h:8
 #, fuzzy
-msgid "th"
-msgstr "h"
+msgid "Loading calendar..."
+msgstr "Imprimir calendАrio"
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/e-itip-control.glade.h:10
 #, fuzzy
-msgid "occurrences"
-msgstr "Apagar todas as ocurrЙncias"
+msgid "Server Message:"
+msgstr "Encontrar mensagens"
 
-#: calendar/gui/event-editor.c:839
-msgid "This appointment contains recurrences that Evolution cannot edit."
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
 msgstr ""
 
-#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
-msgid "%a %b %d %Y"
+#: calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
+msgid "All"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:252
+msgid "Category:"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:403
+#, fuzzy, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "Criar um novo calendАrio"
+
+#: calendar/gui/e-tasks.c:415
+#, c-format
+msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:696
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
+msgid "%d %B"
+msgstr ""
+
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "Novo compromisso"
+
+#: calendar/gui/gnome-cal.c:999
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Criar um novo calendАrio"
 
-#: calendar/gui/gnome-cal.c:707
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Dom"
+#: calendar/gui/goto-dialog.glade.h:1
+#, fuzzy
+msgid "April"
+msgstr "_Correio"
 
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Seg"
+#: calendar/gui/goto-dialog.glade.h:2
+msgid "August"
+msgstr ""
 
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Ter"
+#: calendar/gui/goto-dialog.glade.h:3
+msgid "December"
+msgstr ""
 
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Qua"
+#: calendar/gui/goto-dialog.glade.h:4
+msgid "February"
+msgstr ""
 
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Qui"
+#: calendar/gui/goto-dialog.glade.h:5
+#, fuzzy
+msgid "Go To Date"
+msgstr "Hoje"
 
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Sex"
+#: calendar/gui/goto-dialog.glade.h:6
+msgid "January"
+msgstr ""
 
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "SАb"
+#: calendar/gui/goto-dialog.glade.h:7
+msgid "July"
+msgstr ""
 
-#: calendar/gui/main.c:50
+#: calendar/gui/goto-dialog.glade.h:8
+msgid "June"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:9
 #, fuzzy
-msgid "Could not initialize GNOME"
-msgstr "NЦo se consegui inicializar Bonobo"
+msgid "March"
+msgstr "Ano"
+
+#: calendar/gui/goto-dialog.glade.h:10
+#, fuzzy
+msgid "May"
+msgstr "Segunda-feira"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/goto-dialog.glade.h:11
+msgid "November"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "October"
+msgstr "Outro"
+
+#: calendar/gui/goto-dialog.glade.h:13
+msgid "September"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Hoje"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26╨"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27╨"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28╨"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29╨"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30╨"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31╨"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Sg"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Te"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "Qa"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Qi"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Sx"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "SА"
 
-#: calendar/gui/print.c:941
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
 #, fuzzy
 msgid "Tasks"
 msgstr "_Tarefa"
 
 #. Day
-#: calendar/gui/print.c:1071
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1086
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1097
+#: calendar/gui/print.c:1846
 #, fuzzy, c-format
-msgid "Current week (%s - %s)"
+msgid "Selected week (%s - %s)"
 msgstr "Ano corrente (%Y)"
 
 #. Month
-#: calendar/gui/print.c:1105
+#: calendar/gui/print.c:1854
 #, fuzzy
-msgid "Current month (%b %Y)"
+msgid "Selected month (%b %Y)"
 msgstr "MЙs corrente (%a %Y)"
 
 #. Year
-#: calendar/gui/print.c:1112
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Ano corrente (%Y)"
 
-#: calendar/gui/print.c:1149
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Imprimir calendАrio"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Prever impressЦo"
 
-#: calendar/gui/tasks-control.c:105
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Imprimir este item"
+
+#: calendar/gui/print.c:2398
+#, fuzzy
+msgid "Print Setup"
+msgstr "Imprimir..."
+
+#: calendar/gui/tasks-control.c:126
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "O URI que o calendАrio mostrarА"
 
-#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
+#: calendar/gui/tasks-migrate.c:106
+msgid ""
+"Evolution has taken the tasks that were in your calendar folder and "
+"automatically migrated them to the new tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:109
+msgid ""
+"Evolution has tried to take the tasks that were in your calendar folder and "
+"migrate them to the new tasks folder.\n"
+"Some of the tasks could not be migrated, so this process may be attempted "
+"again in the future."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:121
+#, c-format
+msgid ""
+"Could not open `%s'; no items from the calendar folder will be migrated to "
+"the tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:134
+#, c-format
+msgid ""
+"The method required to load `%s' is not supported; no items from the "
+"calendar folder will be migrated to the tasks folder."
+msgstr ""
+
+#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
 msgid "SMTWTFS"
 msgstr ""
 
+#: camel/camel-cipher-context.c:171
+msgid "Signing is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:211
+msgid "Clearsigning is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:251
+msgid "Verifying is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:294
+msgid "Encryption is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:336
+msgid "Decryption is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
+#, fuzzy
+msgid "Syncing folders"
+msgstr "Sincronizar"
+
+#: camel/camel-filter-driver.c:644
+#, fuzzy
+msgid "Unable to open spool folder"
+msgstr "ImpossМvel abrir o livro de endereГos"
+
+#: camel/camel-filter-driver.c:653
+#, fuzzy
+msgid "Unable to process spool folder"
+msgstr "ImpossМvel abrir o livro de endereГos"
+
+#: camel/camel-filter-driver.c:667
+#, fuzzy
+msgid "Getting message %d (%d%%)"
+msgstr "Enviar esta mensagem"
+
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, fuzzy, c-format
+msgid "Failed on message %d"
+msgstr "Enviar esta mensagem"
+
+#: camel/camel-filter-driver.c:672
+#, fuzzy
+msgid "Cannot open message"
+msgstr "Encontrar mensagens"
+
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
+#, fuzzy
+msgid "Syncing folder"
+msgstr "Sincronizar"
+
+#: camel/camel-filter-driver.c:766
+#, fuzzy, c-format
+msgid "Getting message %d of %d"
+msgstr "Enviar esta mensagem"
+
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
+#, fuzzy, c-format
+msgid "Failed at message %d of %d"
+msgstr "Enviar esta mensagem"
+
+#: camel/camel-filter-driver.c:892
+#, fuzzy, c-format
+msgid "Error parsing filter: %s: %s"
+msgstr "Erro a gravar os atalhos."
+
+#: camel/camel-filter-driver.c:898
+#, fuzzy, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "Erro a gravar os atalhos."
+
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
+#, fuzzy, c-format
+msgid "Error executing filter search: %s: %s"
+msgstr "Erro a gravar os atalhos."
+
+#: camel/camel-folder-search.c:328
+#, fuzzy, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr "NЦo consigo abrir a localizaГЦo: %s"
+
+#: camel/camel-folder-search.c:338
+#, fuzzy, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr "Erro a gravar os atalhos."
+
+#: camel/camel-folder-search.c:485 camel/camel-folder-search.c:513
+msgid "(match-all) requires a single bool result"
+msgstr ""
+
+#: camel/camel-folder-search.c:559
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
+
+#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+msgid "Invalid type in body-contains, expecting string"
+msgstr ""
+
+#: camel/camel-lock-client.c:110
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "NЦo consigo abrir a localizaГЦo: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "Criar um novo calendАrio"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:199
+#: camel/camel-lock.c:201
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:253
+#: camel/camel-lock.c:255
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:99
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:146
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:156
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:197
+#: camel/camel-movemail.c:159
+#, c-format
+msgid "Failed to store mail in temp file %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:189
 #, c-format
-msgid "Could not test lock file for %s: %s"
+msgid "Could not create pipe: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:201
+#, c-format
+msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:243
+#: camel/camel-movemail.c:239
+#, c-format
+msgid "Movemail program failed: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:240
+msgid "(Unknown error)"
+msgstr ""
+
+#: camel/camel-movemail.c:263
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:254
+#: camel/camel-movemail.c:274
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:272
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#, fuzzy, c-format
+msgid "Error copying mail temp file: %s"
+msgstr "Erro a gravar os atalhos."
+
+#: camel/camel-pgp-context.c:193
 #, c-format
-msgid "Failed to store mail in temp file %s: %s"
+msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: camel/camel-movemail.c:304
+#: camel/camel-pgp-context.c:196
 #, c-format
-msgid "Could not create pipe: %s"
+msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-movemail.c:316
-#, c-format
-msgid "Could not fork: %s"
+#: camel/camel-pgp-context.c:518
+msgid "No plaintext to sign."
 msgstr ""
 
-#: camel/camel-movemail.c:354
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
+msgid "No password provided."
+msgstr ""
+
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
-msgid "Movemail program failed: %s"
+msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:355
-msgid "(Unknown error)"
+#: camel/camel-pgp-context.c:693
+msgid "No plaintext to clearsign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:886
+msgid "No plaintext to verify."
+msgstr ""
+
+#: camel/camel-pgp-context.c:903
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Criar um novo calendАrio"
+
+#: camel/camel-pgp-context.c:1063
+msgid "No plaintext to encrypt."
+msgstr ""
+
+#: camel/camel-pgp-context.c:1089
+msgid "No recipients specified"
 msgstr ""
 
-#: camel/camel-provider.c:133
+#: camel/camel-pgp-context.c:1280
+msgid "No ciphertext to decrypt."
+msgstr ""
+
+#: camel/camel-provider.c:131
+#, c-format
+msgid "Could not load %s: Module loading not supported on this system."
+msgstr ""
+
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:184
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:188
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:318
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
-#: camel/providers/smtp/camel-smtp-transport.c:160
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
-#: camel/camel-remote-store.c:556
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Abrir calendАrio"
 
-#: camel/camel-service.c:137
+#: camel/camel-remote-store.c:489
+msgid "Server unexpectedly disconnected"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:33
+msgid "Anonymous"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:35
+msgid "This option will connect to the server using an anonymous login."
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
+#, fuzzy
+msgid "Authentication failed."
+msgstr "AutenticaГЦo"
+
+#: camel/camel-sasl-anonymous.c:119
+#, c-format
+msgid ""
+"Invalid email address trace information:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:131
+#, c-format
+msgid ""
+"Invalid opaque trace information:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:143
+#, c-format
+msgid ""
+"Invalid trace information:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-cram-md5.c:35
+msgid "CRAM-MD5"
+msgstr ""
+
+#: camel/camel-sasl-cram-md5.c:37
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:43
+msgid "DIGEST-MD5"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:45
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:810
+msgid "Server challenge too long (>2048 octets)\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:819
+msgid "Server challenge invalid\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:825
+msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:847
+msgid "Server response did not contain authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:865
+msgid "Server response contained incomplete authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:875
+msgid "Server response does not match\n"
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:40
+msgid "Kerberos 4"
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:42
+msgid "This option will connect to the server using Kerberos 4 authentication."
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:161
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:440
+msgid "Bad authentication response from server."
+msgstr ""
+
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
+msgstr ""
+
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
+msgid "This option will connect to the server using a simple password."
+msgstr ""
+
+#: camel/camel-sasl-login.c:127
+#, fuzzy
+msgid "Unknown authentication state."
+msgstr "AutenticaГЦo"
+
+#: camel/camel-search-private.c:111
+#, c-format
+msgid "Regular expression compilation failed: %s: %s"
+msgstr ""
+
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:146
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:155
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:520
+#: camel/camel-service.c:548
+#, c-format
+msgid "Resolving: %s"
+msgstr ""
+
+#: camel/camel-service.c:575
 #, c-format
-msgid "No such host %s."
+msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:523
+#: camel/camel-service.c:600
 #, c-format
-msgid "Temporarily unable to look up hostname %s."
+msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-session.c:299
+#: camel/camel-service.c:602
+#, c-format
+msgid "Host lookup failed: %s: unknown reason"
+msgstr ""
+
+#: camel/camel-session.c:68
+msgid "Virtual folder email provider"
+msgstr ""
+
+#: camel/camel-session.c:70
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:390
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-url.c:75
+#: camel/camel-smime-context.c:173
 #, c-format
-msgid "URL string `%s' contains no protocol"
+msgid "Please enter your password for %s"
+msgstr ""
+
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
 msgstr ""
 
-#: camel/camel-url.c:90
+#: camel/camel-smime-context.c:209
 #, c-format
-msgid "URL string `%s' contains an invalid protocol"
+msgid "The signature certificate for \"%s\" does not exist."
 msgstr ""
 
-#: camel/camel-url.c:150
+#: camel/camel-smime-context.c:249
 #, c-format
-msgid "Port number in URL `%s' is non-numeric"
+msgid "The encryption certificate for \"%s\" does not exist."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:133
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
 #, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr ""
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
+#, fuzzy
+msgid "Failed to decode message."
+msgstr "Anexar um ficheiro Ю mensagem"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
+#, fuzzy, c-format
 msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
+"Issuer: %s\n"
+"Subject: %s"
+msgstr "Assunto"
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
+
+#: camel/camel-url.c:289
+#, fuzzy, c-format
+msgid "Could not parse URL `%s'"
+msgstr "Criar um novo calendАrio"
+
+#: camel/camel-vee-folder.c:452
+#, fuzzy, c-format
+msgid "No such message %s in %s"
+msgstr "Enviar a mensagem"
+
+#: camel/camel-vee-folder.c:547
+#, fuzzy, c-format
+msgid "No such message: %s"
+msgstr "Enviar a mensagem"
+
+#: camel/camel-vtrash-folder.c:109
+msgid "You cannot copy messages from this trash folder."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
-msgid "Unknown error"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:433
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:469
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:198
+#: camel/providers/imap/camel-imap-folder.c:192
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
+msgstr ""
+
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "Enviar uma nova mensagem"
+
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
+msgid "This message is not currently available"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Encontrar mensagens"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:39
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, fuzzy, c-format
+msgid "Could not open cache directory: %s"
+msgstr "Criar um novo calendАrio"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
+#, fuzzy
+msgid "Checking for new mail"
+msgstr "Verificar novo correio"
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Check for new messages in all folders"
+msgstr "Verificar novo correio"
+
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
+msgid "Folders"
+msgstr "_Pastas"
+
+#: camel/providers/imap/camel-imap-provider.c:50
+msgid "Show only subscribed folders"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:52
+msgid "Override server-supplied folder namespace"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:54
+#, fuzzy
+msgid "Namespace"
+msgstr "Responder"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Apply filters to new messages in INBOX on this server"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAPv4"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:41
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:251
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:260
-msgid "Kerberos 4"
+#: camel/providers/imap/camel-imap-store.c:463
+#, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:262
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr ""
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
+#, fuzzy, c-format
+msgid "No support for authentication type %s"
+msgstr "AutenticaГЦo"
 
-#: camel/providers/imap/camel-imap-store.c:361
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:389
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
+msgid "You didn't enter a password."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2157,709 +4723,1028 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:645
-#, c-format
-msgid "Could not create directory %s: %s"
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#, fuzzy, c-format
+msgid "No such folder %s"
+msgstr "Enviar a mensagem"
+
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:36
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:37
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:47
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:48
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:58
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:122
+#: camel/providers/local/camel-local-provider.c:70
+msgid "Unix mbox spool-format mail files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:71
+msgid "For storing local mail in standard Unix spool directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-store.c:134
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
+#: camel/providers/local/camel-local-store.c:173
+msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:200
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:256
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:297
+#: camel/providers/local/camel-local-store.c:279
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:306
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
+msgid "Unable to add message to summary: unknown reason"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 #, fuzzy
 msgid "No such message"
 msgstr "Enviar a mensagem"
 
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
+#: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-maildir-store.c:114
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:128
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
+#: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:158
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:201
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr "Criar um novo calendАrio"
+
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
+#, fuzzy, c-format
+msgid "Cannot open maildir directory path: %s: %s"
+msgstr "NЦo consigo abrir a localizaГЦo: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
+#, fuzzy, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "NЦo consigo abrir a localizaГЦo: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "NЦo consigo abrir a localizaГЦo: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:257
+#: camel/providers/local/camel-mbox-folder.c:259
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:117
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:234
+#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
+#. it should try and merge the summary info's.  This is a bit tricky.
+#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
+#, fuzzy
+msgid "Summarising folder"
+msgstr "Sincronizar"
+
+#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:268
+#: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:477
-#: camel/providers/local/camel-mbox-summary.c:668
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
+#, fuzzy
+msgid "Synchronising folder"
+msgstr "Sincronizar"
+
+#: camel/providers/local/camel-mbox-summary.c:507
+#: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:493
+#: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, fuzzy, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "NЦo consigo abrir a localizaГЦo: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:514
-#: camel/providers/local/camel-mbox-summary.c:522
-#: camel/providers/local/camel-mbox-summary.c:701
-#: camel/providers/local/camel-mbox-summary.c:709
+#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:557
+#: camel/providers/local/camel-mbox-summary.c:746
+#: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:565
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:759
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:609
+#: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:830
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-store.c:116
+#: camel/providers/local/camel-mh-store.c:110
 #, c-format
 msgid "`%s' is not a directory."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:41
+#: camel/providers/local/camel-mh-summary.c:218
+#, fuzzy, c-format
+msgid "Cannot open MH directory path: %s: %s"
+msgstr "NЦo consigo abrir a localizaГЦo: %s"
+
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "NЦo consigo abrir a localizaГЦo: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:159
+#, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:176
+msgid "Spool stores do not have an inbox"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Erro a gravar os atalhos."
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "Criar um novo calendАrio"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "Criar um novo calendАrio"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:62
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:68
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:77
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, fuzzy, c-format
 msgid "Message %s not found."
 msgstr "Ficheiro nЦo encontrado"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:38
+#: camel/providers/nntp/camel-nntp-provider.c:42
 msgid "USENET news"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:44
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:226
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:288
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:295
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:180
+#: camel/providers/pop3/camel-pop3-folder.c:149
+#, fuzzy
+msgid "Retrieving POP summary"
+msgstr "Encontrar mensagens"
+
+#: camel/providers/pop3/camel-pop3-folder.c:155
+#, fuzzy, c-format
+msgid "Could not check POP server for new messages: %s"
+msgstr "Criar uma nova mensagem"
+
+#: camel/providers/pop3/camel-pop3-folder.c:199
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:274
+#: camel/providers/pop3/camel-pop3-folder.c:292
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:288
+#: camel/providers/pop3/camel-pop3-folder.c:296
+#, fuzzy, c-format
+msgid "Retrieving POP message %d"
+msgstr "Enviar esta mensagem"
+
+#: camel/providers/pop3/camel-pop3-folder.c:303
+#, fuzzy, c-format
+msgid "Could not fetch message: %s"
+msgstr "Criar uma nova mensagem"
+
+#: camel/providers/pop3/camel-pop3-folder.c:320
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:34
+#: camel/providers/pop3/camel-pop3-provider.c:37
+#, fuzzy
+msgid "Message storage"
+msgstr "SituaГЦo das mensagens"
+
+#: camel/providers/pop3/camel-pop3-provider.c:39
+#, fuzzy
+msgid "Leave messages on server"
+msgstr "Gravar a mensagem na pasta especificada"
+
+#: camel/providers/pop3/camel-pop3-provider.c:41
+#, fuzzy, c-format
+msgid "Delete after %s day(s)"
+msgstr "Apagar este item"
+
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:36
+#: camel/providers/pop3/camel-pop3-provider.c:50
 msgid ""
 "For connecting to POP servers. The POP protocol can also be used to retrieve "
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:158
+#: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:170
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:215
+#, fuzzy, c-format
+msgid "Could not connect to server: %s"
+msgstr "Criar um novo calendАrio"
+
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:375
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:394
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:397
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:424
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:432
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:541
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Sendmail"
 msgstr "Enviar"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: camel/providers/sendmail/camel-sendmail-provider.c:39
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#: camel/providers/sendmail/camel-sendmail-transport.c:107
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#: camel/providers/sendmail/camel-sendmail-transport.c:124
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#: camel/providers/sendmail/camel-sendmail-transport.c:150
 #, fuzzy, c-format
 msgid "Could not send message: %s"
 msgstr "Criar uma nova mensagem"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#: camel/providers/sendmail/camel-sendmail-transport.c:163
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#: camel/providers/sendmail/camel-sendmail-transport.c:170
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#: camel/providers/sendmail/camel-sendmail-transport.c:175
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
+#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#, fuzzy
+msgid "Could not find 'From' address in message"
+msgstr "Criar uma nova mensagem"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
+#: camel/providers/sendmail/camel-sendmail-transport.c:249
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
+msgid "SMTP"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
+#: camel/providers/smtp/camel-smtp-provider.c:40
+msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:170
+msgid "Syntax error, command unrecognized"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:172
+msgid "Syntax error in parameters or arguments"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:174
+msgid "Command not implemented"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:176
+msgid "Command parameter not implemented"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:178
+msgid "System status, or system help reply"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:180
+#, fuzzy
+msgid "Help message"
+msgstr "Encontrar mensagens"
+
+#: camel/providers/smtp/camel-smtp-transport.c:182
+#, fuzzy
+msgid "Service ready"
+msgstr "Servidor:"
+
+#: camel/providers/smtp/camel-smtp-transport.c:184
+msgid "Service closing transmission channel"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:186
+msgid "Service not available, closing transmission channel"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:188
+msgid "Requested mail action okay, completed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:190
+msgid "User not local; will forward to <forward-path>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:192
+msgid "Requested mail action not taken: mailbox unavailable"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:194
+msgid "Requested action not taken: mailbox unavailable"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:196
+msgid "Requested action aborted: error in processing"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:198
+msgid "User not local; please try <forward-path>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:200
+msgid "Requested action not taken: insufficient system storage"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:202
+msgid "Requested mail action aborted: exceeded storage allocation"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:204
+msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:279
+#: camel/providers/smtp/camel-smtp-transport.c:206
+msgid "Start mail input; end with <CRLF>.<CRLF>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:208
+msgid "Transaction failed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:212
+msgid "A password transition is needed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:214
+msgid "Authentication mechanism is too weak"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:216
+msgid "Encryption required for requested authentication mechanism"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:218
 #, fuzzy
-msgid "No authentication required"
+msgid "Temporary authentication failure"
 msgstr "AutenticaГЦo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
+#: camel/providers/smtp/camel-smtp-transport.c:220
+#, fuzzy
+msgid "Authentication required"
+msgstr "AutenticaГЦo"
+
+#: camel/providers/smtp/camel-smtp-transport.c:315
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:290
-#: camel/providers/smtp/camel-smtp-transport.c:295
-msgid "CRAM-MD5"
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, c-format
+msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:292
+#: camel/providers/smtp/camel-smtp-transport.c:397
+#, c-format
+msgid "%sPlease enter the SMTP password for %s@%s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:420
+#, c-format
 msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:320
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:322
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:347
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#, fuzzy
+msgid "Sending message"
+msgstr "Mensagens enviadas"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:462
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:478
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:744
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "AutenticaГЦo"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
+#, c-format
+msgid "AUTH request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:782
+msgid "AUTH request failed."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
+msgid "Bad authentication response from server.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:574
-msgid "RCPT TO response error: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:920
+#, c-format
+msgid "RCPT TO response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:620
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:635
-#: camel/providers/smtp/camel-smtp-transport.c:653
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:693
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:709
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:732
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:87
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:96
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:100
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 #, fuzzy
 msgid "attachment"
 msgstr "Anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:413
-msgid "Attach a file"
-msgstr "Anexar um ficheiro"
-
-#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
-#: shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Remover"
-
-#: composer/e-msg-composer-attachment-bar.c:461
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "Remover items seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Adicionar anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "Anexar um ficheiro Ю mensagem"
 
-#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
-#: mail/mail-format.c:624
+#: composer/e-msg-composer-attachment.glade.h:1
 #, fuzzy
-msgid "From:"
-msgstr "De"
+msgid "Attachment properties"
+msgstr "Propriedades do alarme"
 
-#: composer/e-msg-composer-hdrs.c:257
+#: composer/e-msg-composer-attachment.glade.h:3
+#, fuzzy
+msgid "File name:"
+msgstr "Nome completo:"
+
+#: composer/e-msg-composer-attachment.glade.h:4
+msgid "MIME type:"
+msgstr ""
+
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "Pressione aqui para o livro de endereГos"
 
-#: composer/e-msg-composer-hdrs.c:313
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:359
 #, fuzzy
-msgid "Enter the identity you wish to send this message from"
-msgstr "Introduza os receptores da mensagem"
+msgid "From:"
+msgstr "De"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:365
+#, fuzzy
+msgid "Reply-To:"
+msgstr "Responder"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:376
+msgid "Subject:"
+msgstr "Assunto:"
 
-#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:318
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "Introduza os receptores da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Entre os endereГos que irЦo receber uma cСpia da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:328
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:329
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -2867,192 +5752,284 @@ msgstr ""
 "Entre os endereГos que irЦo receber uma cСpia da mensagem sem conhecimento "
 "do receptor"
 
-#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
-msgid "Subject:"
-msgstr "Assunto:"
-
-#: composer/e-msg-composer-hdrs.c:336
-msgid "Enter the subject of the mail"
-msgstr "Introduza o assunto da carta"
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Anexar um ficheiro"
 
-#: composer/e-msg-composer.c:430
+#: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:598
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr "Erro a gravar os atalhos."
+
+#: composer/e-msg-composer.c:873
 #, fuzzy
 msgid "Save as..."
 msgstr "Gravar como VCard"
 
-#: composer/e-msg-composer.c:609
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "Seg"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: composer/e-msg-composer.c:629
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:651
-#, fuzzy
-msgid "Saving changes to message..."
-msgstr "Enviar uma nova mensagem"
+#: composer/e-msg-composer.c:997
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
 
-#: composer/e-msg-composer.c:653
-#, fuzzy
-msgid "Save changes to message..."
-msgstr "Enviar uma nova mensagem"
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Erro a gravar os atalhos."
 
-#: composer/e-msg-composer.c:694
+#: composer/e-msg-composer.c:1055
+msgid "Unable to retrieve message from editor"
+msgstr ""
+
+#: composer/e-msg-composer.c:1061
 #, c-format
-msgid "Error saving composition to 'Drafts': %s"
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
-msgid "Evolution"
-msgstr "Evolution"
+#: composer/e-msg-composer.c:1067
+#, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
 
-#: composer/e-msg-composer.c:758
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr "Erro a gravar os atalhos."
+
+#: composer/e-msg-composer.c:1173
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:783
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:909
-msgid "That file does not exist."
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "_Inserir"
+
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+msgid "Compose a message"
+msgstr "Criar uma nova mensagem"
+
+#: composer/e-msg-composer.c:2351
+msgid "Could not create composer window."
+msgstr ""
+
+#: composer/evolution-composer.c:359
+msgid ""
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
+msgstr ""
+
+#: composer/evolution-composer.c:374
+#, fuzzy
+msgid "Cannot initialize Evolution's composer."
+msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+
+#: data/evolution.desktop.in.h:2
+#, fuzzy
+msgid "The Evolution groupware suite"
+msgstr "Atalho para _barra do Evolution"
+
+#: data/evolution.keys.in.h:1
+#, fuzzy
+msgid "address card"
+msgstr "EndereГo"
+
+#: data/evolution.keys.in.h:2
+#, fuzzy
+msgid "calendar information"
+msgstr "Nenhuma InformaГЦo"
+
+#. strptime format for a date.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1480
+msgid "%m/%d/%Y"
 msgstr ""
 
-#: composer/e-msg-composer.c:919
-msgid "That is not a regular file."
+#. strptime format for a time of day, in 12-hour format.
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+msgid "%I:%M:%S %p"
 msgstr ""
 
-#: composer/e-msg-composer.c:929
-msgid "That file exists but is not readable."
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+msgid "%H:%M:%S"
 msgstr ""
 
-#: composer/e-msg-composer.c:939
-msgid "That file appeared accesible but open(2) failed."
+#. strptime format for time of day, without seconds, 12-hour format.
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
 msgstr ""
 
-#: composer/e-msg-composer.c:961
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
 msgstr ""
 
-#: composer/e-msg-composer.c:982
-msgid "An error occurred while reading the file."
+#: e-util/e-time-utils.c:240
+msgid "%d/%m/%Y"
 msgstr ""
 
-#: composer/e-msg-composer.c:1362
-msgid "Compose a message"
-msgstr "Criar uma nova mensagem"
+#: e-util/e-time-utils.c:241
+msgid "%Y/%m/%d"
+msgstr ""
 
-#: composer/e-msg-composer.c:1439
-msgid "Could not create composer window."
+#: e-util/e-time-utils.c:242
+#, c-format
+msgid "%x"
 msgstr ""
 
-#: composer/evolution-composer.c:346
-#, fuzzy
-msgid "Cannot initialize Evolution's composer."
-msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:298
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
+msgid "%a %m/%d/%Y"
+msgstr ""
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:303
+msgid "%a %m/%d/%Y %H:%M"
+msgstr ""
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:312
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr ""
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:80
 #, fuzzy
 msgid "year"
 msgstr "Ano"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:80
 #, fuzzy
 msgid "years"
 msgstr "Ano"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:81
 #, fuzzy
 msgid "month"
 msgstr "MЙs"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:81
 #, fuzzy
 msgid "months"
 msgstr "MЙs"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:82
 #, fuzzy
 msgid "week"
 msgstr "Semana"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:82
 #, fuzzy
 msgid "weeks"
 msgstr "Semanas"
 
-#: filter/filter-datespec.c:65
-#, fuzzy
-msgid "days"
-msgstr "DiasRascunhos"
-
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:84
 #, fuzzy
 msgid "hour"
 msgstr "Hora"
 
-#: filter/filter-datespec.c:66
-#, fuzzy
-msgid "hours"
-msgstr "Horas"
-
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:85
 #, fuzzy
 msgid "minute"
 msgstr "Minuto"
 
-#: filter/filter-datespec.c:67
-#, fuzzy
-msgid "minutes"
-msgstr "Minutos"
-
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:86
 #, fuzzy
 msgid "second"
 msgstr " segundos"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:86
 #, fuzzy
 msgid "seconds"
 msgstr " segundos"
 
-#: filter/filter-datespec.c:183
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:185
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
-#: filter/filter-datespec.c:259
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
 
-#: filter/filter-datespec.c:282
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:322
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -3060,546 +6037,838 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr ""
 
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:358
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr ""
 
 #. The label
-#: filter/filter-datespec.c:416
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr ""
 
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
+#: filter/filter-datespec.c:575
+msgid " ago"
 msgstr ""
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
+#: filter/filter-datespec.c:621
+msgid "ago"
 msgstr ""
 
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr ""
-
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr ""
-
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
+#: filter/filter-datespec.c:709
+msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-editor.c:456
-msgid "Edit Filters"
+#: filter/filter-editor.c:132 filter/filter.glade.h:6
+msgid "Filter Rules"
 msgstr ""
 
 #. and now for the action area
-#: filter/filter-filter.c:401
+#: filter/filter-filter.c:452
 #, fuzzy
 msgid "Then"
 msgstr "Qi"
 
-#: filter/filter-filter.c:414
+#: filter/filter-filter.c:466
 #, fuzzy
 msgid "Add action"
 msgstr "_AcГУes"
 
-#: filter/filter-filter.c:420
-#, fuzzy
-msgid "Remove action"
-msgstr "Remover grupo"
-
-#: filter/filter-folder.c:143
+#: filter/filter-folder.c:147
 msgid ""
 "Oops, you forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 #, fuzzy
 msgid "Select Folder"
 msgstr "_Nova pasta"
 
-#: filter/filter-folder.c:243
+#: filter/filter-folder.c:250
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:289
+#: filter/filter-folder.c:296
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-input.c:185
+#: filter/filter-input.c:193
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
-#, c-format
-msgid "Failed to perform regex search on message header: %s"
-msgstr ""
-
-#: filter/filter-part.c:467
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:530
+#: filter/filter-rule.c:626
 #, fuzzy
 msgid "Rule name: "
 msgstr "Nome completo:"
 
-#: filter/filter-rule.c:534
+#: filter/filter-rule.c:630
 #, fuzzy
 msgid "Untitled"
 msgstr "(Sem tМtulo)"
 
-#: filter/filter-rule.c:550
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:567
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:571
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:587
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:593
+#: filter/filter-rule.c:771
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:771
+msgid "outgoing"
+msgstr ""
+
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Adicionar"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr ""
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr ""
+
+#: filter/filter.glade.h:5
 #, fuzzy
-msgid "Remove criterion"
-msgstr "Remover grupo"
+msgid "Edit VFolders"
+msgstr "_Pastas"
 
-#: filter/filter-system-flag.c:63
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr ""
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr ""
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
 #, fuzzy
-msgid "Replied to"
-msgstr "Reponder para todos"
+msgid "Virtual Folders"
+msgstr "_Pastas"
 
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
-msgid "Important"
+#: filter/filter.glade.h:11
+msgid "specific folders only"
 msgstr ""
 
-#: filter/filter-system-flag.c:67
+#: filter/filter.glade.h:12
 #, fuzzy
-msgid "Read"
-msgstr "Remover"
+msgid "vFolder Sources"
+msgstr "Adicionar Fonte"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
 msgstr ""
 
 #: filter/libfilter-i18n.h:3
-msgid "Assign Score"
+msgid "Assign Color"
 msgstr ""
 
 #: filter/libfilter-i18n.h:4
-#, fuzzy
-msgid "Copy to Folder"
-msgstr "Ir para a _pasta..."
+msgid "Assign Score"
+msgstr ""
 
 #: filter/libfilter-i18n.h:5
 #, fuzzy
-msgid "Date received"
-msgstr "Receber"
+msgid "Attachments"
+msgstr "Anexo"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:7
 #, fuzzy
-msgid "Date sent"
-msgstr "Data"
+msgid "contains"
+msgstr "_AcГУes"
 
 #: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr ""
+#, fuzzy
+msgid "Copy to Folder"
+msgstr "Ir para a _pasta..."
 
 #: filter/libfilter-i18n.h:9
 #, fuzzy
-msgid "Forward to Address"
-msgstr "Enviar esta mensagem"
+msgid "Date received"
+msgstr "Receber"
 
 #: filter/libfilter-i18n.h:10
 #, fuzzy
-msgid "Message Body"
-msgstr "SituaГЦo das mensagens"
-
-#: filter/libfilter-i18n.h:11
-#, fuzzy
-msgid "Message Header"
-msgstr "SituaГЦo das mensagens"
+msgid "Date sent"
+msgstr "Data"
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr ""
+#, fuzzy
+msgid "Deleted"
+msgstr "Apagar"
 
 #: filter/libfilter-i18n.h:13
-#, fuzzy
-msgid "Message was sent"
-msgstr "SituaГЦo das mensagens"
+msgid "does not contain"
+msgstr ""
 
 #: filter/libfilter-i18n.h:14
-#, fuzzy
-msgid "Move to Folder"
-msgstr "Ir para a _pasta..."
+msgid "does not end with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "Recipients"
+msgid "does not exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1109
 #, fuzzy
-msgid "Score"
-msgstr "Fontes"
+msgid "does not sound like"
+msgstr "Ficheiro nЦo encontrado"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:18
-#, fuzzy
-msgid "Sender"
-msgstr "Enviar"
+msgid "Do Not Exist"
+msgstr ""
 
 #: filter/libfilter-i18n.h:19
 #, fuzzy
-msgid "Set Status"
-msgstr "SituaГЦo online"
+msgid "Draft"
+msgstr "Data"
 
 #: filter/libfilter-i18n.h:20
-#, fuzzy
-msgid "Source"
-msgstr "Fontes"
-
-#: filter/libfilter-i18n.h:21
-msgid "Specific header"
+msgid "ends with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
+#: filter/libfilter-i18n.h:21
 #, fuzzy
-msgid "Status"
-msgstr "SАb"
+msgid "Exist"
+msgstr "PrС_ximo"
+
+#: filter/libfilter-i18n.h:22
+msgid "exists"
+msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
+msgid "Expression"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
-msgid "Subject"
-msgstr "Assunto"
+#: filter/libfilter-i18n.h:24
+msgid "Important"
+msgstr ""
 
 #: filter/libfilter-i18n.h:25
-#, fuzzy
-msgid "after"
-msgstr "Data"
+msgid "is"
+msgstr ""
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
+msgid "is greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-#, fuzzy
-msgid "contains"
-msgstr "_AcГУes"
+msgid "is less than"
+msgstr ""
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
+msgid "is not"
 msgstr ""
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
+msgid "Mailing list"
 msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr ""
+#, fuzzy
+msgid "Message Body"
+msgstr "SituaГЦo das mensagens"
 
 #: filter/libfilter-i18n.h:31
 #, fuzzy
-msgid "does not sound like"
-msgstr "Ficheiro nЦo encontrado"
+msgid "Message Header"
+msgstr "SituaГЦo das mensagens"
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
+msgid "Message was received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr ""
+#, fuzzy
+msgid "Message was sent"
+msgstr "SituaГЦo das mensagens"
 
 #: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr ""
+#, fuzzy
+msgid "Move to Folder"
+msgstr "Ir para a _pasta..."
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
+msgid "on or after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
+msgid "on or before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr ""
+#, fuzzy
+msgid "Read"
+msgstr "Remover"
 
 #: filter/libfilter-i18n.h:38
-msgid "is"
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr ""
+#, fuzzy
+msgid "Replied to"
+msgstr "Reponder para todos"
+
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
+#, fuzzy
+msgid "Score"
+msgstr "Fontes"
+
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
+#, fuzzy
+msgid "Sender"
+msgstr "Enviar"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
+#, fuzzy
+msgid "Set Status"
+msgstr "SituaГЦo online"
+
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Tamanho"
+
+#: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "Source Account"
+msgstr "мcone_s pequenos"
+
+#: filter/libfilter-i18n.h:47
+msgid "Specific header"
+msgstr ""
+
+#: filter/libfilter-i18n.h:48
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:50
+msgid "Stop Processing"
+msgstr ""
+
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
+msgid "Subject"
+msgstr "Assunto"
+
+#: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:53
 msgid "was before"
 msgstr ""
 
-#: filter/score-editor.c:127
+#: filter/rule-editor.c:147
+#, fuzzy
+msgid "Rules"
+msgstr "Adicionar Fonte"
+
+#: filter/rule-editor.c:240
 #, fuzzy
 msgid "Add Rule"
 msgstr "Adicionar Fonte"
 
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
-msgstr ""
+#: filter/rule-editor.c:299
+#, fuzzy
+msgid "Edit Rule"
+msgstr "Adicionar Fonte"
 
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
+#: filter/score-editor.c:130
+#, fuzzy
+msgid "Score Rules"
+msgstr "Fontes"
+
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr ""
 
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
 msgstr ""
 
-#: mail/component-factory.c:284
-msgid "Cannot initialize Evolution's mail component."
-msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "Mail"
+msgstr "_Correio"
 
-#: mail/component-factory.c:320
-msgid "Cannot register storage with shell"
+#: importers/elm-importer.c:498
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
 msgstr ""
 
-#: mail/folder-browser.c:225
+#: importers/elm-importer.c:527
 #, fuzzy
-msgid "Store search as vFolder"
-msgstr "_Nova pasta"
+msgid "Elm mail"
+msgstr "Correio electrСnico 2"
 
-#: mail/folder-browser.c:238
-msgid "Body or subject contains"
-msgstr ""
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "ImpossМvel abrir o livro de endereГos"
 
-#: mail/folder-browser.c:239
-msgid "Body contains"
+#: importers/evolution-gnomecard-importer.c:253
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: mail/folder-browser.c:240
+#: importers/netscape-importer.c:824
 #, fuzzy
-msgid "Subject contains"
-msgstr "Assunto"
+msgid "Settings"
+msgstr "Segundos"
 
-#: mail/folder-browser.c:241
-msgid "Body does not contain"
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: mail/folder-browser.c:242
-msgid "Subject does not contain"
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
 msgstr ""
 
-#: mail/folder-browser.c:645
-msgid "VFolder on Subject"
-msgstr ""
+#: importers/pine-importer.c:691
+#, fuzzy
+msgid "Pine mail"
+msgstr "EndereГo principal de correio electrСnico"
 
-#: mail/folder-browser.c:646
-msgid "VFolder on Sender"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
 msgstr ""
 
-#: mail/folder-browser.c:647
-msgid "VFolder on Recipients"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Evolution mail composer."
+msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Evolution mail executive summary component."
+msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Evolution mail folder display component."
+msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Evolution mail folder factory component."
+msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution composer."
+msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution mail component."
+msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Mail Summary component."
+msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "ConfiguraГЦo do correio"
+
+#: mail/component-factory.c:111
+#, fuzzy
+msgid "This folder cannot contain messages."
+msgstr "Uma pasta contendo items de correio"
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "Propriedades do alarme"
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Propriedades"
+
+#: mail/component-factory.c:757
+msgid "Cannot initialize Evolution's mail component."
+msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+
+#: mail/component-factory.c:894
+msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:649
-msgid "Filter on Subject"
+#: mail/folder-browser-ui.c:254
+#, fuzzy, c-format
+msgid "Properties for \"%s\""
+msgstr "Propriedades do alarme"
+
+#: mail/folder-browser-ui.c:256
+#, fuzzy
+msgid "Properties"
+msgstr "Propriedades do alarme"
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:650
+#: mail/folder-browser.c:893
 #, fuzzy
-msgid "Filter on Sender"
+msgid "Store search as vFolder"
+msgstr "_Nova pasta"
+
+#: mail/folder-browser.c:1238
+#, fuzzy
+msgid "VFolder on _Subject"
+msgstr "Assunto"
+
+#: mail/folder-browser.c:1241
+#, fuzzy
+msgid "VFolder on Se_nder"
 msgstr "Ficheiro nЦo encontrado"
 
-#: mail/folder-browser.c:651
-msgid "Filter on Recipients"
-msgstr ""
+#: mail/folder-browser.c:1244
+#, fuzzy
+msgid "VFolder on _Recipients"
+msgstr "SituaГЦo das mensagens"
 
-#: mail/folder-browser.c:652 mail/folder-browser.c:766
-msgid "Filter on Mailing List"
+#: mail/folder-browser.c:1247
+msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:658
+#: mail/folder-browser.c:1253
 #, fuzzy
-msgid "Open"
-msgstr "_Abrir"
+msgid "Filter on Sub_ject"
+msgstr "Ficheiro nЦo encontrado"
 
-#: mail/folder-browser.c:659
-msgid "Edit"
-msgstr ""
+#: mail/folder-browser.c:1256
+#, fuzzy
+msgid "Filter on Sen_der"
+msgstr "Ficheiro nЦo encontrado"
 
-#: mail/folder-browser.c:660
-msgid "Save As..."
+#: mail/folder-browser.c:1259
+#, fuzzy
+msgid "Filter on Re_cipients"
+msgstr "Ficheiro nЦo encontrado"
+
+#: mail/folder-browser.c:1262
+msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:661 mail/mail-view.c:148
-msgid "Print"
+#: mail/folder-browser.c:1273
+#, fuzzy
+msgid "Resend"
+msgstr " segundos"
+
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
+#, fuzzy
+msgid "_Save As..."
+msgstr "Gravar na _pasta..."
+
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+#, fuzzy
+msgid "_Print"
 msgstr "Imprimir"
 
-#: mail/folder-browser.c:663
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 #, fuzzy
-msgid "Reply to Sender"
+msgid "_Reply to Sender"
 msgstr "Reponder para todos"
 
-#: mail/folder-browser.c:664 mail/mail-view.c:141
-msgid "Reply to All"
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
 msgstr "Reponder para todos"
 
-#: mail/folder-browser.c:665 mail/mail-view.c:144
-msgid "Forward"
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+#, fuzzy
+msgid "Reply to _All"
+msgstr "Reponder para todos"
+
+#: mail/folder-browser.c:1288
+msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:666
-msgid "Forward inline"
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:668
-msgid "Mark as Read"
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+msgid "Mark as U_nread"
 msgstr ""
 
-#: mail/folder-browser.c:669
-msgid "Mark as Unread"
+#: mail/folder-browser.c:1295
+msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:671
+#: mail/folder-browser.c:1297
+msgid "Mark as Unim_portant"
+msgstr ""
+
+#: mail/folder-browser.c:1302
 #, fuzzy
-msgid "Move to Folder..."
+msgid "_Move to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:1304
 #, fuzzy
-msgid "Copy to Folder..."
+msgid "_Copy to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: mail/folder-browser.c:674
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 #, fuzzy
-msgid "Undelete"
+msgid "_Undelete"
 msgstr "Apagar"
 
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:678
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "ImpossМvel abrir o livro de endereГos"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:1322
 #, fuzzy
-msgid "Create Rule From Message"
+msgid "Create Ru_le From Message"
 msgstr "Mensagens de correio em rascunho"
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:1479
+msgid "Filter on Mailing List"
+msgstr ""
+
+#: mail/folder-browser.c:1480
+#, fuzzy
+msgid "VFolder on Mailing List"
+msgstr "Uma pasta contendo items de correio"
+
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
-#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Nenhuma"
+#: mail/folder-browser.c:1483
+#, c-format
+msgid "VFolder on Mailing List (%s)"
+msgstr ""
 
-#: mail/mail-accounts.c:115
-#, fuzzy
-msgid " (default)"
-msgstr "Apagar"
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+msgid "Factory to import mbox into Evolution"
+msgstr ""
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:347
-msgid "Evolution Account Manager"
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+msgid "Imports mbox files into Evolution"
 msgstr ""
 
-#: mail/mail-account-editor.c:274
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+msgid "Imports Outlook Express 4 files into Evolution"
+msgstr ""
+
+#: mail/local-config.glade.h:1
+#, fuzzy
+msgid "Current store format:"
+msgstr "NЦo se consegui inicializar Bonobo"
+
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Mailbox Format"
+msgstr "F_ormato"
+
+#: mail/local-config.glade.h:3
+#, fuzzy
+msgid "New store format:"
+msgstr "NЦo se consegui inicializar Bonobo"
+
+#: mail/local-config.glade.h:4
 msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
+"Note: When converting between mailbox formats, a failure\n"
+"(such as lack of disk space) may not be automatically\n"
+"recoverable.  Please use this feature with care."
+msgstr ""
+
+#: mail/local-config.glade.h:7
+#, fuzzy
+msgid "maildir"
+msgstr "Correio electrСnico 2"
+
+#: mail/local-config.glade.h:8
+#, fuzzy
+msgid "mbox"
+msgstr "Correio novo"
+
+#: mail/local-config.glade.h:9
+#, fuzzy
+msgid "mh"
+msgstr "h"
+
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:634
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Atalho para _barra do Evolution"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "Atalho para _barra do Evolution"
 
-#: mail/mail-autofilter.c:71
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "Ficheiro com assinatura:"
+
+#: mail/mail-account-gui.c:977
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+
+#: mail/mail-accounts.c:135
+#, fuzzy
+msgid " (default)"
+msgstr "Apagar"
+
+#: mail/mail-accounts.c:174
+#, fuzzy
+msgid "Disable"
+msgstr "Como _Tabela"
+
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+msgid "Enable"
+msgstr ""
+
+#: mail/mail-accounts.c:264
+msgid "Are you sure you want to delete this account?"
+msgstr ""
+
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Apagar"
+
+#: mail/mail-accounts.c:271
+msgid "Really delete account?"
+msgstr ""
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+msgid "Are you sure you want to delete this news account?"
+msgstr ""
+
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
+msgid "Evolution Account Manager"
+msgstr ""
+
+#: mail/mail-autofilter.c:70
 #, fuzzy, c-format
 msgid "Mail to %s"
 msgstr "Fontes de correio"
 
-#: mail/mail-autofilter.c:214
+#: mail/mail-autofilter.c:213
 #, fuzzy, c-format
 msgid "Subject is %s"
 msgstr "Assunto"
 
-#: mail/mail-autofilter.c:230
+#: mail/mail-autofilter.c:229
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:331
+#: mail/mail-autofilter.c:285
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-callbacks.c:83
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+msgid "Add Filter Rule"
+msgstr ""
+
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -3607,796 +6876,2624 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:136
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:223
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:232
-msgid "You have no Outbox configured"
-msgstr ""
-
-#: mail/mail-callbacks.c:279
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:345
-msgid "You must configure an account before you can send this email."
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:365
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:594
+#: mail/mail-callbacks.c:410
+msgid "You must configure an account before you can send this email."
+msgstr ""
+
+#: mail/mail-callbacks.c:653
+#, c-format
+msgid "On %s, %s wrote:"
+msgstr ""
+
+#: mail/mail-callbacks.c:914
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-callbacks.c:675
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:677
+#: mail/mail-callbacks.c:1013
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "Criar uma nova mensagem"
 
-#: mail/mail-callbacks.c:812
+#: mail/mail-callbacks.c:1374
+#, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr ""
+
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:845 mail/mail-display.c:79
-msgid "Overwrite file?"
+#: mail/mail-callbacks.c:1430
+msgid ""
+"You may only resend messages\n"
+"in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:849 mail/mail-display.c:83
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
+#: mail/mail-callbacks.c:1442
+#, c-format
+msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:893
+#: mail/mail-callbacks.c:1463
+#, fuzzy
+msgid "No Message Selected"
+msgstr "SituaГЦo das mensagens"
+
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:895
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:979
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1028
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "_Pasta"
+
+#: mail/mail-callbacks.c:1823
 #, fuzzy
 msgid "Print Message"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-callbacks.c:1075
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-config-druid.c:363
+#: mail/mail-callbacks.c:1966
 #, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr ""
+
+#: mail/mail-config-druid.c:99
 msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:629
-#, c-format
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:105
 msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:949
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-display.c:98
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
 msgstr ""
 
-#: mail/mail-display.c:131
-#, c-format
-msgid "Could not write data: %s"
+#: mail/mail-config.glade.h:1
+msgid " Check for supported types "
 msgstr ""
 
-#: mail/mail-display.c:229
+#: mail/mail-config.glade.h:2
 #, fuzzy
-msgid "Save Attachment"
+msgid " color"
+msgstr "Cores"
+
+#: mail/mail-config.glade.h:3
+msgid "(SSL is not supported in this build of evolution)"
+msgstr ""
+
+#: mail/mail-config.glade.h:4
+#, fuzzy
+msgid "Account"
+msgstr "мcone_s pequenos"
+
+#: mail/mail-config.glade.h:5
+#, fuzzy
+msgid "Account Information"
+msgstr "Nenhuma InformaГЦo"
+
+#: mail/mail-config.glade.h:6
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
+#, fuzzy
+msgid "Accounts"
+msgstr "мcone_s pequenos"
+
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#, fuzzy
+msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-display.c:269
-#, c-format
-msgid "Could not create temporary directory: %s"
+#: mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Authentication"
+msgstr "AutenticaГЦo"
+
+#: mail/mail-config.glade.h:14
+#, fuzzy
+msgid "Authentication Type: "
+msgstr "AutenticaГЦo"
+
+#: mail/mail-config.glade.h:15
+#, fuzzy
+msgid "Automatically check for new mail every"
+msgstr "Verificar novo correio"
+
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-display.c:311
-msgid "Save to Disk..."
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "Cores"
+
+#: mail/mail-config.glade.h:19
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email \n"
+"using Evolution. \n"
+"\n"
+"Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-display.c:313
-#, c-format
-msgid "Open in %s..."
+#: mail/mail-config.glade.h:25
+#, fuzzy
+msgid "De_fault"
+msgstr "Apagar"
+
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-display.c:315
-msgid "View Inline"
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
 msgstr ""
 
-#: mail/mail-display.c:342
-msgid "External Viewer"
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-display.c:365
-#, c-format
-msgid "View Inline (via %s)"
+#: mail/mail-config.glade.h:31
+#, fuzzy
+msgid "Done"
+msgstr "Nenhuma"
+
+#: mail/mail-config.glade.h:32
+#, fuzzy
+msgid "Drafts"
+msgstr "Data"
+
+#: mail/mail-config.glade.h:33
+#, fuzzy
+msgid "Drafts folder:"
+msgstr "Criar um novo calendАrio"
+
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "Imprimir..."
+
+#: mail/mail-config.glade.h:36
+#, fuzzy
+msgid "Email Address:"
+msgstr "EndereГo de correio:"
+
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
 msgstr ""
 
-#: mail/mail-display.c:369
-msgid "Hide"
+#: mail/mail-config.glade.h:39
+msgid "Enabled"
 msgstr ""
 
-#: mail/mail-format.c:504
-#, fuzzy, c-format
-msgid "%s attachment"
-msgstr "Adicionar anexo"
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Full Name:"
+msgstr "Nome completo:"
 
-#: mail/mail-format.c:626
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
+msgstr ""
+
+#: mail/mail-config.glade.h:42
 #, fuzzy
-msgid "Reply-To:"
-msgstr "Responder"
+msgid "HTML Signature:"
+msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-format.c:856
-msgid "Encrypted message not displayed"
+#: mail/mail-config.glade.h:43
+msgid "Highlight citations with"
 msgstr ""
 
-#: mail/mail-format.c:862
+#: mail/mail-config.glade.h:45
+msgid "IMAPv4 "
+msgstr ""
+
+#: mail/mail-config.glade.h:46
+msgid "Identity"
+msgstr ""
+
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+msgid "Inline"
+msgstr ""
+
+#: mail/mail-config.glade.h:49
 #, fuzzy
-msgid "Encrypted message"
-msgstr "Enviar a mensagem"
+msgid "Kerberos "
+msgstr "Servidor:"
 
-#: mail/mail-format.c:863
-msgid "Click icon to decrypt."
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-format.c:1438
-#, c-format
-msgid "Pointer to FTP site (%s)"
+#: mail/mail-config.glade.h:51
+msgid "Mail Configuration"
+msgstr "ConfiguraГЦo do correio"
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "F_ormato"
+
+#: mail/mail-config.glade.h:53
+msgid "Make this my default account"
 msgstr ""
 
-#: mail/mail-format.c:1450
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
+msgstr "SituaГЦo das mensagens"
+
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
 msgstr ""
 
-#: mail/mail-format.c:1454
-#, c-format
-msgid "Pointer to local file (%s)"
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
 msgstr ""
 
-#: mail/mail-format.c:1488
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "Servidor:"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
 msgstr ""
 
-#: mail/mail-format.c:1493
-msgid "Malformed external-body part."
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "News"
+msgstr "Novo"
+
+#: mail/mail-config.glade.h:62
+#, fuzzy
+msgid "Optional Information"
+msgstr "Nenhuma InformaГЦo"
+
+#: mail/mail-config.glade.h:63
+msgid "Organization:"
+msgstr "OrganizaГЦo:"
+
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-format.c:1663
-#, c-format
-msgid "On %s, %s wrote:\n"
+#: mail/mail-config.glade.h:66
+msgid "PGP binary path:"
 msgstr ""
 
-#: mail/mail-local.c:204
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
 msgstr ""
 
-#: mail/mail-local.c:208
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr ""
+
+#: mail/mail-config.glade.h:74
+msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-local.c:251
+#: mail/mail-config.glade.h:75
 #, fuzzy
-msgid "Reconfiguring folder"
-msgstr "_Nova pasta"
+msgid "Quoted"
+msgstr "Nenhuma"
 
-#: mail/mail-local.c:269
+#: mail/mail-config.glade.h:76
+msgid "Receiving Email"
+msgstr ""
+
+#: mail/mail-config.glade.h:77
+msgid "Receiving Mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:78
+msgid "Receiving Options"
+msgstr ""
+
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 #, fuzzy
-msgid "Closing current folder"
-msgstr "Fechar o calendАrio corrente"
+msgid "Required Information"
+msgstr "Nenhuma InformaГЦo"
 
-#: mail/mail-local.c:295
-msgid "Renaming old folder and opening"
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-local.c:313
+#: mail/mail-config.glade.h:84
+msgid "Security"
+msgstr ""
+
+#: mail/mail-config.glade.h:85
+msgid "Select PGP binary"
+msgstr ""
+
+#: mail/mail-config.glade.h:86
 #, fuzzy
-msgid "Creating new folder"
-msgstr "Criar um novo calendАrio"
+msgid "Send mail in HTML format by default."
+msgstr "Enviar mensagem em formato HTML"
 
-#: mail/mail-local.c:327
+#: mail/mail-config.glade.h:87
 #, fuzzy
-msgid "Copying messages"
-msgstr "Encontrar mensagens"
+msgid "Sending Email"
+msgstr "Enviar"
 
-#: mail/mail-local.c:348
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
+#: mail/mail-config.glade.h:88
+#, fuzzy
+msgid "Sending Mail"
+msgstr "Enviar"
+
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#, fuzzy
+msgid "Sent"
+msgstr "Enviar"
+
+#: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "Sent and Draft Messages"
+msgstr "Enviar a mensagem"
+
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Sent messages folder:"
+msgstr "Enviar a mensagem"
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "Server Configuration"
+msgstr "ConfiguraГЦo do correio"
+
+#: mail/mail-config.glade.h:94
+#, fuzzy
+msgid "Server Type: "
+msgstr "Servidor:"
+
+#: mail/mail-config.glade.h:95
+msgid "Server requires authentication"
+msgstr ""
+
+#: mail/mail-config.glade.h:96
+msgid "Signature file:"
+msgstr "Ficheiro com assinatura:"
+
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "Fontes"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Nenhuma InformaГЦo"
+
+#: mail/mail-config.glade.h:99
+msgid "Sources"
+msgstr "Fontes"
+
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Special Folders"
+msgstr "_Pastas"
+
+#: mail/mail-config.glade.h:101
+msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-local.c:379
+#: mail/mail-config.glade.h:103
+msgid "Use secure connection (SSL)"
+msgstr ""
+
+#: mail/mail-config.glade.h:104
+msgid "Username:"
+msgstr "Utilizador:"
+
+#: mail/mail-config.glade.h:105
 msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
+"Welcome to the Evolution Mail Configuration Druid.\n"
+"\n"
+"Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-local.c:787
-msgid "Registering local folder"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-local.c:789
-msgid "Register local folder"
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
 msgstr ""
 
-#: mail/mail-local.c:893
-#, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "seconds."
+msgstr " segundos"
+
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "NЦo se consegui inicializar Bonobo"
+
+#: mail/mail-crypto.c:86
+#, fuzzy
+msgid "Could not create a PGP verification context."
+msgstr "NЦo se consegui inicializar Bonobo"
+
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr "NЦo se consegui inicializar Bonobo"
+
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
+msgstr "NЦo se consegui inicializar Bonobo"
+
+#: mail/mail-crypto.c:177
+#, fuzzy
+msgid "Could not create a S/MIME signature context."
+msgstr "NЦo se consegui inicializar Bonobo"
+
+#: mail/mail-crypto.c:209
+#, fuzzy
+msgid "Could not create a S/MIME certsonly context."
+msgstr "NЦo se consegui inicializar Bonobo"
+
+#: mail/mail-crypto.c:240
+#, fuzzy
+msgid "Could not create a S/MIME encryption context."
+msgstr "NЦo se consegui inicializar Bonobo"
+
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "NЦo se consegui inicializar Bonobo"
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr "NЦo se consegui inicializar Bonobo"
+
+#: mail/mail-display.c:221
+#, fuzzy
+msgid "Save Attachment"
+msgstr "Anexo"
+
+#: mail/mail-display.c:338
+msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-mt.c:85
+#: mail/mail-display.c:340
+msgid "View Inline"
+msgstr ""
+
+#: mail/mail-display.c:342
 #, c-format
-msgid ""
-"Error while '%s':\n"
-"%s"
+msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-mt.c:87
+#: mail/mail-display.c:399
 #, c-format
-msgid ""
-"Error while performing operation:\n"
-"%s"
+msgid "View Inline (via %s)"
+msgstr ""
+
+#: mail/mail-display.c:403
+msgid "Hide"
 msgstr ""
 
-#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr ""
+
+#: mail/mail-display.c:1048
 #, fuzzy
-msgid "Working"
-msgstr "Seg"
+msgid "Loading message content"
+msgstr "Mensagens enviadas"
+
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
+msgstr "еbrir em nova janela"
+
+#: mail/mail-display.c:1406
+msgid "Copy Link Location"
+msgstr ""
 
-#: mail/mail-ops.c:107
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
+msgstr "Gravar na _pasta..."
+
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "Gravar como VCard"
+
+#: mail/mail-folder-cache.c:170
 #, c-format
-msgid "Fetching email from %s"
+msgid "%d new"
 msgstr ""
 
-#: mail/mail-ops.c:109
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
 #, c-format
-msgid "Fetch email from %s"
+msgid "%d hidden"
 msgstr ""
 
-#: mail/mail-ops.c:359
+#: mail/mail-folder-cache.c:186
 #, c-format
-msgid "There is no new mail at %s."
+msgid "%d unsent"
 msgstr ""
 
-#: mail/mail-ops.c:430
-msgid "Filtering email on demand"
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
 msgstr ""
 
-#: mail/mail-ops.c:432
-msgid "Filter email on demand"
+#: mail/mail-format.c:609
+#, fuzzy, c-format
+msgid "%s attachment"
+msgstr "Adicionar anexo"
+
+#: mail/mail-format.c:662
+msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-ops.c:563
-#, c-format
-msgid "Sending \"%s\""
+#: mail/mail-format.c:746
+#, fuzzy
+msgid "Date"
+msgstr "Data"
+
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "EndereГo"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+#, fuzzy
+msgid "From"
+msgstr "De"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "Responder"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+#, fuzzy
+msgid "To"
+msgstr "Para:"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Cc:"
+
+#: mail/mail-format.c:1291
+msgid "No GPG/PGP program configured."
+msgstr ""
+
+#: mail/mail-format.c:1307
+msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-ops.c:565
+#: mail/mail-format.c:1318
 #, fuzzy
-msgid "Sending message"
-msgstr "Mensagens enviadas"
+msgid "Encrypted message"
+msgstr "Enviar a mensagem"
+
+#: mail/mail-format.c:1319
+msgid "Click icon to decrypt."
+msgstr ""
 
-#: mail/mail-ops.c:682
-msgid "Sending queue"
+#: mail/mail-format.c:1377
+msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-ops.c:684
-msgid "Send queue"
+#: mail/mail-format.c:1388
+msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-ops.c:819 mail/mail-ops.c:826
+#: mail/mail-format.c:2046
 #, c-format
-msgid "Appending \"%s\""
+msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-ops.c:823 mail/mail-ops.c:829
-msgid "Appending a message without a subject"
+#: mail/mail-format.c:2060
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr ""
+
+#: mail/mail-format.c:2065
+#, c-format
+msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-ops.c:912
+#: mail/mail-format.c:2094
 #, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
+msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-ops.c:914
+#: mail/mail-format.c:2102
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr ""
+
+#: mail/mail-format.c:2107
+msgid "Malformed external-body part."
+msgstr ""
+
+#: mail/mail-local.c:458
+#, fuzzy, c-format
+msgid "Opening '%s'"
+msgstr "Abrir ficheiro"
+
+#: mail/mail-local.c:747
+#, c-format
+msgid "Changing folder \"%s\" to \"%s\" format"
+msgstr ""
+
+#: mail/mail-local.c:868
+#, c-format
+msgid ""
+"Cannot save folder metainfo; you'll probably find you can't\n"
+"open this folder anymore: %s"
+msgstr ""
+
+#: mail/mail-local.c:907
+msgid ""
+"If you can no longer open this mailbox, then\n"
+"you may need to repair it manually."
+msgstr ""
+
+#: mail/mail-local.c:1000
+msgid "You cannot change the format of a non-local folder."
+msgstr ""
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "_Nova pasta"
+
+#: mail/mail-mt.c:187
 #, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
+msgid ""
+"Error while '%s':\n"
+"%s"
 msgstr ""
 
-#: mail/mail-ops.c:917
+#: mail/mail-mt.c:190
 #, c-format
-msgid "Move messages from \"%s\" into \"%s\""
+msgid ""
+"Error while performing operation:\n"
+"%s"
 msgstr ""
 
-#: mail/mail-ops.c:919
+#: mail/mail-mt.c:794
+#, fuzzy
+msgid "Working"
+msgstr "Seg"
+
+#: mail/mail-ops.c:578
 #, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
+msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:950
+#: mail/mail-ops.c:698
+#, fuzzy, c-format
+msgid "Sending message %d of %d"
+msgstr "Mensagens enviadas"
+
+#: mail/mail-ops.c:717
+#, fuzzy, c-format
+msgid "Failed on message %d of %d"
+msgstr "Enviar esta mensagem"
+
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+#, fuzzy
+msgid "Complete."
+msgstr "Cores"
+
+#: mail/mail-ops.c:805
+#, fuzzy
+msgid "Saving message to folder"
+msgstr "Gravar a mensagem na pasta especificada"
+
+#: mail/mail-ops.c:884
+#, fuzzy, c-format
+msgid "Moving messages to %s"
+msgstr "Erro a gravar os atalhos."
+
+#: mail/mail-ops.c:884
+#, fuzzy, c-format
+msgid "Copying messages to %s"
+msgstr "Encontrar mensagens"
+
+#: mail/mail-ops.c:901
 #, fuzzy
 msgid "Moving"
 msgstr "Seg"
 
-#: mail/mail-ops.c:953
+#: mail/mail-ops.c:904
 #, fuzzy
 msgid "Copying"
 msgstr "Copiar"
 
-#: mail/mail-ops.c:973
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1048
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
 #, fuzzy
-msgid "(No description)"
-msgstr "Nenhuma descriГЦo"
+msgid "Trash"
+msgstr "_Tarefa"
 
-#: mail/mail-ops.c:1179
+#: mail/mail-ops.c:1189
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-ops.c:1351
+#: mail/mail-ops.c:1297
+#, fuzzy, c-format
+msgid "Opening store %s"
+msgstr "Abrir ficheiro"
+
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "Abrir ficheiro"
+
+#: mail/mail-ops.c:1568
 #, fuzzy
-msgid "Synchronising folder"
-msgstr "Sincronizar"
+msgid "Refreshing folder"
+msgstr "_Nova pasta"
 
-#: mail/mail-ops.c:1401
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1450
+#: mail/mail-ops.c:1653
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-ops.c:1517
-#, fuzzy
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-ops.c:1527
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1675
-#, c-format
-msgid "Loading %s Folder for %s"
-msgstr ""
-
-#: mail/mail-ops.c:1677
-#, c-format
-msgid "Load %s Folder for %s"
-msgstr ""
-
-#: mail/mail-ops.c:1843
-#, fuzzy
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1935
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1949
+#: mail/mail-ops.c:1913
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Erro a gravar os atalhos."
 
-#: mail/mail-search-dialogue.c:104
-msgid "Cancel"
-msgstr ""
+#: mail/mail-ops.c:1987
+#, fuzzy
+msgid "Saving attachment"
+msgstr "Anexo"
 
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-msgid "Incomplete message written on pipe!"
-msgstr ""
+#: mail/mail-ops.c:2003
+#, fuzzy, c-format
+msgid ""
+"Cannot create output file: %s:\n"
+" %s"
+msgstr "Criar um novo calendАrio"
 
-#: mail/mail-threads.c:302
+#: mail/mail-ops.c:2032
 #, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
+msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-threads.c:676
+#: mail/mail-ops.c:2101
 #, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
+msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr ""
+#: mail/mail-search.c:138
+#, fuzzy
+msgid "(Untitled Message)"
+msgstr "(Sem tМtulo)"
 
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
-msgstr ""
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Encontrar mensagens"
 
-#: mail/mail-threads.c:917
+#: mail/mail-search.c:239
 #, fuzzy
-msgid "Could not create dialog box."
-msgstr "NЦo se consegui inicializar Bonobo"
+msgid "Empty Message"
+msgstr "Mensagem de _correio"
 
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
-msgstr ""
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "Mensagens enviadas"
 
-#: mail/mail-tools.c:189
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
 msgstr ""
 
-#. Get all uids of source
-#: mail/mail-tools.c:241
-#, c-format
-msgid "Examining %s"
+#: mail/mail-search.c:315
+#, fuzzy
+msgid "Search Forward"
+msgstr "Ano"
+
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
+msgstr "Encontrar"
+
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "Caminho"
+
+#: mail/mail-send-recv.c:141
+msgid "Cancelling..."
 msgstr ""
 
-#: mail/mail-tools.c:271
-#, c-format
-msgid ""
-"Could not read UID cache file \"%s\". You may receive duplicate messages."
+#: mail/mail-send-recv.c:250
+msgid "Send & Receive mail"
 msgstr ""
 
-#: mail/mail-tools.c:300
-#, c-format
-msgid "Retrieving message %d of %d"
+#: mail/mail-send-recv.c:253
+#, fuzzy
+msgid "Receiving"
+msgstr "Receber"
+
+#: mail/mail-send-recv.c:302
+msgid "Updating..."
 msgstr ""
 
-#. Append it to dest
-#: mail/mail-tools.c:315
-#, c-format
-msgid "Writing message %d of %d"
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-tools.c:347
-#, c-format
-msgid "Saving changes to %s"
+#: mail/mail-send-recv.c:323
+#, fuzzy
+msgid "Sending"
+msgstr "Enviar"
+
+#: mail/mail-send-recv.c:488
+msgid "Cancelled."
 msgstr ""
 
-#: mail/mail-tools.c:381
-#, fuzzy, c-format
-msgid "[%s] (forwarded message)"
-msgstr "Enviar esta mensagem"
+#: mail/mail-session.c:171
+#, fuzzy
+msgid "User canceled operation."
+msgstr "Nenhuma InformaГЦo"
 
-#: mail/mail-tools.c:391
-msgid "Fwd: (no subject)"
+#: mail/mail-tools.c:173
+#, c-format
+msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-tools.c:427
+#: mail/mail-tools.c:241
 #, fuzzy, c-format
 msgid "Forwarded message - %s"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-tools.c:429
+#: mail/mail-tools.c:245
 #, fuzzy
-msgid "Forwarded message (no subject)"
+msgid "Forwarded message"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-tools.c:530
-#, fuzzy, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr "NЦo consigo abrir a localizaГЦo: %s"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Enviar esta mensagem"
 
-#: mail/mail-vfolder.c:149
+#: mail/mail-vfolder.c:270
 #, fuzzy
 msgid "VFolders"
 msgstr "_Pastas"
 
-#: mail/mail-vfolder.c:298
+#: mail/mail-vfolder.c:463
 #, fuzzy
 msgid "New VFolder"
 msgstr "_Nova pasta"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138
-msgid "Reply"
-msgstr "Responder"
+#: mail/message-list.c:613
+msgid "Unseen"
+msgstr ""
 
-#: mail/mail-view.c:138
+#: mail/message-list.c:614
 #, fuzzy
-msgid "Reply to the sender of this message"
-msgstr "Responder ao emissor desta mensagem"
+msgid "Seen"
+msgstr "Enviar"
 
-#: mail/mail-view.c:141
-msgid "Reply to all recipients of this message"
-msgstr "Reponder a todos receptores da mensagem"
+#: mail/message-list.c:615
+msgid "Answered"
+msgstr ""
 
-#: mail/mail-view.c:144
+#: mail/message-list.c:616
 #, fuzzy
-msgid "Forward this message"
-msgstr "Enviar esta mensagem"
+msgid "Multiple Unseen Messages"
+msgstr "Criar uma nova mensagem"
 
-#: mail/mail-view.c:148
+#: mail/message-list.c:617
 #, fuzzy
-msgid "Print the selected message"
-msgstr "Imprimir a mensagem seleccionada"
+msgid "Multiple Messages"
+msgstr "Encontrar mensagens"
+
+#: mail/message-list.c:621
+msgid "Lowest"
+msgstr ""
+
+#: mail/message-list.c:622
+msgid "Lower"
+msgstr ""
 
-#: mail/mail-view.c:150
+#: mail/message-list.c:626
 #, fuzzy
-msgid "Delete this message"
-msgstr "Enviar esta mensagem"
+msgid "Higher"
+msgstr "CabeГalhos:"
 
-#: mail/message-list.c:599
-msgid "Unseen"
+#: mail/message-list.c:627
+#, fuzzy
+msgid "Highest"
+msgstr "CabeГalhos:"
+
+#: mail/message-list.c:877
+msgid "?"
+msgstr "?"
+
+#: mail/message-list.c:884
+msgid "Today %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:893
+msgid "Yesterday %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:905
+msgid "%a %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:913
+msgid "%b %d %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:915
+msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:602
+#: mail/message-list.c:2290
 #, fuzzy
-msgid "Seen"
-msgstr "Enviar"
+msgid "Updating message list"
+msgstr "Encontrar mensagens"
 
-#: mail/message-list.c:605
-msgid "Answered"
+#: mail/message-list.etspec.h:2
+msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:890
+#: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Received"
+msgstr "Receber"
+
+#: mail/message-list.etspec.h:7
+#, fuzzy
+msgid "Size"
+msgstr "Tamanho"
+
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
+#, fuzzy
+msgid "Folder"
+msgstr "_Pastas"
+
+#: mail/subscribe-dialog.c:77
+#, fuzzy
+msgid "Store"
+msgstr "Fontes"
+
+#: mail/subscribe-dialog.c:138
+msgid "Display folders starting with:"
+msgstr ""
+
+#: mail/subscribe-dialog.c:168
 #, c-format
-msgid "[ %s ]"
+msgid "Getting store for \"%s\""
 msgstr ""
 
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:902 mail/message-list.c:918
+#: mail/subscribe-dialog.c:271
 #, c-format
-msgid "%s, et al."
+msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/message-list.c:905 mail/message-list.c:921
-msgid "<unknown>"
+#: mail/subscribe-dialog.c:273
+#, fuzzy, c-format
+msgid "Unsubscribing to folder \"%s\""
+msgstr "Abrir ficheiro"
+
+#. Construct the app
+#: mail/subscribe-dialog.c:878
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "Nenhuma descriГЦo"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
 msgstr ""
 
-#: mail/message-list.c:973
-msgid "?"
-msgstr "?"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the Evolution executive summary component."
+msgstr "NЦo consigo inicializar o componente de mail do Evolution."
 
-#: mail/message-list.c:980
-msgid "Today %l:%M %p"
+#: my-evolution/component-factory.c:140
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+#, fuzzy
+msgid "Appointments"
+msgstr "Compromissos:"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "Compromisso - %s"
+
+#: my-evolution/e-summary-calendar.c:226
+msgid "%l:%M%p"
 msgstr ""
 
-#: mail/message-list.c:989
-msgid "Yesterday %l:%M %p"
+#: my-evolution/e-summary-calendar.c:228
+msgid "%a %l:%M%p"
 msgstr ""
 
-#: mail/message-list.c:1001
-msgid "%a %l:%M %p"
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Nenhum sumАrio"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: mail/message-list.c:1009
-msgid "%b %d %l:%M %p"
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
 msgstr ""
 
-#: mail/message-list.c:1011
-msgid "%b %d %Y"
+#: my-evolution/e-summary-preferences.c:869
+#, fuzzy
+msgid "Add a news feed"
+msgstr "Adicionar novo grupo"
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: mail/message-list.c:1109
-msgid "Flagged"
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "InstalaГЦo do Evolution"
+
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
 msgstr ""
 
-#: mail/message-list.c:1109
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+msgid "<b>Error downloading RDF</b>"
+msgstr ""
+
+#: my-evolution/e-summary-tasks.c:206
 #, fuzzy
-msgid "Attachment"
-msgstr "Anexo"
+msgid "No tasks"
+msgstr "Ver _anexos"
 
-#: mail/message-list.c:1110
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
 #, fuzzy
-msgid "From"
-msgstr "De"
+msgid "Regions"
+msgstr "Segundos"
+
+#: my-evolution/e-summary.c:145
+msgid "%A, %d %B %Y"
+msgstr ""
 
-#: mail/message-list.c:1110
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 #, fuzzy
-msgid "Date"
-msgstr "Data"
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+msgid "Printing of My Evolution failed"
+msgstr ""
 
-#: mail/message-list.c:1110
+#: my-evolution/main.c:52
 #, fuzzy
-msgid "Received"
-msgstr "Receber"
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "Component de correio: NЦo consegui inicializar Bonobo"
 
-#: mail/message-list.c:1111
+#: my-evolution/metar.c:44
 #, fuzzy
-msgid "To"
-msgstr "Para:"
+msgid "Clear sky"
+msgstr "Carro"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
 
-#: mail/message-list.c:1111
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
+
+#: my-evolution/metar.c:63
+msgid "Variable"
+msgstr ""
+
+#: my-evolution/metar.c:64
 #, fuzzy
-msgid "Size"
+msgid "North"
+msgstr "Hora"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "_Nota"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "Colar"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "Fontes"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "Hora"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "Fontes"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Qa"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "_Nota"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "Horas"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+msgid "Rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Drifting rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Freezing rain"
+msgstr ""
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
 msgstr "Tamanho"
 
-#: mail/openpgp-utils.c:78
-#, c-format
-msgid "Please enter your %s passphrase for %s"
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
 msgstr ""
 
-#: mail/openpgp-utils.c:81
-#, c-format
-msgid "Please enter your %s passphrase"
+#: my-evolution/metar.c:102
+msgid "Light snow"
 msgstr ""
 
-#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
-#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
-msgid "No GPG/PGP program available."
+#: my-evolution/metar.c:102
+msgid "Moderate snow"
 msgstr ""
 
-#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
-#: mail/openpgp-utils.c:898
-msgid "No password provided."
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
 msgstr ""
 
-#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
-#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
 msgstr ""
 
-#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
-msgid "No recipients specified"
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
 msgstr ""
 
-#: mail/openpgp-utils.c:1065
-#, fuzzy, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Criar um novo calendАrio"
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
 
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Drifting snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
 #, fuzzy
-msgid "Folder"
-msgstr "_Pastas"
+msgid "Hail"
+msgstr "_Correio"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
 
-#: mail/subscribe-dialog.c:63
+#: my-evolution/metar.c:106
+msgid "Shallow hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
 #, fuzzy
-msgid "Store"
+msgid "Partial hail"
+msgstr "EndereГo principal de correio electrСnico"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Freezing hail"
+msgstr ""
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Shallow small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Showers of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+msgid "Unknown precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Unknown thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Freezing precipitation"
+msgstr ""
+
+#. MIST
+#: my-evolution/metar.c:109
+msgid "Mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Thick mist"
+msgstr "Lista de tarefas"
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "Prioridade"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Drifting mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog with wind"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
 msgstr "Fontes"
 
-#: mail/subscribe-dialog.c:145
-msgid "Display folders starting with:"
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
 msgstr ""
 
-#: mail/subscribe-dialog.c:178
-#, c-format
-msgid "Getting store for \"%s\""
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
 msgstr ""
 
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
 msgstr ""
 
-#: mail/subscribe-dialog.c:289
-#, c-format
-msgid "Subscribing to folder \"%s\""
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
 msgstr ""
 
-#: mail/subscribe-dialog.c:293
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "Ver _anexos"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
 msgstr ""
 
-#: mail/subscribe-dialog.c:297
-#, c-format
-msgid "Subscribe to folder \"%s\""
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
 msgstr ""
 
-#: mail/subscribe-dialog.c:300
-#, c-format
-msgid "Unsubscribe from folder \"%s\""
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke with wind"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "Enviar"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "Ano"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "DiasRascunhos"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+msgid "Dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
 msgstr ""
 
-#: shell/e-setup.c:112 shell/e-setup.c:185
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Raging tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Thunderous tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "Adicionar novo grupo"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "_Pastas"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "_AcГУes"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Mostrar uma pasta diferente"
+
+#: my-evolution/my-evolution.glade.h:7
+msgid "Display stations:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "Dia"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "Sex"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+#, fuzzy
+msgid "News Feeds"
+msgstr "Servidor:"
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "Segunda-feira"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "MЙs"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr "Semana"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+msgid "Schedule"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Ver _anexos"
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "Show full path for folders"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "Ver _anexos"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "_Tarefa"
+
+#: my-evolution/my-evolution.glade.h:24
+msgid "Units: "
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Outro"
+
+#: my-evolution/my-evolution.glade.h:26
+msgid "Weather settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "_Correio"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#, fuzzy
+msgid "The Evolution shell."
+msgstr "Evolution - %s"
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "Ver _anexos"
+
+#: shell/e-activity-handler.c:200
+msgid "Cancel Operation"
+msgstr ""
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "_Pastas"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "InstalaГЦo do Evolution"
 
-#: shell/e-setup.c:116
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:117
+#: shell/e-setup.c:130
 #, fuzzy
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Carregue em \\\"OK\\\" para instalar os ficheiros de utilizador do Evolution "
 "em"
 
-#: shell/e-setup.c:157
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr "Ficheiros do Evolution instalados com sucesso"
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you run Evolution."
+#: shell/e-setup.c:200
+#, fuzzy
+msgid "This seems to be the first time you are running Evolution."
 msgstr "Esta parece ser a primeira vez que estА a correr o Evolution."
 
-#: shell/e-setup.c:190
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Carregue em \\\"OK\\\" para instalar os ficheiros de utilizador do Evolution "
 "em"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -4404,14 +9501,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:224
+#: shell/e-setup.c:235
 #, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -4419,7 +9516,16 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:261
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -4427,1708 +9533,2899 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:82
+#: shell/e-shell-folder-commands.c:160
+msgid "Cannot move a folder over itself."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:162
+msgid "Cannot copy a folder over itself."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "Ir para a _pasta..."
+
+#: shell/e-shell-folder-commands.c:313
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "Ir para a _pasta..."
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "_Nova pasta"
+
+#: shell/e-shell-folder-commands.c:363
+#, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "Abrir ficheiro"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, fuzzy, c-format
 msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: shell/e-shell-folder-creation-dialog.c:134
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:225
+#: shell/e-shell-folder-creation-dialog.c:275
 #, fuzzy
 msgid "Evolution - Create new folder"
 msgstr "O Evolution nЦo consegue criar as suas pastas locais"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:297
+#: shell/e-shell-folder-selection-dialog.c:343
 #, fuzzy
 msgid "New..."
 msgstr "Novo"
 
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Sem tМtulo)"
 
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-importer.c:362
+#, fuzzy
+msgid "Importing"
+msgstr "Seg"
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:383
+#, fuzzy, c-format
+msgid "Error starting %s"
+msgstr "Erro a gravar os atalhos."
+
+#: shell/e-shell-importer.c:402
+#, fuzzy, c-format
+msgid "Error loading %s"
+msgstr "Erro a gravar os atalhos."
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr ""
+
+#: shell/e-shell-importer.c:538
+#, fuzzy
+msgid "Filename:"
+msgstr "Nome completo:"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a file"
+msgstr "Ficheiro com assinatura:"
+
+#: shell/e-shell-importer.c:553
+#, fuzzy
+msgid "File type:"
+msgstr "Nome completo:"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "_Nova pasta"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "O Bug buddy nЦo foi encontrado no seu $PATH."
 
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "NЦo consegui correr o Bub buddy"
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:217
 #, fuzzy
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:334
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Ir para a _pasta..."
 
-#: shell/e-shell-view.c:140
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Criar um novo contacto"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
+msgstr "Seg"
+
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+#, fuzzy
+msgid "Work Offline"
+msgstr "Seg"
+
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr "(Nenhuma pasta mostrada)"
 
-#: shell/e-shell-view.c:468
-msgid "Folders"
-msgstr "_Pastas"
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
 
-#: shell/e-shell-view.c:1098
+#: shell/e-shell-view.c:1411
 #, fuzzy, c-format
 msgid "%s - Evolution %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1100
+#: shell/e-shell-view.c:1413
 #, fuzzy, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
 
-#: shell/e-shell.c:372
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1212
+#: shell/e-shell.c:1311
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:123
+#: shell/e-shortcuts-view.c:141
 #, fuzzy
 msgid "Create new shortcut group"
 msgstr "Criar um novo contacto"
 
-#: shell/e-shortcuts-view.c:126
+#: shell/e-shortcuts-view.c:144
 #, fuzzy
 msgid "Group name:"
 msgstr "Nome completo:"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "Mudar nome de atalho"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "Remover este atalho da barra de atalhos"
+
+#: shell/e-shortcuts-view.c:314
 #, fuzzy
 msgid "_Small Icons"
 msgstr "мcone_s pequenos"
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:317
 #, fuzzy
 msgid "_Large Icons"
 msgstr "мcones _grandes"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Mostrar atalhos co Мcones grandes"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:329
 #, fuzzy
 msgid "_New Group..."
 msgstr "Novo grupo"
 
-#: shell/e-shortcuts-view.c:281
+#: shell/e-shortcuts-view.c:330
 #, fuzzy
 msgid "Create a new shortcut group"
 msgstr "Criar um novo contacto"
 
-#: shell/e-shortcuts-view.c:283
+#: shell/e-shortcuts-view.c:332
 #, fuzzy
-msgid "_Remove This Group..."
+msgid "_Remove this Group..."
 msgstr "Remover grupo"
 
-#: shell/e-shortcuts-view.c:284
+#: shell/e-shortcuts-view.c:333
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "Remover este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:289
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "Remover grupo"
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "Remover este atalho da barra de atalhos"
+
+#: shell/e-shortcuts-view.c:341
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "Mostrar a barra de atalhos"
 
-#: shell/e-shortcuts-view.c:290
+#: shell/e-shortcuts-view.c:342
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "Mostrar barra de atalho_s"
 
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "Activar"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "Mudar nome de atalho"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "Mudar nome de atalho"
+
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+#, fuzzy
+msgid "Open"
+msgstr "_Abrir"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#, fuzzy
+msgid "Open in New Window"
+msgstr "еbrir em nova janela"
+
+#: shell/e-shortcuts-view.c:476
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "Nome completo:"
 
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr "Activar este atalho"
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "Mudar nome de atalho"
 
-#: shell/e-shortcuts-view.c:377
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Remover este atalho da barra de atalhos"
 
-#: shell/e-shortcuts.c:358
+#: shell/e-shortcuts.c:585
 msgid "Error saving shortcuts."
 msgstr "Erro a gravar os atalhos."
 
-#: shell/e-storage-set-view.c:338
+#: shell/e-shortcuts.c:982
 #, fuzzy
-msgid "_View"
-msgstr "_Novo"
+msgid "Shortcuts"
+msgstr "Mudar nome de atalho"
 
-#: shell/e-storage-set-view.c:338
+#: shell/e-shortcuts.c:984
 #, fuzzy
-msgid "View the selected folder"
-msgstr "Imprimir a mensagem seleccionada"
+msgid "Inbox"
+msgstr "Correio novo"
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "_Contacto"
 
-#: shell/e-storage.c:138
+#: shell/e-storage.c:178 shell/e-storage.c:184
 #, fuzzy
 msgid "(No name)"
 msgstr "Nome"
 
-#: shell/e-storage.c:389
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:391
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-storage.c:393
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:395
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:397
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:399
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:401
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:403
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:405
-msgid "Permission denied"
-msgstr ""
-
-#: shell/e-storage.c:407
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:409
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/main.c:74
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
+
+#: shell/e-task-widget.c:173
+msgid "%s (%d%% complete)"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "Uma pasta contendo tarefas"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "Horas"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+msgid "Folder name:"
+msgstr "Nome completo:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#, fuzzy
+msgid "Folder type:"
+msgstr "_Pastas"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Specify where to create the folder:"
+msgstr "Gravar a mensagem na pasta especificada"
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+
+#: shell/importer/import.glade.h:2
+#, fuzzy
+msgid "Evolution Import Utility"
+msgstr "Atalho para _barra do Evolution"
+
+#: shell/importer/import.glade.h:3
+#, fuzzy
+msgid "Evolution Importer Utility"
+msgstr "Atalho para _barra do Evolution"
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+
+#: shell/importer/intelligent.c:191
+msgid "Importers"
+msgstr ""
+
+#: shell/importer/intelligent.c:197
+msgid "Don't import"
+msgstr ""
+
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr ""
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
+"Evolution is not yet complete. It's getting close, but there are\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:101
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
+msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+
+#: shell/main.c:215
+msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:178
-msgid "Disable."
+#: shell/main.c:216
+msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:198
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Falhou a inicializaГЦo do sistema de componentes Bonobo."
 
-#: ui/evolution-contact-editor.xml:7
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Copiar"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "FIXME: _Appointment"
-msgstr "_Compromisso"
+msgid "Copy the selection"
+msgstr "Anular a Зltima operaГЦo"
 
-#: ui/evolution-contact-editor.xml:8
+#: ui/evolution-addressbook.xml.h:4
 #, fuzzy
-msgid "FIXME: Meeting Re_quest"
-msgstr "Pedido de _encontro"
+msgid "Create new contact"
+msgstr "Criar um novo contacto"
 
-#: ui/evolution-contact-editor.xml:10
+#: ui/evolution-addressbook.xml.h:5
 #, fuzzy
-msgid "FIXME: _Mail Message"
-msgstr "Mensagem de _correio"
+msgid "Create new contact list"
+msgstr "A sua lista de contactos"
+
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Cortar"
+
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "Apagar um contacto"
+
+#: ui/evolution-addressbook.xml.h:10
+#, fuzzy
+msgid "New contact"
+msgstr "Encontrar um contacto"
+
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New list"
+msgstr "Novo"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Colar"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+#, fuzzy
+msgid "Paste the clipboard"
+msgstr "Colar item da Аrea de transferЙncia"
+
+#: ui/evolution-addressbook.xml.h:14
+msgid "Previews the contacts to be printed"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
+msgstr "Imprimir contactos"
+
+#: ui/evolution-addressbook.xml.h:18
+#, fuzzy
+msgid "Select All"
+msgstr "Reponder para todos"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "Apagar um contacto"
 
-#: ui/evolution-contact-editor.xml:11
+#: ui/evolution-addressbook.xml.h:20
 #, fuzzy
-msgid "FIXME: _Contact"
+msgid "Stop"
+msgstr "Fontes"
+
+#: ui/evolution-addressbook.xml.h:21
+#, fuzzy
+msgid "Stop Loading"
+msgstr "CabeГalhos:"
+
+#: ui/evolution-addressbook.xml.h:22
+#, fuzzy
+msgid "_Addressbook Sources..."
+msgstr "Adicionar Fonte"
+
+#: ui/evolution-addressbook.xml.h:23
+#, fuzzy
+msgid "_Contact"
+msgstr "_Contacto"
+
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
 msgstr "_Contacto"
 
-#: ui/evolution-contact-editor.xml:12
-msgid "FIXME: _Task"
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
+#, fuzzy
+msgid "_Print..."
+msgstr "Imprimir..."
+
+#: ui/evolution-addressbook.xml.h:28
+msgid "_Search for contacts"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:13
+#: ui/evolution-addressbook.xml.h:29
 #, fuzzy
-msgid "FIXME: Task _Request"
-msgstr "_Pedido de tarefa"
+msgid "_Select All"
+msgstr "Reponder para todos"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
+msgid "_Tools"
+msgstr "_Ferramentas"
 
-#: ui/evolution-contact-editor.xml:14
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "FIXME: _Journal Entry"
-msgstr "_Entrada diАria?"
+msgid "Create a New All-Day _Event"
+msgstr "Criar um novo contacto"
+
+#: ui/evolution-calendar.xml.h:5
+#, fuzzy
+msgid "Create a _New Appointment"
+msgstr "Criar um novo compromisso para hoje"
+
+#: ui/evolution-calendar.xml.h:6
+#, fuzzy
+msgid "Create a new appointment"
+msgstr "Criar um novo compromisso para hoje"
 
-#: ui/evolution-contact-editor.xml:15
-msgid "FIXME: _Note"
+#: ui/evolution-calendar.xml.h:7
+#, fuzzy
+msgid "Create an event for the whole day"
+msgstr "Criar um novo compromisso para hoje"
+
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#, fuzzy
+msgid "Go To"
+msgstr "Ir para"
+
+#: ui/evolution-calendar.xml.h:10
+msgid "Go back in time"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
-msgid "FIXME: Ch_oose Form..."
+#: ui/evolution-calendar.xml.h:11
+msgid "Go forward in time"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:22
-msgid "FIXME: _Memo Style"
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Go to _Date"
+msgstr "Ir para"
+
+#: ui/evolution-calendar.xml.h:14
+msgid "Go to a specific date"
+msgstr "Ir para uma data especМfica"
+
+#: ui/evolution-calendar.xml.h:15
+#, fuzzy
+msgid "Go to present time"
+msgstr "Ir para o prСximo item"
+
+#: ui/evolution-calendar.xml.h:16
+#, fuzzy
+msgid "New Appointment"
+msgstr "Novo compromisso"
+
+#: ui/evolution-calendar.xml.h:18
+msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:24
+#: ui/evolution-calendar.xml.h:20
+#, fuzzy
+msgid "Print calendar"
+msgstr "Imprimir calendАrio"
+
+#: ui/evolution-calendar.xml.h:21
+#, fuzzy
+msgid "Print this Calendar"
+msgstr "Imprimir este calendАrio"
+
+#: ui/evolution-calendar.xml.h:22
 #, fuzzy
-msgid "FIXME: Define Print _Styles..."
-msgstr "Pedido de _encontro"
+msgid "Publish Free/Busy Information"
+msgstr "Nenhuma InformaГЦo"
 
-#: ui/evolution-contact-editor.xml:31
-msgid "FIXME: S_end"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:35
+#: ui/evolution-calendar.xml.h:24
+msgid "Show 1 day"
+msgstr "Mostrar 1 dia"
+
+#: ui/evolution-calendar.xml.h:25
+msgid "Show 1 month"
+msgstr "Mostrar 1 mЙs"
+
+#: ui/evolution-calendar.xml.h:26
+msgid "Show 1 week"
+msgstr "Mostrar 1 semana"
+
+#: ui/evolution-calendar.xml.h:27
+msgid "Show the working week"
+msgstr "Mostrar a semana de trabalho"
+
+#: ui/evolution-calendar.xml.h:28
 #, fuzzy
-msgid "FIXME: Save Attac_hments..."
-msgstr "Adicionar anexo..."
+msgid "W_ork Week"
+msgstr "Semana"
 
-#: ui/evolution-contact-editor.xml:38
-msgid "FIXME: _Move to Folder..."
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
+msgstr "_Novo compromisso..."
+
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "PreferЙncias"
+
+#: ui/evolution-calendar.xml.h:32
+#, fuzzy
+msgid "_Day"
+msgstr "DiasRascunhos"
+
+#: ui/evolution-calendar.xml.h:33
+#, fuzzy
+msgid "_Month"
+msgstr "MЙs"
+
+#: ui/evolution-calendar.xml.h:37
+#, fuzzy
+msgid "_Week"
+msgstr "Semana"
+
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+#, fuzzy
+msgid "Close"
+msgstr "Cores"
+
+#: ui/evolution-comp-editor.xml.h:3
+#, fuzzy
+msgid "Close this appointment"
+msgstr "Novo compromisso"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:39
-msgid "FIXME: Cop_y to Folder..."
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:41
+#: ui/evolution-comp-editor.xml.h:7
 #, fuzzy
-msgid "Page Set_up"
-msgstr "Imprimir"
+msgid "Preview the printed item"
+msgstr "Imprimir este item"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Print Pre_view"
+msgstr "Prever impressЦo"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "Imprimir..."
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Imprimir este item"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "Imprimir..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+#, fuzzy
+msgid "Save and Close"
+msgstr "Guardar CalendАrio como"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:42
-msgid "FIXME: Print Pre_view"
+#: ui/evolution-comp-editor.xml.h:17
+msgid "Save this item to disk"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:63
-msgid "FIXME: Paste _Special..."
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:68
-msgid "FIXME: Mark as U_nread"
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "_AcГУes"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+#, fuzzy
+msgid "_File"
+msgstr "_Pasta"
+
+#: ui/evolution-contact-editor.xml.h:2
+msgid "Delete this item"
+msgstr "Apagar este item"
+
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
+#, fuzzy
+msgid "Delete..."
+msgstr "Apagar"
+
+#: ui/evolution-contact-editor.xml.h:4
+msgid "Help"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:72
-msgid "_Object"
-msgstr "_Objecto"
+#: ui/evolution-contact-editor.xml.h:5
+#, fuzzy
+msgid "Print En_velope..."
+msgstr "Imprimir..."
 
-#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
-msgid "FIXME: _Item"
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
+#, fuzzy
+msgid "Save _As..."
+msgstr "Gravar na _pasta..."
+
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Save the contact and close the dialog box"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
-msgid "FIXME: _Unread Item"
+#: ui/evolution-contact-editor.xml.h:11
+msgid "Se_nd contact to other..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:79
-msgid "FIXME: Fi_rst Item in Folder"
+#: ui/evolution-contact-editor.xml.h:12
+msgid "See online help"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:86
-msgid "FIXME: _Last Item in Folder"
+#: ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "Send _message to contact..."
+msgstr "Enviar mensagem em formato HTML"
+
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
+#, fuzzy
+msgid "_Save"
+msgstr "SА"
+
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "Apagar este item"
+
+#: ui/evolution-contact-list-editor.xml.h:6
+msgid "Save the list and close the dialog box"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:91
-msgid "FIXME: _Standard"
+#: ui/evolution-contact-list-editor.xml.h:7
+msgid "Se_nd list to other..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:93
+#: ui/evolution-contact-list-editor.xml.h:8
 #, fuzzy
-msgid "FIXME: __Formatting"
-msgstr "_Contacto"
+msgid "Send _message to list..."
+msgstr "Enviar a mensagem"
 
-#: ui/evolution-contact-editor.xml:96
-msgid "FIXME: _Customize..."
+#: ui/evolution-event-editor.xml.h:1
+msgid "Cancel Mee_ting"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:101
-msgid "Pre_vious"
-msgstr "An_terior"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+msgid "Cancel the meeting for this item"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:102
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Ne_xt"
-msgstr "PrС_ximo"
+msgid "Forward as i_Calendar"
+msgstr "Imprimir calendАrio"
 
-#: ui/evolution-contact-editor.xml:104
-msgid "_Toolbars"
-msgstr "_Ferramentas"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "Enviar esta mensagem"
 
-#: ui/evolution-contact-editor.xml:109
-msgid "FIXME: _File..."
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:110
-msgid "FIXME: It_em..."
+#: ui/evolution-event-editor.xml.h:6
+msgid "Re_fresh Meeting"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:111
-msgid "FIXME: _Object..."
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:116
-msgid "FIXME: _Font..."
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+msgid "Schedule a meeting for this item"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "_AcГУes"
+
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "Evolution - %s"
+
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:117
-msgid "FIXME: _Paragraph..."
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "Ficheiro com assinatura:"
+
+#: ui/evolution-mail-global.xml.h:3
+#, fuzzy
+msgid "Compose"
+msgstr "Cores"
+
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Criar uma nova mensagem"
+
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:124
-msgid "FIXME: Desi_gn This Form"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:125
-msgid "FIXME: D_esign a Form..."
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:127
-msgid "FIXME: Publish _Form..."
+#: ui/evolution-mail-global.xml.h:8
+#, fuzzy
+msgid "Empty _Trash"
+msgstr "Dias vazios:"
+
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "Esquecer _Senhas"
+
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:128
-msgid "FIXME: Pu_blish Form As..."
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:130
-msgid "FIXME: Script _Debugger"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:135
-msgid "FIXME: _Spelling..."
+#: ui/evolution-mail-global.xml.h:13
+msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:137
+#: ui/evolution-mail-global.xml.h:14
 #, fuzzy
-msgid "_Forms"
-msgstr "_Pasta"
+msgid "Send / Receive"
+msgstr "Receber"
+
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:142
+#: ui/evolution-mail-global.xml.h:16
 #, fuzzy
-msgid "FIXME: _New Contact"
-msgstr "_Contacto"
+msgid "Show message preview window"
+msgstr "Se uma previsЦo da mensagem deve ser mostrada"
 
-#: ui/evolution-contact-editor.xml:143
-msgid "FIXME: New _Contact from Same Company"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:145
+#: ui/evolution-mail-global.xml.h:18
 #, fuzzy
-msgid "FIXME: New _Letter to Contact"
-msgstr "_Contacto"
+msgid "Virtual Folder _Editor..."
+msgstr "_Pastas"
 
-#: ui/evolution-contact-editor.xml:146
+#: ui/evolution-mail-global.xml.h:19
 #, fuzzy
-msgid "FIXME: New _Message to Contact"
-msgstr "Enviar mensagem em formato HTML"
+msgid "_Filters..."
+msgstr "DruМda dos _filtros"
 
-#: ui/evolution-contact-editor.xml:147
+#: ui/evolution-mail-global.xml.h:20
 #, fuzzy
-msgid "FIXME: New Meetin_g with Contact"
-msgstr "_Contacto"
+msgid "_Mail Message"
+msgstr "Mensagem de _correio"
 
-#: ui/evolution-contact-editor.xml:148
+#: ui/evolution-mail-global.xml.h:21
 #, fuzzy
-msgid "FIXME: _Plan a Meeting..."
-msgstr "_Contacto"
+msgid "_Mail Settings..."
+msgstr "ConfiguraГЦo do co_rreio..."
 
-#: ui/evolution-contact-editor.xml:149
+#: ui/evolution-mail-global.xml.h:22
 #, fuzzy
-msgid "FIXME: New _Task for Contact"
-msgstr "_Contacto"
+msgid "_Preview Pane"
+msgstr "Prever impressЦo"
 
-#: ui/evolution-contact-editor.xml:150
+#: ui/evolution-mail-global.xml.h:23
 #, fuzzy
-msgid "FIXME: New _Journal Entry for Contact"
-msgstr "_Entrada diАria?"
+msgid "_Send / Receive"
+msgstr "Receber"
 
-#: ui/evolution-contact-editor.xml:152
-msgid "FIXME: _Flag for Follow Up..."
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:153
+#: ui/evolution-mail-list.xml.h:3
 #, fuzzy
-msgid "FIXME: _Display Map of Address"
-msgstr "Mensagem de _correio"
+msgid "Copy selected messages"
+msgstr "Imprimir a mensagem seleccionada"
 
-#: ui/evolution-contact-editor.xml:154
+#: ui/evolution-mail-list.xml.h:5
 #, fuzzy
-msgid "FIXME: _Open Web Page"
-msgstr "Mensagem de _correio"
+msgid "Cut selected messages"
+msgstr "Imprimir a mensagem seleccionada"
 
-#: ui/evolution-contact-editor.xml:156
-msgid "FIXME: Forward as _vCard"
+#: ui/evolution-mail-list.xml.h:6
+#, fuzzy
+msgid "Hide S_elected Messages"
+msgstr "Imprimir a mensagem seleccionada"
+
+#: ui/evolution-mail-list.xml.h:7
+#, fuzzy
+msgid "Hide _Deleted Messages"
+msgstr "Imprimir a mensagem seleccionada"
+
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
+msgstr "Novas mensagens de correio"
+
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:157
-msgid "FIXME: For_ward"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml:169
-msgid "_Insert"
-msgstr "_Inserir"
+#: ui/evolution-mail-list.xml.h:11
+msgid "Mark all visible messages as read"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:170
-msgid "F_ormat"
-msgstr "F_ormato"
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "Colar item da Аrea de transferЙncia"
 
-#: ui/evolution-contact-editor.xml:171
-msgid "_Tools"
-msgstr "_Ferramentas"
+#: ui/evolution-mail-list.xml.h:14
+msgid "Permanently remove all deleted messages from this folder"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:172
-msgid "Actio_ns"
-msgstr "_AcГУes"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+#, fuzzy
+msgid "Select _All"
+msgstr "Reponder para todos"
 
-#: ui/evolution-contact-editor.xml:246
+#: ui/evolution-mail-list.xml.h:16
 #, fuzzy
-msgid "FIXME: Previous"
-msgstr "An_terior"
+msgid "Select _Thread"
+msgstr "Reponder para todos"
 
-#: ui/evolution-contact-editor.xml:247
-msgid "Go to the previous item"
-msgstr "Ir para o item anterior"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:249
+#: ui/evolution-mail-list.xml.h:19
 #, fuzzy
-msgid "FIXME: Next"
-msgstr "_Contacto"
+msgid "Select all visible messages"
+msgstr "Enviar esta mensagem"
 
-#: ui/evolution-contact-editor.xml:250
-msgid "Go to the next item"
-msgstr "Ir para o prСximo item"
+#: ui/evolution-mail-list.xml.h:20
+#, fuzzy
+msgid "Show _All"
+msgstr "Novas mensagens de correio"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
+#: ui/evolution-mail-list.xml.h:22
+msgid "Temporarily hide all messages that have already been read"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Ocupado"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Fora do escritСrio"
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "Imprimir a mensagem seleccionada"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Nenhuma InformaГЦo"
+#: ui/evolution-mail-list.xml.h:24
+#, fuzzy
+msgid "Threaded Message list"
+msgstr "Enviar esta mensagem"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_OpГУes"
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Pasta"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
+#: ui/evolution-mail-list.xml.h:28
+#, fuzzy
+msgid "_Properties..."
+msgstr "Propriedades do alarme"
+
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "Enviar esta mensagem"
+
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "Apply filter rules to the selected messages"
+msgstr "Imprimir a mensagem seleccionada"
+
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "Reponder a todos receptores da mensagem"
+
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Responder ao emissor desta mensagem"
+
+#: ui/evolution-mail-message.xml.h:6
+#, fuzzy
+msgid "Copy selected messages to another folder"
+msgstr "Gravar a mensagem na pasta especificada"
+
+#: ui/evolution-mail-message.xml.h:7
+#, fuzzy
+msgid "Create _Virtual Folder From Message"
+msgstr "Mensagens de correio em rascunho"
+
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
+#: ui/evolution-mail-message.xml.h:12
+msgid "Create a virtual folder for these recipients"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
+#: ui/evolution-mail-message.xml.h:13
+msgid "Create a virtual folder for this mailing list"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "Pessoas _NecessЦrias"
+#: ui/evolution-mail-message.xml.h:14
+msgid "Create a virtual folder for this sender"
+msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
+#: ui/evolution-mail-message.xml.h:15
+msgid "Create a virtual folder for this subject"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Hora de Мn_icio de encontro"
+#: ui/evolution-mail-message.xml.h:17
+#, fuzzy
+msgid "Display the next important message"
+msgstr "Responder ao emissor desta mensagem"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Hora de _fim de _encontro"
+#: ui/evolution-mail-message.xml.h:18
+#, fuzzy
+msgid "Display the next message"
+msgstr "Descartar esta mensagem?"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
+msgstr "Imprimir a mensagem seleccionada"
+
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
 msgstr ""
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
+#: ui/evolution-mail-message.xml.h:21
+msgid "Display the previous important message"
 msgstr ""
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
+#: ui/evolution-mail-message.xml.h:22
+#, fuzzy
+msgid "Display the previous message"
+msgstr "Descartar esta mensagem?"
+
+#: ui/evolution-mail-message.xml.h:23
+#, fuzzy
+msgid "Display the previous unread message"
+msgstr "Descartar esta mensagem?"
+
+#: ui/evolution-mail-message.xml.h:24
+msgid "Filter on Mailing _List..."
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
+msgstr "Ficheiro nЦo encontrado"
 
-#: widgets/misc/e-dateedit.c:407
+#: ui/evolution-mail-message.xml.h:26
 #, fuzzy
-msgid "Now"
-msgstr "Novo"
+msgid "Filter on _Recipients..."
+msgstr "Ficheiro nЦo encontrado"
 
-#: widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Hoje"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
+msgstr "Ficheiro nЦo encontrado"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:176
-msgid "Sear_ch"
+#: ui/evolution-mail-message.xml.h:30
+#, fuzzy
+msgid "Forward As"
+msgstr "Enviar esta mensagem"
+
+#: ui/evolution-mail-message.xml.h:31
+msgid "Forward _Attached"
 msgstr ""
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Grupo %i"
+#: ui/evolution-mail-message.xml.h:32
+msgid "Forward _Inline"
+msgstr ""
 
+#: ui/evolution-mail-message.xml.h:33
 #, fuzzy
-#~ msgid "Delete Contact?"
-#~ msgstr "Apagar um contacto"
+msgid "Forward _Quoted"
+msgstr "Enviar esta mensagem"
+
+#: ui/evolution-mail-message.xml.h:34
+msgid "Forward the selected message in the body of a new message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:35
+msgid "Forward the selected message quoted like a reply"
+msgstr ""
 
+#: ui/evolution-mail-message.xml.h:36
 #, fuzzy
-#~ msgid "Address _2:"
-#~ msgstr "EndereГo"
+msgid "Forward the selected message to someone"
+msgstr "Imprimir a mensagem seleccionada"
 
+#: ui/evolution-mail-message.xml.h:37
+msgid "Forward the selected message to someone as an attachment"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:39
+#, fuzzy
+msgid "Load _Images"
+msgstr "Enviar esta mensagem"
+
+#: ui/evolution-mail-message.xml.h:41
+msgid "Mark as I_mportant"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:43
+msgid "Mark as Unimp_ortant"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:44
 #, fuzzy
-#~ msgid "Check Address"
-#~ msgstr "EndereГo"
+msgid "Mark the selected messages as having been read"
+msgstr "Imprimir a mensagem seleccionada"
 
+#: ui/evolution-mail-message.xml.h:45
 #, fuzzy
-#~ msgid "Finland"
-#~ msgstr "Encontrar"
+msgid "Mark the selected messages as important"
+msgstr "Imprimir a mensagem seleccionada"
+
+#: ui/evolution-mail-message.xml.h:46
+msgid "Mark the selected messages as not having been read"
+msgstr ""
 
+#: ui/evolution-mail-message.xml.h:47
 #, fuzzy
-#~ msgid "_Address:"
-#~ msgstr "EndereГo"
+msgid "Mark the selected messages as unimportant"
+msgstr "Imprimir a mensagem seleccionada"
 
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
-#~ msgid "Addressbook Sources"
-#~ msgstr "Adicionar Fonte"
+msgid "Mark the selected messages for deletion"
+msgstr "Imprimir a mensagem seleccionada"
 
+#: ui/evolution-mail-message.xml.h:49
 #, fuzzy
-#~ msgid "Find..."
-#~ msgstr "Encontrar"
+msgid "Move"
+msgstr "Sg"
 
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
-#~ msgid "Message Recipients"
-#~ msgstr "SituaГЦo das mensagens"
+msgid "Move selected messages to another folder"
+msgstr "Gravar a mensagem na pasta especificada"
 
+#: ui/evolution-mail-message.xml.h:51
 #, fuzzy
-#~ msgid "Select Names"
-#~ msgstr "_Items seleccionados"
+msgid "Next"
+msgstr "PrС_ximo"
 
+#: ui/evolution-mail-message.xml.h:52
 #, fuzzy
-#~ msgid "Select name from:"
-#~ msgstr "_Items seleccionados"
+msgid "Next Important Message"
+msgstr "Responder ao emissor desta mensagem"
 
+#: ui/evolution-mail-message.xml.h:53
 #, fuzzy
-#~ msgid "a"
-#~ msgstr "am"
+msgid "Next Message"
+msgstr "Mensagem de _correio"
 
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
-#~ msgid "b"
-#~ msgstr "%b"
+msgid "Next Thread"
+msgstr "Reponder para todos"
 
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
-#~ msgid "c"
-#~ msgstr "Cc"
+msgid "Next Unread Message"
+msgstr "Encontrar mensagens"
 
+#: ui/evolution-mail-message.xml.h:56
 #, fuzzy
-#~ msgid "e"
-#~ msgstr "Qa"
+msgid "Open the selected message in a new window"
+msgstr "Imprimir a mensagem seleccionada"
 
-#~ msgid "h"
-#~ msgstr "h"
+#: ui/evolution-mail-message.xml.h:57
+msgid "Open the selected message in the composer to re-send it"
+msgstr ""
 
+#: ui/evolution-mail-message.xml.h:58
 #, fuzzy
-#~ msgid "k"
-#~ msgstr "Ok"
+msgid "Previews the message to be printed"
+msgstr "Enviar a mensagem"
 
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
-#~ msgid "m"
-#~ msgstr "am"
+msgid "Previous"
+msgstr "An_terior"
 
+#: ui/evolution-mail-message.xml.h:60
 #, fuzzy
-#~ msgid "o"
-#~ msgstr "Para"
+msgid "Previous Important Message"
+msgstr "Encontrar mensagens"
 
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
-#~ msgid "p"
-#~ msgstr "pm"
+msgid "Previous Message"
+msgstr "Encontrar mensagens"
 
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
-#~ msgid "r"
-#~ msgstr "Sx"
+msgid "Previous Unread Message"
+msgstr "Descartar esta mensagem?"
 
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
-#~ msgid "u"
-#~ msgstr "Do"
+msgid "Print Message..."
+msgstr "Encontrar mensagens"
 
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
-#~ msgid "Body"
-#~ msgstr "Hoje"
+msgid "Print Preview..."
+msgstr "Prever impressЦo"
 
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
-#~ msgid "Font..."
-#~ msgstr "Imprimir..."
+msgid "Print this message"
+msgstr "Encontrar mensagens"
 
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "Responder"
+
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "Reponder para todos"
+
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
-#~ msgid "Fonts"
-#~ msgstr "MЙs"
+msgid "S_earch Message"
+msgstr "Mensagem de _correio"
 
+#: ui/evolution-mail-message.xml.h:72
 #, fuzzy
-#~ msgid "Format"
-#~ msgstr "F_ormato"
+msgid "Save the message as a text file"
+msgstr "Gravar a mensagem na pasta especificada"
 
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:74
 #, fuzzy
-#~ msgid "Header"
-#~ msgstr "Ano"
+msgid "Show Email _Source"
+msgstr "atalhos principais"
 
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
-#~ msgid "Headings"
-#~ msgstr "CabeГalhos:"
+msgid "Show Full _Headers"
+msgstr "Novas mensagens de correio"
 
+#: ui/evolution-mail-message.xml.h:76
 #, fuzzy
-#~ msgid "Height:"
-#~ msgstr "CabeГalhos:"
+msgid "Show message in the normal style"
+msgstr "Enviar mensagem em formato HTML"
 
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
-#~ msgid "Margins"
-#~ msgstr "мcones _grandes"
+msgid "Show message with all email headers"
+msgstr "Gravar a mensagem na pasta especificada"
 
+#: ui/evolution-mail-message.xml.h:78
 #, fuzzy
-#~ msgid "Options"
-#~ msgstr "_OpГУes"
+msgid "Show the raw email source of the message"
+msgstr "Anexar um ficheiro Ю mensagem"
 
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
-#~ msgid "Orientation"
-#~ msgstr "OrganizaГЦo"
+msgid "Un-delete the selected messages"
+msgstr "Imprimir a mensagem seleccionada"
 
+#: ui/evolution-mail-message.xml.h:80
+msgid "VFolder on Mailing _List..."
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:81
 #, fuzzy
-#~ msgid "Page"
-#~ msgstr "Bip"
+msgid "VFolder on Se_nder..."
+msgstr "Ficheiro nЦo encontrado"
+
+#: ui/evolution-mail-message.xml.h:82
+msgid "VFolder on _Recipients..."
+msgstr ""
 
+#: ui/evolution-mail-message.xml.h:83
+msgid "VFolder on _Subject..."
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:84
 #, fuzzy
-#~ msgid "Paper"
-#~ msgstr "Bip"
+msgid "_Apply Filters"
+msgstr "DruМda dos _filtros"
 
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
-#~ msgid "Paper source:"
-#~ msgstr "Fontes de correio"
+msgid "_Copy to Folder"
+msgstr "Ir para a _pasta..."
 
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
-#~ msgid "Portrait"
-#~ msgstr "Prioridade"
+msgid "_Create Filter From Message"
+msgstr "Mensagens de correio em rascunho"
 
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
-#~ msgid "Preview:"
-#~ msgstr "Prever impressЦo"
+msgid "_Forward Message"
+msgstr "Enviar esta mensagem"
 
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
-#~ msgid "Sections:"
-#~ msgstr "Segundos"
+msgid "_Message Display"
+msgstr "Mensagem de _correio"
 
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
-#~ msgid "Shading"
-#~ msgstr "CabeГalhos:"
+msgid "_Move to Folder"
+msgstr "Ir para a _pasta..."
 
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
-#~ msgid "Start on a new page"
-#~ msgstr "Enviar uma nova mensagem"
+msgid "_Normal Display"
+msgstr "Dia"
 
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
-#~ msgid "Style name:"
-#~ msgstr "Nome completo:"
+msgid "_Open Message"
+msgstr "Mensagem de _correio"
 
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
-#~ msgid "Top:"
-#~ msgstr "Para:"
+msgid "_Re-send Message"
+msgstr "Mensagem de _correio"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 #, fuzzy
-#~ msgid "Calendar Server"
-#~ msgstr "Novo Ca_lendАrio"
+msgid "Close this window"
+msgstr "Novo compromisso"
+
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr ""
 
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr ""
+
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr ""
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
 #, fuzzy
-#~ msgid "Evolution calendar iTip/iMip viewer"
-#~ msgstr "Atalho para _barra do Evolution"
+msgid "_Close"
+msgstr "Cores"
 
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
 #, fuzzy
-#~ msgid "Factory for the Evolution calendar component."
-#~ msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+msgid "_View"
+msgstr "_Novo"
+
+#: ui/evolution-message-composer.xml.h:1
+msgid "Attach"
+msgstr "Anexar"
 
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 #, fuzzy
-#~ msgid "Edit appointment"
-#~ msgstr "_Editar Compromisso"
+msgid "Close the current file"
+msgstr "Fechar o calendАrio corrente"
 
+#: ui/evolution-message-composer.xml.h:5
 #, fuzzy
-#~ msgid "05 minutes"
-#~ msgstr "Minutos"
+msgid "Delete all but signature"
+msgstr "Ficheiro com assinatura:"
 
+#: ui/evolution-message-composer.xml.h:6
 #, fuzzy
-#~ msgid "10 minutes"
-#~ msgstr "Minutos"
+msgid "Encrypt this message with PGP"
+msgstr "Enviar a mensagem"
+
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
 
+#: ui/evolution-message-composer.xml.h:8
+msgid "F_ormat"
+msgstr "F_ormato"
+
+#: ui/evolution-message-composer.xml.h:9
+msgid "HTML"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:10
+msgid "Inline Text _File..."
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:11
 #, fuzzy
-#~ msgid "12 hour (am/pm)"
-#~ msgstr "12 horas (AM/PM)"
+msgid "Insert a file as text into the message"
+msgstr "Anexar um ficheiro Ю mensagem"
+
+#: ui/evolution-message-composer.xml.h:12
+msgid "Insert text file..."
+msgstr ""
 
+#: ui/evolution-message-composer.xml.h:14
 #, fuzzy
-#~ msgid "15 minutes"
-#~ msgstr "Minutos"
+msgid "Open a file"
+msgstr "Abrir ficheiro"
+
+#: ui/evolution-message-composer.xml.h:15
+msgid "PGP Encrypt"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:16
+msgid "PGP Sign"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:17
+msgid "S/MIME Encrypt"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:18
+msgid "S/MIME Sign"
+msgstr ""
 
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
 #, fuzzy
-#~ msgid "24 hour"
-#~ msgstr "24 horas"
+msgid "Save"
+msgstr "SА"
 
+#: ui/evolution-message-composer.xml.h:20
 #, fuzzy
-#~ msgid "30 minutes"
-#~ msgstr "Minutos"
+msgid "Save As"
+msgstr "Guardar CalendАrio como"
 
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
-#~ msgid "60 minutes"
-#~ msgstr "Minutos"
+msgid "Save in folder..."
+msgstr "Gravar na _pasta..."
 
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
 #, fuzzy
-#~ msgid "Calendar"
-#~ msgstr "Novo Ca_lendАrio"
+msgid "Save the current file"
+msgstr "Ficheiro com assinatura:"
 
+#: ui/evolution-message-composer.xml.h:25
 #, fuzzy
-#~ msgid "Calendar Preferences"
-#~ msgstr "PreferЙncias"
+msgid "Save the current file with a different name"
+msgstr "Ficheiro com assinatura:"
 
-#~ msgid "Colors"
-#~ msgstr "Cores"
+#: ui/evolution-message-composer.xml.h:26
+msgid "Save the message in a specified folder"
+msgstr "Gravar a mensagem na pasta especificada"
+
+#: ui/evolution-message-composer.xml.h:27
+msgid "Send"
+msgstr "Enviar"
 
+#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
-#~ msgid "Show week numbers"
-#~ msgstr "Mostrar 1 semana"
+msgid "Send _Later"
+msgstr "Enviar"
 
+#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
-#~ msgid "TaskPad"
-#~ msgstr "_Tarefa"
+msgid "Send _later"
+msgstr "Enviar"
 
+#: ui/evolution-message-composer.xml.h:30
 #, fuzzy
-#~ msgid "Visual Alarms"
-#~ msgstr "Alarmes"
+msgid "Send the mail in HTML format"
+msgstr "Enviar mensagem em formato HTML"
 
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
-#~ msgid "Work week"
-#~ msgstr "Semana"
+msgid "Send the message later"
+msgstr "Enviar a mensagem"
 
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
-#~ msgid "seconds."
-#~ msgstr " segundos"
+msgid "Send this message now"
+msgstr "Enviar esta mensagem"
 
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
-#~ msgid "Normal"
-#~ msgstr "F_ormato"
+msgid "Show / hide attachments"
+msgstr "Ver/esconder anexos"
 
+#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
-#~ msgid "Not Started"
-#~ msgstr "_ComeГando"
+msgid "Show _attachments"
+msgstr "Ver _anexos"
 
+#: ui/evolution-message-composer.xml.h:35
 #, fuzzy
-#~ msgid "Task"
-#~ msgstr "_Tarefa"
+msgid "Show attachments"
+msgstr "Ver _anexos"
 
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
-#~ msgid "_Contacts..."
-#~ msgstr "_Contacto"
+msgid "Sign this message with your PGP key"
+msgstr "Enviar esta mensagem"
 
+#: ui/evolution-message-composer.xml.h:37
 #, fuzzy
-#~ msgid "_Priority:"
-#~ msgstr "Prioridade:"
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Enviar esta mensagem"
 
+#: ui/evolution-message-composer.xml.h:38
 #, fuzzy
-#~ msgid "Appointment Basics"
-#~ msgstr "Compromissos:"
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Mostrar a barra de pastas"
 
-#~ msgid "Days"
-#~ msgstr "DiasRascunhos"
+#: ui/evolution-message-composer.xml.h:39
+#, fuzzy
+msgid "Toggles whether the CC field is displayed"
+msgstr "Mostrar a barra de pastas"
 
+#: ui/evolution-message-composer.xml.h:40
 #, fuzzy
-#~ msgid "Exceptions"
-#~ msgstr "_AcГУes"
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Mostrar a barra de pastas"
 
-#~ msgid "Hours"
-#~ msgstr "Horas"
+#: ui/evolution-message-composer.xml.h:41
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
 
+#: ui/evolution-message-composer.xml.h:42
 #, fuzzy
-#~ msgid "Mail _to:"
-#~ msgstr "atalhos principais"
+msgid "_Attachment..."
+msgstr "Adicionar anexo..."
 
-#~ msgid "Minutes"
-#~ msgstr "Minutos"
+#: ui/evolution-message-composer.xml.h:43
+msgid "_Bcc Field"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Modify"
-#~ msgstr "Segunda-feira"
+#: ui/evolution-message-composer.xml.h:44
+msgid "_Cc Field"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Preview"
-#~ msgstr "Prever impressЦo"
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr ""
 
+#: ui/evolution-message-composer.xml.h:47
 #, fuzzy
-#~ msgid "Pri_vate"
-#~ msgstr "Activar"
+msgid "_Delete all"
+msgstr "Apagar"
 
-#, fuzzy
-#~ msgid "Su_mmary:"
-#~ msgstr "SumАrio:"
+#: ui/evolution-message-composer.xml.h:50
+msgid "_From Field"
+msgstr ""
 
-#~ msgid "_Mail"
-#~ msgstr "_Correio"
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
+msgid "_Insert"
+msgstr "_Inserir"
 
+#: ui/evolution-message-composer.xml.h:52
 #, fuzzy
-#~ msgid "day(s)"
-#~ msgstr "DiasRascunhos"
+msgid "_Open..."
+msgstr "_Abrir"
 
+#: ui/evolution-message-composer.xml.h:53
 #, fuzzy
-#~ msgid "month(s)"
-#~ msgstr "MЙs"
+msgid "_Reply-To Field"
+msgstr "Responder"
+
+#: ui/evolution-message-composer.xml.h:55
+msgid "_Security"
+msgstr ""
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
 #, fuzzy
-#~ msgid "week(s)"
-#~ msgstr "Semanas"
+msgid "_Help"
+msgstr "Casa"
+
+#: ui/evolution-subscribe.xml.h:1
+msgid "Add folder to your list of subscribed folders"
+msgstr ""
 
+#: ui/evolution-subscribe.xml.h:2
 #, fuzzy
-#~ msgid "April"
-#~ msgstr "_Correio"
+msgid "F_older"
+msgstr "_Pastas"
 
+#: ui/evolution-subscribe.xml.h:3
+msgid "Refresh List"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:4
+msgid "Refresh List of Folders"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:5
+msgid "Remove folder from your list of subscribed folders"
+msgstr ""
+
+#: ui/evolution-subscribe.xml.h:7
 #, fuzzy
-#~ msgid "Go To Today"
-#~ msgstr "Hoje"
+msgid "Subscribe"
+msgstr "Fontes"
+
+#: ui/evolution-subscribe.xml.h:8
+msgid "Unsubscribe"
+msgstr ""
 
+#: ui/evolution-task-editor.xml.h:1
+msgid "Cancel Task"
+msgstr ""
+
+#: ui/evolution-task-editor.xml.h:3
 #, fuzzy
-#~ msgid "March"
-#~ msgstr "Ano"
+msgid "Delegate Task"
+msgstr "Apagar este item"
+
+#: ui/evolution-task-editor.xml.h:7
+msgid "Re_fresh Task"
+msgstr ""
 
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:3
 #, fuzzy
-#~ msgid "May"
-#~ msgstr "Segunda-feira"
+msgid "Copy selected task"
+msgstr "Copiar item seleccionada para a Аrea de transferЙncia"
 
+#: ui/evolution-tasks.xml.h:4
 #, fuzzy
-#~ msgid "October"
-#~ msgstr "Outro"
+msgid "Create a new task"
+msgstr "Criar um novo contacto"
 
+#: ui/evolution-tasks.xml.h:5
 #, fuzzy
-#~ msgid "Attachment properties"
-#~ msgstr "Propriedades do alarme"
+msgid "Cut selected task"
+msgstr "Apagar este item"
 
+#: ui/evolution-tasks.xml.h:7
 #, fuzzy
-#~ msgid "File name:"
-#~ msgstr "Nome completo:"
+msgid "Delete selected tasks"
+msgstr "Apagar este item"
 
+#: ui/evolution-tasks.xml.h:8
 #, fuzzy
-#~ msgid "Edit VFolders"
-#~ msgstr "_Pastas"
+msgid "New Task"
+msgstr "_Tarefa"
 
+#: ui/evolution-tasks.xml.h:9
 #, fuzzy
-#~ msgid "Virtual Folders"
-#~ msgstr "_Pastas"
+msgid "Paste task from the clipboard"
+msgstr "Colar item da Аrea de transferЙncia"
 
+#: ui/evolution-tasks.xml.h:12
+msgid "Save task as something else"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:13
 #, fuzzy
-#~ msgid "vFolder Sources"
-#~ msgstr "Adicionar Fonte"
+msgid "Tasks Settings"
+msgstr "Segundos"
 
+#: ui/evolution-tasks.xml.h:19
 #, fuzzy
-#~ msgid "Save"
-#~ msgstr "SА"
+msgid "_Task"
+msgstr "_Tarefa"
 
+#: ui/evolution.xml.h:1
 #, fuzzy
-#~ msgid "Hide deleted"
-#~ msgstr "Apagar"
+msgid "About Evolution..."
+msgstr "Evolution"
 
+#: ui/evolution.xml.h:2
 #, fuzzy
-#~ msgid "Hide Subject"
-#~ msgstr "Assunto"
+msgid "Add to _Shortcut Bar"
+msgstr "Mostrar a barra de atalhos"
+
+#: ui/evolution.xml.h:3
+msgid "Change the name of this folder"
+msgstr ""
 
+#: ui/evolution.xml.h:6
 #, fuzzy
-#~ msgid "Hide from Sender"
-#~ msgstr "Ficheiro nЦo encontrado"
+msgid "Copy this folder"
+msgstr "Ir para a _pasta..."
 
+#: ui/evolution.xml.h:7
 #, fuzzy
-#~ msgid "Hide Messages"
-#~ msgstr "Encontrar mensagens"
+msgid "Create _New Folder..."
+msgstr "Criar um novo calendАrio"
 
+#: ui/evolution.xml.h:8
 #, fuzzy
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "Assunto"
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "Remover este atalho da barra de atalhos"
 
+#: ui/evolution.xml.h:9
 #, fuzzy
-#~ msgid "Current store format:"
-#~ msgstr "NЦo se consegui inicializar Bonobo"
+msgid "Create a new folder"
+msgstr "Criar um novo calendАrio"
 
+#: ui/evolution.xml.h:13
 #, fuzzy
-#~ msgid "Mailbox Format"
-#~ msgstr "F_ormato"
+msgid "Delete this folder"
+msgstr "Apagar este item"
+
+#: ui/evolution.xml.h:14
+msgid "Display a different folder"
+msgstr "Mostrar uma pasta diferente"
 
+#: ui/evolution.xml.h:15
 #, fuzzy
-#~ msgid "mbox"
-#~ msgstr "Correio novo"
+msgid "E_xit"
+msgstr "PrС_ximo"
 
+#: ui/evolution.xml.h:16
 #, fuzzy
-#~ msgid "mh"
-#~ msgstr "h"
+msgid "Evolution _FAQ"
+msgstr "Evolution"
 
+#: ui/evolution.xml.h:17
 #, fuzzy
-#~ msgid "Account Information"
-#~ msgstr "Nenhuma InformaГЦo"
+msgid "Evolution _Window"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:18
+msgid "Exit the program"
+msgstr ""
 
+#: ui/evolution.xml.h:19
+msgid "Getting _Started"
+msgstr "_ComeГando"
+
+#: ui/evolution.xml.h:20
+msgid "Import an external file format"
+msgstr ""
+
+#: ui/evolution.xml.h:22
 #, fuzzy
-#~ msgid "Account Properties"
-#~ msgstr "Propriedades do alarme"
+msgid "Move this folder to another place"
+msgstr "Ir para a _pasta..."
 
+#: ui/evolution.xml.h:24
 #, fuzzy
-#~ msgid "Advanced"
-#~ msgstr "Adicionar..."
+msgid "Open in New _Window"
+msgstr "еbrir em nova janela"
+
+#: ui/evolution.xml.h:25
+msgid "Open this folder in an other window"
+msgstr ""
+
+#: ui/evolution.xml.h:26
+msgid "Show information about Evolution"
+msgstr ""
 
+#: ui/evolution.xml.h:27
+msgid "Submit Bug Report"
+msgstr ""
+
+#: ui/evolution.xml.h:28
+msgid "Submit _Bug Report"
+msgstr ""
+
+#: ui/evolution.xml.h:29
+msgid "Submit bug report using Bug Buddy."
+msgstr ""
+
+#: ui/evolution.xml.h:30
+msgid "Toggle"
+msgstr ""
+
+#: ui/evolution.xml.h:31
 #, fuzzy
-#~ msgid "Authentication"
-#~ msgstr "AutenticaГЦo"
+msgid "Toggle whether to show the folder bar"
+msgstr "Mostrar a barra de pastas"
 
+#: ui/evolution.xml.h:32
 #, fuzzy
-#~ msgid "Authentication Type:"
-#~ msgstr "AutenticaГЦo"
+msgid "Toggle whether to show the shortcut bar"
+msgstr "Mostrar a barra de atalhos"
+
+#: ui/evolution.xml.h:33
+msgid "Toggle whether we are working offline."
+msgstr ""
 
+#: ui/evolution.xml.h:34
 #, fuzzy
-#~ msgid "Done"
-#~ msgstr "Nenhuma"
+msgid "Using the C_ontact Manager"
+msgstr "Usando o programa de C_orreio"
+
+#: ui/evolution.xml.h:35
+msgid "Using the _Calendar"
+msgstr "Usando o _CalendАrio"
+
+#: ui/evolution.xml.h:36
+msgid "Using the _Mailer"
+msgstr "Usando o programa de C_orreio"
 
+#: ui/evolution.xml.h:37
 #, fuzzy
-#~ msgid "E-Mail Address:"
-#~ msgstr "EndereГo de correio:"
+msgid "View the selected folder"
+msgstr "Imprimir a mensagem seleccionada"
 
+#: ui/evolution.xml.h:39
 #, fuzzy
-#~ msgid "Email Address:"
-#~ msgstr "EndereГo de correio:"
+msgid "_About Evolution..."
+msgstr "Evolution"
 
+#: ui/evolution.xml.h:41
 #, fuzzy
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "ConfiguraГЦo do correio"
+msgid "_Appointment (FIXME)"
+msgstr "_Compromisso"
 
+#: ui/evolution.xml.h:43
 #, fuzzy
-#~ msgid "Full Name:"
-#~ msgstr "Nome completo:"
+msgid "_Contact (FIXME)"
+msgstr "_Contacto"
 
+#: ui/evolution.xml.h:44
 #, fuzzy
-#~ msgid "Hostname:"
-#~ msgstr "Utilizador:"
+msgid "_Copy..."
+msgstr "Copiar"
 
+#: ui/evolution.xml.h:49
 #, fuzzy
-#~ msgid "Mail"
-#~ msgstr "_Correio"
+msgid "_Folder Bar"
+msgstr "_Pasta"
 
+#: ui/evolution.xml.h:50
 #, fuzzy
-#~ msgid "Mail Account"
-#~ msgstr "мcone_s pequenos"
+msgid "_Go to Folder..."
+msgstr "Ir para a _pasta..."
 
-#~ msgid "Mail Configuration"
-#~ msgstr "ConfiguraГЦo do correio"
+#: ui/evolution.xml.h:52
+#, fuzzy
+msgid "_Import file..."
+msgstr "Propriedades do alarme"
 
+#: ui/evolution.xml.h:53
 #, fuzzy
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "ConfiguraГЦo do correio"
+msgid "_Index"
+msgstr "мnd_ice de ajuda"
 
+#: ui/evolution.xml.h:54
 #, fuzzy
-#~ msgid "News"
-#~ msgstr "Novo"
+msgid "_Mail message"
+msgstr "Mensagem de _correio"
 
+#: ui/evolution.xml.h:55
 #, fuzzy
-#~ msgid "Optional"
-#~ msgstr "_OpГУes"
+msgid "_Move..."
+msgstr "Sg"
 
-#~ msgid "Organization:"
-#~ msgstr "OrganizaГЦo:"
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Novo"
 
+#: ui/evolution.xml.h:57
 #, fuzzy
-#~ msgid "Password:"
-#~ msgstr "Esquecer _Senhas"
+msgid "_New Folder"
+msgstr "_Nova pasta"
 
+#: ui/evolution.xml.h:58
 #, fuzzy
-#~ msgid "Reply-to:"
-#~ msgstr "Responder"
+msgid "_Rename..."
+msgstr "_Abrir"
 
+#: ui/evolution.xml.h:59
 #, fuzzy
-#~ msgid "Required"
-#~ msgstr "Pessoas _NecessЦrias"
+msgid "_Shortcut"
+msgstr "Mudar nome de atalho"
 
+#: ui/evolution.xml.h:60
 #, fuzzy
-#~ msgid "Save password"
-#~ msgstr "Gravar como VCard"
+msgid "_Shortcut Bar"
+msgstr "Mostrar a barra de atalhos"
 
+#: ui/evolution.xml.h:61
 #, fuzzy
-#~ msgid "Select signature file"
-#~ msgstr "Ficheiro com assinatura:"
+msgid "_Task (FIXME)"
+msgstr "_Contacto"
 
+#: ui/evolution.xml.h:64
 #, fuzzy
-#~ msgid "Server Configuration"
-#~ msgstr "ConfiguraГЦo do correio"
+msgid "_Work Offline"
+msgstr "Seg"
 
-#, fuzzy
-#~ msgid "Server Type: "
-#~ msgstr "Servidor:"
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
 
+#: ui/my-evolution.xml.h:4
 #, fuzzy
-#~ msgid "Servers"
-#~ msgstr "Servidor:"
+msgid "_My Evolution Settings..."
+msgstr "Evolution"
 
-#~ msgid "Signature file:"
-#~ msgstr "Ficheiro com assinatura:"
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "Address Cards"
+msgstr "EndereГo"
 
+#: views/addressbook/galview.xml.h:2
 #, fuzzy
-#~ msgid "Signature:"
-#~ msgstr "Ficheiro com assinatura:"
+msgid "By Company"
+msgstr "Empresa"
 
-#~ msgid "Sources"
-#~ msgstr "Fontes"
+#: views/addressbook/galview.xml.h:3
+msgid "Phone List"
+msgstr ""
 
+#: views/mail/galview.xml.h:1
 #, fuzzy
-#~ msgid "User Information"
-#~ msgstr "Nenhuma InformaГЦo"
+msgid "By Sender"
+msgstr "Enviar"
 
-#~ msgid "Username:"
-#~ msgstr "Utilizador:"
+#: views/mail/galview.xml.h:2
+#, fuzzy
+msgid "By Status"
+msgstr "SАb"
 
+#: views/mail/galview.xml.h:3
 #, fuzzy
-#~ msgid "minute(s)"
-#~ msgstr "Minutos"
+msgid "By Subject"
+msgstr "Assunto"
 
-#~ msgid "Full name:"
-#~ msgstr "Nome completo:"
+#: views/mail/galview.xml.h:4
+#, fuzzy
+msgid "Messages"
+msgstr "Mensagem de _correio"
 
-#~ msgid "Email address:"
-#~ msgstr "EndereГo de correio:"
+#: views/tasks/galview.xml.h:2
+msgid "With Category"
+msgstr ""
 
-#~ msgid "Server:"
-#~ msgstr "Servidor:"
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Mail source type:"
-#~ msgstr "Fontes de correio"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+msgid "Busy"
+msgstr "Ocupado"
 
-#, fuzzy
-#~ msgid "Mail transport type:"
-#~ msgstr "Transporte de correio"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
+msgid "Out of Office"
+msgstr "Fora do escritСrio"
 
-#~ msgid "Add Source"
-#~ msgstr "Adicionar Fonte"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
+msgid "No Information"
+msgstr "Nenhuma InformaГЦo"
 
-#, fuzzy
-#~ msgid "Add News Server"
-#~ msgstr "Adicionar novo grupo"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
+msgid "_Invite Others..."
+msgstr ""
 
-#~ msgid "Address"
-#~ msgstr "EndereГo"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
+msgid "_Options"
+msgstr "_OpГУes"
 
-#, fuzzy
-#~ msgid "Mail Sources"
-#~ msgstr "atalhos principais"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
+msgid "Show _Only Working Hours"
+msgstr ""
 
-#~ msgid "Mail Transport"
-#~ msgstr "Transporte de correio"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
+msgid "Show _Zoomed Out"
+msgstr ""
 
-#, fuzzy
-#~ msgid "News Servers"
-#~ msgstr "Servidor:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
+msgid "_Update Free/Busy"
+msgstr ""
 
-#, fuzzy
-#~ msgid "News Sources"
-#~ msgstr "Fontes"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
+msgid "_<<"
+msgstr "_<<"
 
-#~ msgid "Send messages in HTML format"
-#~ msgstr "Enviar mensagem em formato HTML"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
+msgid "_Autopick"
+msgstr ""
 
-#~ msgid "Delete a contact"
-#~ msgstr "Apagar um contacto"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
+msgid ">_>"
+msgstr ">_>"
 
-#~ msgid "Find"
-#~ msgstr "Encontrar"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
+msgid "_All People and Resources"
+msgstr ""
 
-#~ msgid "Find a contact"
-#~ msgstr "Encontrar um contacto"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
+msgid "All _People and One Resource"
+msgstr ""
 
-#~ msgid "Print contacts"
-#~ msgstr "Imprimir contactos"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
+msgid "_Required People"
+msgstr "Pessoas _NecessЦrias"
 
-#, fuzzy
-#~ msgid "View all contacts"
-#~ msgstr "Encontrar um contacto"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
+msgid "Required People and _One Resource"
+msgstr ""
 
-#, fuzzy
-#~ msgid "_Addressbook Configuration..."
-#~ msgstr "ConfiguraГЦo do co_rreio..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
+msgid "Meeting _start time:"
+msgstr "Hora de Мn_icio de encontro"
 
-#, fuzzy
-#~ msgid "_Print Contacts..."
-#~ msgstr "Imprimir contactos"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
+msgid "Meeting _end time:"
+msgstr "Hora de _fim de _encontro"
 
-#~ msgid "5 Days"
-#~ msgstr "5 Dias"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
+msgid "All Attendees"
+msgstr ""
 
+#: widgets/menus/gal-view-menus.c:218
 #, fuzzy
-#~ msgid "Alter preferences"
-#~ msgstr "PreferЙncias"
+msgid "_Current View"
+msgstr "Ano corrente (%Y)"
 
-#, fuzzy
-#~ msgid "Ca_lendar"
-#~ msgstr "Novo Ca_lendАrio"
+#: widgets/menus/gal-view-menus.c:259
+msgid "Define Views"
+msgstr ""
+
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:428
+msgid "MTWTFSS"
+msgstr ""
 
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 #, fuzzy
-#~ msgid "Calendar Preferences..."
-#~ msgstr "PreferЙncias"
+msgid "Now"
+msgstr "Novo"
 
-#~ msgid "Create a new calendar"
-#~ msgstr "Criar um novo calendАrio"
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Hoje"
 
-#~ msgid "Go to"
-#~ msgstr "Ir para"
+#: widgets/misc/e-cell-date-edit.c:248
+msgid "OK"
+msgstr ""
 
-#~ msgid "Go to a specific date"
-#~ msgstr "Ir para uma data especМfica"
+#: widgets/misc/e-cell-date-edit.c:731
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr ""
 
-#~ msgid "Month"
-#~ msgstr "MЙs"
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
 
-#~ msgid "Open a calendar"
-#~ msgstr "Abrir um calendАrio"
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
 
-#~ msgid "Print this calendar"
-#~ msgstr "Imprimir este calendАrio"
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
 
-#~ msgid "Show 1 day"
-#~ msgstr "Mostrar 1 dia"
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
 
-#~ msgid "Show 1 month"
-#~ msgstr "Mostrar 1 mЙs"
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "Semana"
 
-#~ msgid "Show 1 week"
-#~ msgstr "Mostrar 1 semana"
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
 
-#~ msgid "Show the working week"
-#~ msgstr "Mostrar a semana de trabalho"
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
 
-#~ msgid "Week"
-#~ msgstr "Semana"
+#: widgets/misc/e-charset-picker.c:66
+msgid "Turkish"
+msgstr ""
 
-#~ msgid "_New"
-#~ msgstr "_Novo"
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
 
-#, fuzzy
-#~ msgid "_Open Calendar"
-#~ msgstr "Abrir Ca_lendАrio"
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
 
+#: widgets/misc/e-charset-picker.c:85
 #, fuzzy
-#~ msgid "_Print this calendar"
-#~ msgstr "Imprimir este calendАrio"
+msgid "Traditional"
+msgstr "_OpГУes"
 
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+msgid "New"
+msgstr "Novo"
+
+#: widgets/misc/e-charset-picker.c:160
+#, c-format
+msgid "Unknown character set: %s"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
 #, fuzzy
-#~ msgid "_Save As..."
-#~ msgstr "Gravar na _pasta..."
+msgid "Other..."
+msgstr "Outro"
 
-#~ msgid "Delete this item"
-#~ msgstr "Apagar este item"
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
 
+#: widgets/misc/e-clipped-label.c:112
+msgid "..."
+msgstr "..."
+
+#: widgets/misc/e-filter-bar.c:157
 #, fuzzy
-#~ msgid "Delete..."
-#~ msgstr "Apagar"
+msgid "Search Editor"
+msgstr "_Contacto"
 
+#: widgets/misc/e-filter-bar.c:173
 #, fuzzy
-#~ msgid "Print En_velope..."
-#~ msgstr "Imprimir..."
+msgid "Save Search"
+msgstr "Ano"
 
-#~ msgid "Print this item"
-#~ msgstr "Imprimir este item"
+#: widgets/misc/e-filter-bar.c:241
+#, fuzzy
+msgid "Advanced Search"
+msgstr "Adicionar..."
 
-#~ msgid "Print..."
-#~ msgstr "Imprimir..."
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr ""
 
+#: widgets/misc/e-filter-bar.h:104
 #, fuzzy
-#~ msgid "Save _As..."
-#~ msgstr "Gravar na _pasta..."
+msgid "Advanced..."
+msgstr "Adicionar..."
 
+#: widgets/misc/e-messagebox.c:152
 #, fuzzy
-#~ msgid "Save and Close"
-#~ msgstr "Guardar CalendАrio como"
+msgid "Information"
+msgstr "Nenhuma InformaГЦo"
 
+#: widgets/misc/e-messagebox.c:159
 #, fuzzy
-#~ msgid "_File"
-#~ msgstr "_Pasta"
+msgid "Warning"
+msgstr "Seg"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr ""
+
+#: widgets/misc/e-messagebox.c:173
 #, fuzzy
-#~ msgid "_Print..."
-#~ msgstr "Imprimir..."
+msgid "Question"
+msgstr "Nenhuma descriГЦo"
 
+#: widgets/misc/e-messagebox.c:180
 #, fuzzy
-#~ msgid "C_lear"
-#~ msgstr "Carro"
+msgid "Message"
+msgstr "Mensagem de _correio"
 
+#. Add the "Don't show this message again." checkbox
+#: widgets/misc/e-messagebox.c:224
 #, fuzzy
-#~ msgid "C_ut"
-#~ msgstr "Cortar"
+msgid "Don't show this message again."
+msgstr "Enviar esta mensagem"
+
+#: widgets/misc/e-search-bar.c:155
+msgid "Sear_ch"
+msgstr ""
 
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 #, fuzzy
-#~ msgid "Clear"
-#~ msgstr "Carro"
+msgid "The Personal Addressbook Server"
+msgstr "Adicionar Fonte"
 
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
+msgid "The Personal Calendar Server; calendar factory"
+msgstr ""
+
+#: wombat/wombat.c:173
 #, fuzzy
-#~ msgid "Close this appointment"
-#~ msgstr "Novo compromisso"
+msgid "setup_vfs(): could not initialize GNOME-VFS"
+msgstr "NЦo se consegui inicializar Bonobo"
 
-#~ msgid "Copy"
-#~ msgstr "Copiar"
+#: wombat/wombat.c:185
+#, fuzzy
+msgid "init_corba(): could not initialize GNOME"
+msgstr "NЦo se consegui inicializar Bonobo"
 
-#~ msgid "Cut"
-#~ msgstr "Cortar"
+#: wombat/wombat.c:198
+#, fuzzy
+msgid "init_bonobo(): could not initialize Bonobo"
+msgstr "NЦo se consegui inicializar Bonobo"
 
 #, fuzzy
-#~ msgid "FIXME: _New Appointment"
-#~ msgstr "_Compromisso"
+#~ msgid "Set task view preferences"
+#~ msgstr "PreferЙncias"
 
 #, fuzzy
-#~ msgid "Modify the file's properties"
-#~ msgstr "Propriedades"
+#~ msgid "TasksPreferences"
+#~ msgstr "PreferЙncias"
 
-#~ msgid "Paste"
-#~ msgstr "Colar"
+#, fuzzy
+#~ msgid "Copyright (C) 2000, Helix Code, Inc."
+#~ msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
 #, fuzzy
-#~ msgid "Paste the clipboard"
-#~ msgstr "Colar item da Аrea de transferЙncia"
+#~ msgid "Close %s"
+#~ msgstr "Cores"
 
 #, fuzzy
-#~ msgid "Print S_etup..."
-#~ msgstr "Imprimir..."
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Ir para o item anterior"
 
 #, fuzzy
-#~ msgid "Properties"
-#~ msgstr "Propriedades do alarme"
+#~ msgid "Move %s into the next row"
+#~ msgstr "Ir para o prСximo item"
 
 #, fuzzy
-#~ msgid "Redo"
-#~ msgstr "Remover"
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr "NЦo consigo abrir a localizaГЦo: %s"
 
 #, fuzzy
-#~ msgid "Replace"
-#~ msgstr "Responder"
+#~ msgid "Cannot initialize Evolution's notes component."
+#~ msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+
+#~ msgid "Synchronize"
+#~ msgstr "Sincronizar"
 
 #, fuzzy
-#~ msgid "Save the current file"
-#~ msgstr "Ficheiro com assinatura:"
+#~ msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+#~ msgstr "(C) 1998 Free Software Foundation"
+
+#~ msgid "gnome-unknown.xpm"
+#~ msgstr "gnome-unknown.xpm"
 
 #, fuzzy
-#~ msgid "Select All"
-#~ msgstr "Reponder para todos"
+#~ msgid ""
+#~ "An error occured when trying to fetch\n"
+#~ "pilot list from the gnome-pilot daemon"
+#~ msgstr ""
+#~ "Um excepГЦo ocorreu enquanto se tentava carregar dados no componente com "
+#~ "PersistStream"
 
-#~ msgid "Undo"
-#~ msgstr "Anular"
+#, fuzzy
+#~ msgid "_Company:"
+#~ msgstr "Empresa"
 
 #, fuzzy
-#~ msgid "Undo the last action"
-#~ msgstr "Anular a Зltima operaГЦo"
+#~ msgid "Evolution Calendar Conduit"
+#~ msgstr "Atalho para _barra do Evolution"
 
 #, fuzzy
-#~ msgid "_Close"
-#~ msgstr "Cores"
+#~ msgid "Evolution ToDo Conduit"
+#~ msgstr "Atalho para _barra do Evolution"
+
+#~ msgid "Open calendar"
+#~ msgstr "Abrir calendАrio"
+
+#~ msgid "Save calendar"
+#~ msgstr "Gravar calendАrio"
 
 #, fuzzy
-#~ msgid "_Copy"
-#~ msgstr "Copiar"
+#~ msgid "Open..."
+#~ msgstr "_Abrir"
 
 #, fuzzy
-#~ msgid "_Edit"
-#~ msgstr "Editar..."
+#~ msgid "Enter the identity you wish to send this message from"
+#~ msgstr "Introduza os receptores da mensagem"
+
+#~ msgid "Enter the subject of the mail"
+#~ msgstr "Introduza o assunto da carta"
 
 #, fuzzy
-#~ msgid "_Find..."
-#~ msgstr "Encontrar"
+#~ msgid "Save changes to message..."
+#~ msgstr "Enviar uma nova mensagem"
 
 #, fuzzy
-#~ msgid "_Paste"
-#~ msgstr "Colar"
+#~ msgid "Remove criterion"
+#~ msgstr "Remover grupo"
 
 #, fuzzy
-#~ msgid "_Print"
-#~ msgstr "Imprimir"
+#~ msgid "Subject contains"
+#~ msgstr "Assunto"
 
 #, fuzzy
-#~ msgid "_Properties..."
-#~ msgstr "Propriedades do alarme"
+#~ msgid "Move to Folder..."
+#~ msgstr "Ir para a _pasta..."
 
 #, fuzzy
-#~ msgid "_Undo"
-#~ msgstr "Anular"
+#~ msgid "Copy to Folder..."
+#~ msgstr "Ir para a _pasta..."
 
 #, fuzzy
-#~ msgid "Compose"
-#~ msgstr "Cores"
+#~ msgid "Closing current folder"
+#~ msgstr "Fechar o calendАrio corrente"
 
 #, fuzzy
-#~ msgid "Compose a new message"
-#~ msgstr "Criar uma nova mensagem"
+#~ msgid "(No description)"
+#~ msgstr "Nenhuma descriГЦo"
 
 #, fuzzy
-#~ msgid "Copy message to a new folder"
-#~ msgstr "Gravar a mensagem na pasta especificada"
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "Enviar esta mensagem"
 
 #, fuzzy
-#~ msgid "F_older"
-#~ msgstr "_Pastas"
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Enviar esta mensagem"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Ficheiros do Evolution instalados com sucesso"
+
+#~ msgid "Activate"
+#~ msgstr "Activar"
 
-#~ msgid "Forget _Passwords"
-#~ msgstr "Esquecer _Senhas"
+#~ msgid "Activate this shortcut"
+#~ msgstr "Activar este atalho"
 
 #, fuzzy
-#~ msgid "Get Mail"
-#~ msgstr "_Correio"
+#~ msgid "FIXME: _Appointment"
+#~ msgstr "_Compromisso"
 
 #, fuzzy
-#~ msgid "Hide _Deleted messages"
-#~ msgstr "Imprimir a mensagem seleccionada"
+#~ msgid "FIXME: Meeting Re_quest"
+#~ msgstr "Pedido de _encontro"
 
 #, fuzzy
-#~ msgid "Hide _Read messages"
-#~ msgstr "Novas mensagens de correio"
+#~ msgid "FIXME: _Contact"
+#~ msgstr "_Contacto"
 
 #, fuzzy
-#~ msgid "Hide _Selected messages"
-#~ msgstr "Imprimir a mensagem seleccionada"
+#~ msgid "FIXME: Task _Request"
+#~ msgstr "_Pedido de tarefa"
 
 #, fuzzy
-#~ msgid "Mail _Filters..."
-#~ msgstr "DruМda dos _filtros"
+#~ msgid "FIXME: _Journal Entry"
+#~ msgstr "_Entrada diАria?"
 
 #, fuzzy
-#~ msgid "Move"
-#~ msgstr "Sg"
+#~ msgid "FIXME: Define Print _Styles..."
+#~ msgstr "Pedido de _encontro"
 
 #, fuzzy
-#~ msgid "Move message to a new folder"
-#~ msgstr "Gravar a mensagem na pasta especificada"
+#~ msgid "FIXME: Save Attac_hments..."
+#~ msgstr "Adicionar anexo..."
+
+#~ msgid "_Object"
+#~ msgstr "_Objecto"
 
 #, fuzzy
-#~ msgid "Print Preview of message..."
-#~ msgstr "Prever impressЦo"
+#~ msgid "FIXME: __Formatting"
+#~ msgstr "_Contacto"
+
+#~ msgid "_Toolbars"
+#~ msgstr "_Ferramentas"
 
 #, fuzzy
-#~ msgid "Print message..."
-#~ msgstr "Encontrar mensagens"
+#~ msgid "_Forms"
+#~ msgstr "_Pasta"
 
 #, fuzzy
-#~ msgid "Reply to _All"
-#~ msgstr "Reponder para todos"
+#~ msgid "FIXME: New _Letter to Contact"
+#~ msgstr "_Contacto"
 
 #, fuzzy
-#~ msgid "Reply to _Sender"
-#~ msgstr "Reponder para todos"
+#~ msgid "FIXME: New Meetin_g with Contact"
+#~ msgstr "_Contacto"
 
 #, fuzzy
-#~ msgid "Select _All"
-#~ msgstr "Reponder para todos"
+#~ msgid "FIXME: _Plan a Meeting..."
+#~ msgstr "_Contacto"
 
 #, fuzzy
-#~ msgid "Show _All messages"
-#~ msgstr "Novas mensagens de correio"
+#~ msgid "FIXME: New _Task for Contact"
+#~ msgstr "_Contacto"
 
 #, fuzzy
-#~ msgid "_Copy to Folder..."
-#~ msgstr "Ir para a _pasta..."
+#~ msgid "FIXME: New _Journal Entry for Contact"
+#~ msgstr "_Entrada diАria?"
 
 #, fuzzy
-#~ msgid "_Edit Message"
+#~ msgid "FIXME: _Display Map of Address"
 #~ msgstr "Mensagem de _correio"
 
 #, fuzzy
-#~ msgid "_Mail Configuration..."
-#~ msgstr "ConfiguraГЦo do co_rreio..."
+#~ msgid "FIXME: _Open Web Page"
+#~ msgstr "Mensagem de _correio"
+
+#~ msgid "Actio_ns"
+#~ msgstr "_AcГУes"
 
 #, fuzzy
-#~ msgid "_Message"
-#~ msgstr "Mensagem de _correio"
+#~ msgid "FIXME: Previous"
+#~ msgstr "An_terior"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "Ir para o item anterior"
 
 #, fuzzy
-#~ msgid "_Move to Folder..."
-#~ msgstr "Ir para a _pasta..."
+#~ msgid "FIXME: Next"
+#~ msgstr "_Contacto"
 
 #, fuzzy
-#~ msgid "_Open in New Window"
-#~ msgstr "еbrir em nova janela"
+#~ msgid "Find..."
+#~ msgstr "Encontrar"
 
 #, fuzzy
-#~ msgid "_Print Message"
-#~ msgstr "Encontrar mensagens"
+#~ msgid "TaskPad"
+#~ msgstr "_Tarefa"
 
 #, fuzzy
-#~ msgid "_Source"
-#~ msgstr "Fontes"
+#~ msgid "Visual Alarms"
+#~ msgstr "Alarmes"
 
 #, fuzzy
-#~ msgid "_Undelete"
-#~ msgstr "Apagar"
+#~ msgid "Appointment Basics"
+#~ msgstr "Compromissos:"
+
+#~ msgid "Hours"
+#~ msgstr "Horas"
 
 #, fuzzy
-#~ msgid "_Virtual Folder Editor..."
-#~ msgstr "_Pastas"
+#~ msgid "Mail _to:"
+#~ msgstr "atalhos principais"
+
+#~ msgid "Minutes"
+#~ msgstr "Minutos"
 
-#~ msgid "Attach"
-#~ msgstr "Anexar"
+#~ msgid "_Mail"
+#~ msgstr "_Correio"
 
 #, fuzzy
-#~ msgid "Close the current file"
-#~ msgstr "Fechar o calendАrio corrente"
+#~ msgid "Hide deleted"
+#~ msgstr "Apagar"
+
+#, fuzzy
+#~ msgid "Hide from Sender"
+#~ msgstr "Ficheiro nЦo encontrado"
 
 #, fuzzy
-#~ msgid "Encrypt this message with PGP"
-#~ msgstr "Enviar a mensagem"
+#~ msgid "Account Properties"
+#~ msgstr "Propriedades do alarme"
 
 #, fuzzy
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "Anexar um ficheiro Ю mensagem"
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "ConfiguraГЦo do correio"
 
 #, fuzzy
-#~ msgid "Open a file"
-#~ msgstr "Abrir ficheiro"
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "ConfiguraГЦo do correio"
 
 #, fuzzy
-#~ msgid "Save As"
-#~ msgstr "Guardar CalendАrio como"
+#~ msgid "Reply-to:"
+#~ msgstr "Responder"
 
 #, fuzzy
-#~ msgid "Save in _folder... (FIXME)"
-#~ msgstr "Gravar na _pasta..."
+#~ msgid "Required"
+#~ msgstr "Pessoas _NecessЦrias"
 
 #, fuzzy
-#~ msgid "Save in folder..."
-#~ msgstr "Gravar na _pasta..."
+#~ msgid "Save password"
+#~ msgstr "Gravar como VCard"
 
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "Gravar a mensagem na pasta especificada"
+#~ msgid "Full name:"
+#~ msgstr "Nome completo:"
 
-#~ msgid "Send"
-#~ msgstr "Enviar"
+#~ msgid "Email address:"
+#~ msgstr "EndereГo de correio:"
 
 #, fuzzy
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "Enviar mensagem em formato HTML"
+#~ msgid "Mail source type:"
+#~ msgstr "Fontes de correio"
 
 #, fuzzy
-#~ msgid "Send the message later"
-#~ msgstr "Enviar a mensagem"
+#~ msgid "Mail transport type:"
+#~ msgstr "Transporte de correio"
 
-#, fuzzy
-#~ msgid "Send the message now"
-#~ msgstr "Enviar a mensagem"
+#~ msgid "Add Source"
+#~ msgstr "Adicionar Fonte"
 
 #, fuzzy
-#~ msgid "Send this message now"
-#~ msgstr "Enviar esta mensagem"
+#~ msgid "Mail Sources"
+#~ msgstr "atalhos principais"
 
-#, fuzzy
-#~ msgid "Show / hide attachments"
-#~ msgstr "Ver/esconder anexos"
+#~ msgid "Mail Transport"
+#~ msgstr "Transporte de correio"
 
 #, fuzzy
-#~ msgid "Show _attachments"
-#~ msgstr "Ver _anexos"
+#~ msgid "News Sources"
+#~ msgstr "Fontes"
+
+#~ msgid "Find a contact"
+#~ msgstr "Encontrar um contacto"
 
 #, fuzzy
-#~ msgid "Sign this message with your PGP key"
-#~ msgstr "Enviar esta mensagem"
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "ConfiguraГЦo do co_rreio..."
 
 #, fuzzy
-#~ msgid "_Open..."
-#~ msgstr "_Abrir"
+#~ msgid "_Print Contacts..."
+#~ msgstr "Imprimir contactos"
 
-#~ msgid "Display a different folder"
-#~ msgstr "Mostrar uma pasta diferente"
+#~ msgid "5 Days"
+#~ msgstr "5 Dias"
 
 #, fuzzy
-#~ msgid "E_xit"
-#~ msgstr "PrС_ximo"
+#~ msgid "Ca_lendar"
+#~ msgstr "Novo Ca_lendАrio"
 
-#, fuzzy
-#~ msgid "Evolution bar _shortcut"
-#~ msgstr "Atalho para _barra do Evolution"
+#~ msgid "Create a new calendar"
+#~ msgstr "Criar um novo calendАrio"
 
-#~ msgid "Getting _Started"
-#~ msgstr "_ComeГando"
+#~ msgid "Open a calendar"
+#~ msgstr "Abrir um calendАrio"
 
 #, fuzzy
-#~ msgid "Show the _Folder Bar"
-#~ msgstr "Mostrar a barra de pastas"
+#~ msgid "_Open Calendar"
+#~ msgstr "Abrir Ca_lendАrio"
 
 #, fuzzy
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Mostrar a barra de pastas"
+#~ msgid "_Print this calendar"
+#~ msgstr "Imprimir este calendАrio"
 
 #, fuzzy
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Mostrar a barra de atalhos"
+#~ msgid "C_lear"
+#~ msgstr "Carro"
 
 #, fuzzy
-#~ msgid "Using the C_ontact Manager"
-#~ msgstr "Usando o programa de C_orreio"
+#~ msgid "FIXME: _New Appointment"
+#~ msgstr "_Compromisso"
 
-#~ msgid "Using the _Calendar"
-#~ msgstr "Usando o _CalendАrio"
+#, fuzzy
+#~ msgid "Redo"
+#~ msgstr "Remover"
 
-#~ msgid "Using the _Mailer"
-#~ msgstr "Usando o programa de C_orreio"
+#~ msgid "Undo"
+#~ msgstr "Anular"
 
 #, fuzzy
-#~ msgid "_About Evolution..."
-#~ msgstr "Evolution"
+#~ msgid "_Find..."
+#~ msgstr "Encontrar"
 
 #, fuzzy
-#~ msgid "_Appointment (FIXME)"
-#~ msgstr "_Compromisso"
+#~ msgid "_Undo"
+#~ msgstr "Anular"
 
 #, fuzzy
-#~ msgid "_Contact (FIXME)"
-#~ msgstr "_Contacto"
+#~ msgid "Get Mail"
+#~ msgstr "_Correio"
 
-#~ msgid "_Folder"
-#~ msgstr "_Pasta"
+#, fuzzy
+#~ msgid "Print Preview of message..."
+#~ msgstr "Prever impressЦo"
 
 #, fuzzy
-#~ msgid "_Go to Folder..."
-#~ msgstr "Ir para a _pasta..."
+#~ msgid "Reply to _Sender"
+#~ msgstr "Reponder para todos"
+
+#, fuzzy
+#~ msgid "_Print Message"
+#~ msgstr "Encontrar mensagens"
 
 #, fuzzy
-#~ msgid "_Index"
-#~ msgstr "мnd_ice de ajuda"
+#~ msgid "_Source"
+#~ msgstr "Fontes"
 
 #, fuzzy
-#~ msgid "_Mail message (FIXME)"
-#~ msgstr "Mensagem de _correio"
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "Mostrar a barra de pastas"
 
 #~ msgid "Headings:"
 #~ msgstr "CabeГalhos:"
 
-#~ msgid "Empty days:"
-#~ msgstr "Dias vazios:"
-
-#~ msgid "Appointments:"
-#~ msgstr "Compromissos:"
-
 #, fuzzy
 #~ msgid "may"
 #~ msgstr "Dia"
@@ -6162,10 +12459,6 @@ msgstr "Grupo %i"
 #~ msgstr "Hoje"
 
 #, fuzzy
-#~ msgid "last"
-#~ msgstr "Colar"
-
-#, fuzzy
 #~ msgid "next"
 #~ msgstr "PrС_ximo"
 
@@ -6174,10 +12467,6 @@ msgstr "Grupo %i"
 #~ msgstr "Outro"
 
 #, fuzzy
-#~ msgid "fourth"
-#~ msgstr "Hora"
-
-#, fuzzy
 #~ msgid "ninth"
 #~ msgstr "Imprimir"
 
@@ -6189,10 +12478,6 @@ msgstr "Grupo %i"
 #~ msgstr "Ano:"
 
 #, fuzzy
-#~ msgid "Mail Source"
-#~ msgstr "atalhos principais"
-
-#, fuzzy
 #~ msgid "Send \"%s\""
 #~ msgstr "Segundos"
 
@@ -6205,16 +12490,9 @@ msgstr "Grupo %i"
 #~ msgstr "Sincronizar"
 
 #, fuzzy
-#~ msgid "Save messages from folder \"%s\""
-#~ msgstr "Gravar a mensagem na pasta especificada"
-
-#, fuzzy
 #~ msgid "Rebuild message view"
 #~ msgstr "Encontrar mensagens"
 
-#~ msgid "_Actions"
-#~ msgstr "_AcГУes"
-
 #, fuzzy
 #~ msgid "_Save Calendar As"
 #~ msgstr "Guardar CalendАrio como"
@@ -6235,15 +12513,9 @@ msgstr "Grupo %i"
 #~ msgid "_Close Calendar"
 #~ msgstr "_Fechar CalendАrio"
 
-#~ msgid "_New appointment..."
-#~ msgstr "_Novo compromisso..."
-
 #~ msgid "New appointment for _today..."
 #~ msgstr "Novo compromisso para _hoje..."
 
-#~ msgid "Create a new appointment for today"
-#~ msgstr "Criar um novo compromisso para hoje"
-
 #~ msgid "About Calendar"
 #~ msgstr "Sobre o calendАrio"
 
@@ -6270,15 +12542,9 @@ msgstr "Grupo %i"
 #~ msgid "Cut selected item into clipboard"
 #~ msgstr "Cortar item seleccionado para a Аrea de transferЙncia"
 
-#~ msgid "Copy selected item into clipboard"
-#~ msgstr "Copiar item seleccionada para a Аrea de transferЙncia"
-
 #~ msgid "Select recipients' addresses"
 #~ msgstr "Seleccionar o endereГo dos receptores"
 
-#~ msgid "Discard this message?"
-#~ msgstr "Descartar esta mensagem?"
-
 #~ msgid "Cut selected region into the clipboard"
 #~ msgstr "Cortar a regiЦo seleccionada para a Аrea de transferЙncia"
 
@@ -6288,15 +12554,9 @@ msgstr "Grupo %i"
 #~ msgid "Paste selected region into the clipboard"
 #~ msgstr "Colar a regiЦo seleccionada para a Аrea de transferЙncia"
 
-#~ msgid "Check for new mail"
-#~ msgstr "Verificar novo correio"
-
 #~ msgid "Composes a new mail message"
 #~ msgstr "Criar uma nova mensagem"
 
-#~ msgid "Task _Request"
-#~ msgstr "_Pedido de tarefa"
-
 #~ msgid "_Journal Entry"
 #~ msgstr "_Entrada diАria?"
 
@@ -6340,18 +12600,9 @@ msgstr "Grupo %i"
 #~ "Pedimos desculpa. O navegador de pastas do Evolution nЦo pode ser "
 #~ "inicializado."
 
-#~ msgid "Whether a message preview should be shown"
-#~ msgstr "Se uma previsЦo da mensagem deve ser mostrada"
-
 #~ msgid "The %s component doesn't support PersistStream!\n"
 #~ msgstr "O componente %s nЦo suporta PersistStream!\n"
 
-#~ msgid "A folder containing mail items"
-#~ msgstr "Uma pasta contendo items de correio"
-
-#~ msgid "A folder containing contacts"
-#~ msgstr "Uma pasta contendo contactos"
-
 #~ msgid "A folder containing calendar entries"
 #~ msgstr "Uma pasta contendo entradas de calendАrio"
 
@@ -6370,21 +12621,9 @@ msgstr "Grupo %i"
 #~ msgid "Rename Group"
 #~ msgstr "Mudar nome de grupo"
 
-#~ msgid "Advanced Find"
-#~ msgstr "Encontrar avanГado"
-
-#~ msgid "Rename Shortcut"
-#~ msgstr "Mudar nome de atalho"
-
 #~ msgid "Executive Summary"
 #~ msgstr "SumАrio executivo"
 
-#~ msgid "Your contacts list"
-#~ msgstr "A sua lista de contactos"
-
-#~ msgid "Tasks list"
-#~ msgstr "Lista de tarefas"
-
 #~ msgid "Enables some debugging functions"
 #~ msgstr "Liga algumas funГУes de deupraГЦo"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b27e463cb5..95e4824a95 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,11 +2,10 @@
 # Copyright (C) 2000-2001 Free Software Foundation, Inc.
 # Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>, 2000-2001.
 #
-#: camel/providers/smtp/camel-smtp-transport.c:343
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.8\n"
-"POT-Creation-Date: 2001-01-26 17:19-0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-01-26 17:42-02:00\n"
 "Last-Translator: Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -14,733 +13,19 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Adicionar serviГo"
-
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "Adicionar um novo serviГo ao Executive Summary"
-
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Criar um novo correio eletrТnico"
-
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "ConfiguraГУes do Executive Summary..."
-
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Nova mensagem"
-
-#: executive-summary/component/component-factory.c:159
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "NЦo И possМvel iniciar o componente Executive Summary do Evolution."
-
-#: camel/providers/vee/camel-vee-folder.c:604
-#, c-format
-msgid "No such message: %s"
-msgstr "NЦo existe tal mensagem: %s"
-
-#: executive-summary/component/e-summary-callbacks.c:285
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"VocЙ pode selecionar uma pАgina HTML diferente para o fundo do Executive "
-"Summary.\n"
-"\n"
-"Apenas deixe-o vazio para o padrЦo"
-
-#: executive-summary/component/e-summary-url.c:61
-#: executive-summary/component/e-summary-url.c:66
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "Abrir %s com o aplicativo Gnome padrЦo"
-
-#: executive-summary/component/e-summary-url.c:62
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Abrir %s com o navegador web Gnome padrЦo"
-
-#: executive-summary/component/e-summary-url.c:63
-#, c-format
-msgid "Send an email to %s"
-msgstr "Enviar uma mensagem para %s"
-
-#: executive-summary/component/e-summary-url.c:64
-#, c-format
-msgid "Change the view to %s"
-msgstr "Mudar a visualizaГЦo para %s"
-
-#: executive-summary/component/e-summary-url.c:65
-#, c-format
-msgid "Run %s"
-msgstr "Executar %s"
-
-#: executive-summary/component/e-summary-url.c:67
-#, c-format
-msgid "Close %s"
-msgstr "Fechar %s"
-
-#: executive-summary/component/e-summary-url.c:68
-#, c-format
-msgid "Move %s to the left"
-msgstr "Mover %s para a esquerda"
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
-msgstr "Mover %s para a direita"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Mover %s para a linha anterior"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Mover %s para a prСxima linha"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Configure %s"
-msgstr "Configurar %s"
-
-#: executive-summary/component/e-summary.c:916
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
 msgstr ""
-"NЦo И possМvel abrir o arquivo HTML:\n"
-"%s"
 
-#: executive-summary/component/e-summary.c:930
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
 msgstr ""
-"Erro ao ler dados:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:948
-msgid "File does not have a place for the services.\n"
-msgstr "Arquivo nЦo possui um lugar para os serviГos.\n"
-
-#: executive-summary/component/main.c:59
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"O componente Executive Summary nЦo pode iniciar o Bonobo.\n"
-"Se ocorreu uma mensagem de alerta sobre o RootPOA, isto provavelmente\n"
-"significa vocЙ compilou Bonobo com GOAD no lugar de OAF."
-
-#: executive-summary/test-service/rdf-summary.c:455
-#: executive-summary/test-service/rdf-summary.c:491
-#: executive-summary/test-service/rdf-summary.c:536
-msgid "Error"
-msgstr "Erro"
-
-#: mail/mail-config.c:799
-msgid "Connecting to server"
-msgstr "Conectando ao servidor"
-
-#: mail/mail-config.c:801
-msgid "Connect to server"
-msgstr "Conectar ao servidor"
-
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Sobre este aplicativo"
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Sobre..."
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "_AГУes"
-
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "C_lear"
-msgstr "_Limpar"
-
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:5
-msgid "C_ut"
-msgstr "Recor_tar"
-
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:6
-msgid "Clear"
-msgstr "Limpar"
-
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:7
-msgid "Clear the selection"
-msgstr "Limpar a seleГЦo"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:8
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:8 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Fechar"
-
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:9
-msgid "Close the current file"
-msgstr "Fechar o arquivo atual"
-
-#: ui/evolution-event-editor.xml.h:10 ui/evolution-mail.xml.h:3
-#: ui/evolution-task-editor-dialog.xml.h:10
-msgid "Copy"
-msgstr "Copiar"
-
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-task-editor-dialog.xml.h:11
-msgid "Copy the selection"
-msgstr "Copiar a seleГЦo"
-
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:12
-msgid "Cut"
-msgstr "Recortar"
-
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cut the selection"
-msgstr "Recortar a seleГЦo"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: calendar/gui/e-calendar-table.c:403
-#: calendar/gui/event-editor-dialog.glade.h:8 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:7 mail/folder-browser.c:684
-#: mail/mail-config.glade.h:19 mail/mail-view.c:150
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:14
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:14
-msgid "Delete"
-msgstr "Excluir"
-
-#: ui/evolution-task-editor-dialog.xml.h:15
-msgid "Delete this task"
-msgstr "Excluir esta tarefa"
-
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Dump XML"
-msgstr "Descarregar XML"
-
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Dump the UI Xml description"
-msgstr "Descarregar a descriГЦo de IU XML"
-
-#: ui/evolution-event-editor.xml.h:18 ui/evolution-task-editor-dialog.xml.h:18
-msgid "FIXME: Address _Book..."
-msgstr "FIXME: _CatАlogo de endereГos..."
-
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "FIXME: Assig_n Task"
-msgstr "FIXME: Atri_buir tarefa"
-
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "FIXME: Ch_oose Form..."
-msgstr "FIXME: Escolher _formulАrio..."
-
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "FIXME: Chec_k Names"
-msgstr "FIXME: _Verificar nomes"
-
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: _Copiar para pasta..."
-
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:23
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: _Projetar um formulАrio..."
-
-#: ui/evolution-event-editor.xml.h:23 ui/evolution-task-editor-dialog.xml.h:24
-msgid "FIXME: Define Print _Styles"
-msgstr "FIXME: Definir estilos de _impressЦo"
-
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:25
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: Pro_jetar este formulАrio"
-
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:26
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: P_rimeiro item na pasta"
-
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:27
-msgid "FIXME: For_ward"
-msgstr "FIXME: E_ncaminhar"
-
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:28
-msgid "FIXME: Help"
-msgstr "FIXME: Ajuda"
-
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-task-editor-dialog.xml.h:29
-msgid "FIXME: In_complete Task"
-msgstr "FIXME: Tarefa imcom_pleta"
-
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:30
-msgid "FIXME: Insert File"
-msgstr "FIXME: Inserir arquivo"
-
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:31
-msgid "FIXME: It_em..."
-msgstr "FIXME: It_em..."
-
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "FIXME: Meeting Re_quest"
-msgstr "FIXME: _Pedido de reuniЦo"
-
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:33
-msgid "FIXME: Paste _Special... "
-msgstr "FIXME: Colar e_special..."
-
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:34
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: Visuali_zar impressЦo"
-
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:35
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: Pu_blicar formulАrio como..."
-
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:36
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: Publicar _formulАrio..."
-
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:37
-msgid "FIXME: Rec_urrence..."
-msgstr "FIXME: _RepetiГЦo..."
-
-#: ui/evolution-task-editor-dialog.xml.h:38
-msgid "FIXME: Reply to A_ll"
-msgstr "FIXME: Responder a _todos"
-
-#: ui/evolution-event-editor.xml.h:37 ui/evolution-task-editor-dialog.xml.h:39
-msgid "FIXME: S_end"
-msgstr "FIXME: En_viar"
-
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "FIXME: S_end Status Report"
-msgstr "FIXME: En_viar relatСrio de estado"
-
-#: ui/evolution-task-editor-dialog.xml.h:41
-msgid "FIXME: S_kip Occurrence"
-msgstr "FIXME: Pu_lar ocorrЙncia"
-
-#: ui/evolution-event-editor.xml.h:38 ui/evolution-task-editor-dialog.xml.h:42
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: Salvar ane_xo..."
-
-#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:43
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: _Depurador de scripts"
-
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-task-editor-dialog.xml.h:44
-msgid "FIXME: Task _Request"
-msgstr "FIXME: _Pedido de tarefa"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "FIXME: _Appointment"
-msgstr "FIXME: _Compromisso"
-
-#: ui/evolution-event-editor.xml.h:41 ui/evolution-task-editor-dialog.xml.h:46
-msgid "FIXME: _Contact"
-msgstr "FIXME: _Contato"
-
-#: ui/evolution-event-editor.xml.h:42 ui/evolution-task-editor-dialog.xml.h:47
-msgid "FIXME: _Customize..."
-msgstr "FIXME: _Personalizar..."
-
-#: ui/evolution-event-editor.xml.h:43 ui/evolution-task-editor-dialog.xml.h:48
-msgid "FIXME: _File..."
-msgstr "FIXME: _Arquivo..."
-
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-task-editor-dialog.xml.h:49
-msgid "FIXME: _Font..."
-msgstr "FIXME: _Fonte..."
-
-#: ui/evolution-event-editor.xml.h:45 ui/evolution-task-editor-dialog.xml.h:50
-msgid "FIXME: _Formatting"
-msgstr "FIXME: _FormataГЦo"
-
-#: ui/evolution-event-editor.xml.h:46 ui/evolution-task-editor-dialog.xml.h:51
-msgid "FIXME: _Item"
-msgstr "FIXME: _Item"
-
-#: ui/evolution-event-editor.xml.h:47 ui/evolution-task-editor-dialog.xml.h:52
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: Item de _diАrio"
-
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:53
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: зl_timo item na pasta"
-
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:54
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: _Mensagem de correio"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "FIXME: _Mark Complete"
-msgstr "FIXME: _Marcar como cumprida"
-
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:56
-msgid "FIXME: _Memo Style"
-msgstr "FIXME: Estilo de _memorando"
-
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:57
-msgid "FIXME: _Move to Folder..."
-msgstr "FIXME: _Mover para pasta..."
-
-#: ui/evolution-task-editor-dialog.xml.h:58
-msgid "FIXME: _New Task"
-msgstr "FIXME: _Nova tarefa"
-
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:59
-msgid "FIXME: _Object..."
-msgstr "FIXME: _Objeto..."
-
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:60
-msgid "FIXME: _Paragraph..."
-msgstr "FIXME: _ParАgrafo..."
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "FIXME: _Reply"
-msgstr "FIXME: _Responder"
-
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-task-editor-dialog.xml.h:62
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: _Ortografia..."
-
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-task-editor-dialog.xml.h:63
-msgid "FIXME: _Standard"
-msgstr "FIXME: _PadrЦo"
-
-#: ui/evolution-event-editor.xml.h:58 ui/evolution-task-editor-dialog.xml.h:64
-msgid "FIXME: _Task"
-msgstr "FIXME: _Tarefa"
-
-#: ui/evolution-event-editor.xml.h:59 ui/evolution-task-editor-dialog.xml.h:65
-msgid "FIXME: _Unread Item"
-msgstr "FIXME: Item _nЦo lido"
-
-#: ui/evolution-task-editor-dialog.xml.h:66
-msgid "FIXME: _note"
-msgstr "FIXME: _nota"
-
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-task-editor-dialog.xml.h:67
-msgid "FIXME: what goes here?"
-msgstr "FIXME: o que vai aqui?"
-
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-message-composer.xml.h:6
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "F_ormat"
-msgstr "F_ormato"
-
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-event-editor.xml.h:62
-#: ui/evolution-task-editor-dialog.xml.h:69
-msgid "Find"
-msgstr "Localizar"
-
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:70
-msgid "Find Again"
-msgstr "Localizar novamente"
-
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:71
-msgid "Find _Again"
-msgstr "Localizar _novamente"
-
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:72
-msgid "Go to the next item"
-msgstr "Vai para o prСximo item"
-
-#: ui/evolution-event-editor.xml.h:66 ui/evolution-task-editor-dialog.xml.h:73
-msgid "Go to the previous item"
-msgstr "Vai para o item anterior"
-
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:74
-msgid "Modify the file's properties"
-msgstr "Modificar as propriedades do arquivo"
-
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:75
-msgid "N_ext"
-msgstr "P_rСximo"
-
-#: ui/evolution-calendar.xml.h:15 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:76
-msgid "Next"
-msgstr "PrСximo"
-
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:77
-msgid "Paste"
-msgstr "Colar"
-
-#: ui/evolution-event-editor.xml.h:71 ui/evolution-task-editor-dialog.xml.h:78
-msgid "Paste the clipboard"
-msgstr "Colar a Аrea de transferЙncia"
-
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:79
-msgid "Pre_vious"
-msgstr "An_terior"
-
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:80
-msgid "Previous"
-msgstr "Anterior"
-
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-task-editor-dialog.xml.h:81
-msgid "Print S_etup..."
-msgstr "Configurar i_mpressЦo..."
-
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:82
-msgid "Print Setup"
-msgstr "Configurar impressЦo..."
-
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-task-editor-dialog.xml.h:83
-msgid "Print this item"
-msgstr "Imprime este item"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:77
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "Print..."
-msgstr "Imprimir..."
-
-#: ui/evolution-event-editor.xml.h:78 ui/evolution-task-editor-dialog.xml.h:85
-msgid "Properties"
-msgstr "Propriedades"
-
-#: ui/evolution-event-editor.xml.h:79 ui/evolution-task-editor-dialog.xml.h:86
-msgid "Redo"
-msgstr "Refazer"
-
-#: ui/evolution-event-editor.xml.h:80 ui/evolution-task-editor-dialog.xml.h:87
-msgid "Redo the undone action"
-msgstr "Refazer a aГЦo desfeita"
-
-#: ui/evolution-event-editor.xml.h:81 ui/evolution-task-editor-dialog.xml.h:88
-msgid "Replace"
-msgstr "Substituir"
-
-#: ui/evolution-event-editor.xml.h:82 ui/evolution-task-editor-dialog.xml.h:89
-msgid "Replace a string"
-msgstr "Substituir uma expressЦo"
-
-#: ui/evolution-event-editor.xml.h:83 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:90
-msgid "Save"
-msgstr "Salvar"
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:84
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:91
-msgid "Save _As..."
-msgstr "Salvar _como..."
-
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:85
-#: ui/evolution-task-editor-dialog.xml.h:92
-msgid "Save and Close"
-msgstr "Salvar e fechar"
-
-#: ui/evolution-event-editor.xml.h:87 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:93
-msgid "Save the current file"
-msgstr "Salvar o arquivo atual"
-
-#: ui/evolution-task-editor-dialog.xml.h:94
-msgid "Save the task and close the dialog box"
-msgstr "Salva a tarefa e fecha a caixa de diАlogo"
-
-#: ui/evolution-event-editor.xml.h:91 ui/evolution-task-editor-dialog.xml.h:95
-msgid "Search again for the same string"
-msgstr "Buscar novamente pela mesma espressЦo"
-
-#: ui/evolution-event-editor.xml.h:92 ui/evolution-task-editor-dialog.xml.h:96
-msgid "Search for a string"
-msgstr "Buscar por uma expressЦo"
-
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:93
-#: ui/evolution-task-editor-dialog.xml.h:97
-msgid "See online help"
-msgstr "Ver ajuda on-line"
-
-#: ui/evolution-event-editor.xml.h:94 ui/evolution-task-editor-dialog.xml.h:98
-msgid "Select All"
-msgstr "Selecionar todos"
-
-#: ui/evolution-event-editor.xml.h:95 ui/evolution-task-editor-dialog.xml.h:99
-msgid "Select everything"
-msgstr "Selecionar tudo"
-
-#: ui/evolution-event-editor.xml.h:96
-#: ui/evolution-task-editor-dialog.xml.h:100
-msgid "Setup the page settings for your current printer"
-msgstr "Configurar a pАgina para a sua impressora atual"
-
-#: ui/evolution-event-editor.xml.h:97
-#: ui/evolution-task-editor-dialog.xml.h:101
-msgid "Undo"
-msgstr "Desfazer"
-
-#: ui/evolution-event-editor.xml.h:98
-#: ui/evolution-task-editor-dialog.xml.h:102
-msgid "Undo the last action"
-msgstr "Desfazer a Зltima aГЦo"
-
-#: ui/evolution-event-editor.xml.h:99 ui/evolution-message-composer.xml.h:34
-#: ui/evolution-task-editor-dialog.xml.h:103
-msgid "_About..."
-msgstr "_Sobre..."
-
-#: ui/evolution-event-editor.xml.h:100 ui/evolution-message-composer.xml.h:35
-#: ui/evolution-task-editor-dialog.xml.h:104 ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Fechar"
-
-#: ui/evolution-event-editor.xml.h:101
-#: ui/evolution-task-editor-dialog.xml.h:105
-msgid "_Copy"
-msgstr "_Copiar"
-
-#: ui/evolution-event-editor.xml.h:102 ui/evolution-message-composer.xml.h:36
-#: ui/evolution-task-editor-dialog.xml.h:106
-msgid "_Debug"
-msgstr "_Depurar"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:103 ui/evolution-mail.xml.h:49
-#: ui/evolution-task-editor-dialog.xml.h:107
-msgid "_Delete"
-msgstr "_Excluir"
-
-#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:37
-#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:108
-#: ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:105
-#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:109 ui/evolution.xml.h:31
-msgid "_File"
-msgstr "_Arquivo"
-
-#: ui/evolution-event-editor.xml.h:106
-#: ui/evolution-task-editor-dialog.xml.h:110
-msgid "_Find..."
-msgstr "_Localizar..."
-
-#: ui/evolution-event-editor.xml.h:107
-#: ui/evolution-task-editor-dialog.xml.h:111
-msgid "_Forms"
-msgstr "_FormulАrios"
 
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-message-composer.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:112 ui/evolution.xml.h:34
-msgid "_Help"
-msgstr "Aj_uda"
-
-#: ui/evolution-event-editor.xml.h:109
-#: ui/evolution-task-editor-dialog.xml.h:113
-msgid "_Insert"
-msgstr "_Inserir"
-
-#: ui/evolution-event-editor.xml.h:110
-#: ui/evolution-task-editor-dialog.xml.h:114
-msgid "_Object"
-msgstr "_Objeto"
-
-#: ui/evolution-event-editor.xml.h:111
-#: ui/evolution-task-editor-dialog.xml.h:115
-msgid "_Paste"
-msgstr "C_olar"
-
-#: ui/evolution-event-editor.xml.h:112
-#: ui/evolution-task-editor-dialog.xml.h:116 ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "_Imprimir"
-
-#: ui/evolution-event-editor.xml.h:113
-#: ui/evolution-task-editor-dialog.xml.h:117
-msgid "_Properties..."
-msgstr "_Propriedades..."
-
-#: ui/evolution-event-editor.xml.h:114
-#: ui/evolution-task-editor-dialog.xml.h:118
-msgid "_Redo"
-msgstr "_Refazer"
-
-#: ui/evolution-event-editor.xml.h:115
-#: ui/evolution-task-editor-dialog.xml.h:119
-msgid "_Replace..."
-msgstr "_Substituir..."
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:116
-#: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:120
-msgid "_Save"
-msgstr "_Salvar"
-
-#: ui/evolution-event-editor.xml.h:117
-#: ui/evolution-task-editor-dialog.xml.h:121
-msgid "_Toolbars"
-msgstr "_Barras de ferramentas"
-
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:118
-#: ui/evolution-task-editor-dialog.xml.h:122
-msgid "_Tools"
-msgstr "_Ferramentas"
-
-#: ui/evolution-event-editor.xml.h:119
-#: ui/evolution-task-editor-dialog.xml.h:123
-msgid "_Undo"
-msgstr "_Desfazer"
-
-#: shell/e-storage-set-view.c:338 ui/evolution-event-editor.xml.h:120
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-task-editor-dialog.xml.h:124 ui/evolution.xml.h:41
-msgid "_View"
-msgstr "_Visualizar"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Mudar preferЙncias"
-
-#: ui/evolution-tasks.xml.h:2
-msgid "Create a new task"
-msgstr "Criar uma nova tarefa"
-
-#: ui/evolution-tasks.xml.h:3
-msgid "New"
-msgstr "Novo"
-
-#: mail/folder-browser.c:672 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
-#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Imprimir"
-
-#: ui/evolution-tasks.xml.h:5
-msgid "Save task as something else"
-msgstr "Salvar tarefa como outra coisa"
-
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "PreferЙncias da tarefa..."
-
-#: ui/evolution-calendar.xml.h:30 ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "Salvar _como..."
-
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "CartЦo: "
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -748,7 +33,7 @@ msgstr ""
 "\n"
 "Nome: "
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -756,7 +41,7 @@ msgstr ""
 "\n"
 "  Prefixo:    "
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -764,7 +49,7 @@ msgstr ""
 "\n"
 "  Dado:       "
 
-#: addressbook/backend/ebook/e-card.c:3054
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -772,7 +57,7 @@ msgstr ""
 "\n"
 "  Adicional:  "
 
-#: addressbook/backend/ebook/e-card.c:3055
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -780,7 +65,7 @@ msgstr ""
 "\n"
 "  FamМlia:    "
 
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -788,7 +73,7 @@ msgstr ""
 "\n"
 "  Sufixo:     "
 
-#: addressbook/backend/ebook/e-card.c:3070
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -796,7 +81,7 @@ msgstr ""
 "\n"
 "Data de nascimento: "
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -804,7 +89,7 @@ msgstr ""
 "\n"
 "EndereГo:"
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -812,7 +97,7 @@ msgstr ""
 "\n"
 "  Caixa postal:"
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -820,7 +105,7 @@ msgstr ""
 "\n"
 "  Ext:         "
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -828,7 +113,7 @@ msgstr ""
 "\n"
 "  Rua:         "
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -836,7 +121,7 @@ msgstr ""
 "\n"
 "  Cidade:      "
 
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -844,7 +129,7 @@ msgstr ""
 "\n"
 "  RegiЦo:      "
 
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -852,7 +137,7 @@ msgstr ""
 "\n"
 "  CСdigo postal:"
 
-#: addressbook/backend/ebook/e-card.c:3089
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -860,7 +145,7 @@ msgstr ""
 "\n"
 "  PaМs:        "
 
-#: addressbook/backend/ebook/e-card.c:3102
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
@@ -868,7 +153,7 @@ msgstr ""
 "\n"
 "RСtulo de entrega: "
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -876,7 +161,7 @@ msgstr ""
 "\n"
 "Telefones:\n"
 
-#: addressbook/backend/ebook/e-card.c:3117
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -884,7 +169,7 @@ msgstr ""
 "\n"
 "Telefone:"
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -892,7 +177,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3144
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -900,7 +185,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3163
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -908,7 +193,7 @@ msgstr ""
 "\n"
 "Agente de correio: "
 
-#: addressbook/backend/ebook/e-card.c:3169
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -916,7 +201,7 @@ msgstr ""
 "\n"
 "Fuso horАrio: "
 
-#: addressbook/backend/ebook/e-card.c:3177
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -924,7 +209,7 @@ msgstr ""
 "\n"
 "LocalizaГЦo geogrАfica: "
 
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -932,7 +217,7 @@ msgstr ""
 "\n"
 "Cargo comercial: "
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -940,7 +225,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -948,7 +233,7 @@ msgstr ""
 "\n"
 "  Nome:  "
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -956,7 +241,7 @@ msgstr ""
 "\n"
 "  Unidade:  "
 
-#: addressbook/backend/ebook/e-card.c:3196
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -964,7 +249,7 @@ msgstr ""
 "\n"
 "  Unidade2: "
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -972,7 +257,7 @@ msgstr ""
 "\n"
 "  Unidade3: "
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -980,7 +265,7 @@ msgstr ""
 "\n"
 "  Unidade4: "
 
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -988,7 +273,7 @@ msgstr ""
 "\n"
 "Categorias: "
 
-#: addressbook/backend/ebook/e-card.c:3203
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -1006,7 +291,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -1014,7 +299,7 @@ msgstr ""
 "\n"
 "String Зnica: "
 
-#: addressbook/backend/ebook/e-card.c:3219
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -1022,137 +307,26 @@ msgstr ""
 "\n"
 "Chave pЗblica: "
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
-msgid "Could not initialize Bonobo"
-msgstr "NЦo foi possМvel iniciar Bonobo"
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:77
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
-#: calendar/conduits/todo/todo-conduit-control-applet.c:77
-msgid "Disabled"
-msgstr "Desativado"
-
-#: addressbook/conduit/address-conduit-control-applet.c:78
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
-#: calendar/conduits/todo/todo-conduit-control-applet.c:78
-msgid "Synchronize"
-msgstr "Sincronizar"
-
-#: addressbook/conduit/address-conduit-control-applet.c:79
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
-#: calendar/conduits/todo/todo-conduit-control-applet.c:79
-msgid "Copy From Pilot"
-msgstr "Copiar a partir do pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:80
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
-#: calendar/conduits/todo/todo-conduit-control-applet.c:80
-msgid "Copy To Pilot"
-msgstr "Copiar para o pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:81
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
-#: calendar/conduits/todo/todo-conduit-control-applet.c:81
-msgid "Merge From Pilot"
-msgstr "Mesclar a partir do pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:82
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
-#: calendar/conduits/todo/todo-conduit-control-applet.c:82
-msgid "Merge To Pilot"
-msgstr "Mesclar para o pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:121
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:122
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
-#: calendar/conduits/todo/todo-conduit-control-applet.c:122
-msgid "Original Author:"
-msgstr "Autor original:"
-
-#: addressbook/conduit/address-conduit-control-applet.c:123
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
-
-#: addressbook/conduit/address-conduit-control-applet.c:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Canal para catАlogo de endereГos do Evolution"
-
-#: addressbook/conduit/address-conduit-control-applet.c:128
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
-#: calendar/conduits/todo/todo-conduit-control-applet.c:128
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 the Free Software Foundation and Helix Code"
-
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
+#: addressbook/backend/ebook/e-card.c:4037
+msgid "Multiple VCards"
 msgstr ""
-"UtilitАrio de configuraГЦo do canal para catАlogo de endereГos do "
-"Evolution.\n"
 
-#: addressbook/conduit/address-conduit-control-applet.c:131
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
-
-#: addressbook/conduit/address-conduit-control-applet.c:162
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
-#: calendar/conduits/todo/todo-conduit-control-applet.c:162
-msgid "Synchronize Action"
-msgstr "AГЦo ao sincronizar"
-
-#: addressbook/conduit/address-conduit-control-applet.c:214
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
-#: calendar/conduits/todo/todo-conduit-control-applet.c:214
-msgid "Conduit state"
-msgstr "Estado do canal"
-
-#: addressbook/conduit/address-conduit-control-applet.c:266
-#: addressbook/conduit/address-conduit-control-applet.c:279
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
-#: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Nenhum pilot configurado, por favor visite primeiramente\n"
-"o painel Pilot Link na central de controle."
-
-#: addressbook/conduit/address-conduit-control-applet.c:285
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
-#: calendar/conduits/todo/todo-conduit-control-applet.c:285
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "NЦo conectado ao daemon Gnome Pilot"
-
-#: addressbook/conduit/address-conduit-control-applet.c:290
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
-#: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"Ocorreu um erro ao tentar ler a lista de\n"
-"pilots a partir do daemon Gnome Pilot"
+#: addressbook/backend/ebook/e-card.c:4045
+#, fuzzy, c-format
+msgid "VCard for %s"
+msgstr "Entre senha para %s"
+
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+#: addressbook/backend/ebook/load-pine-addressbook.c:22
+#: addressbook/backend/ebook/test-client-list.c:23
+#: addressbook/backend/ebook/test-client.c:33
+#: addressbook/conduit/address-conduit.c:1092
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
+msgid "Could not initialize Bonobo"
+msgstr "NЦo foi possМvel iniciar Bonobo"
 
 #: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
@@ -1162,598 +336,881 @@ msgstr "NЦo foi possМvel carregar cursor\n"
 msgid "EBook not loaded\n"
 msgstr "EBook nЦo foi carregado\n"
 
-#: addressbook/conduit/address-conduit.c:651
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "NЦo foi possМvel iniciar o servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:652
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:655
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "NЦo foi possМvel iniciar wombat"
 
-#: addressbook/conduit/address-conduit.c:684
 #: addressbook/conduit/address-conduit.c:687
+#: addressbook/conduit/address-conduit.c:690
 msgid "Could not read pilot's Address application block"
 msgstr "NЦo foi possМvel ler os dados do aplicativo de endereГos do pilot"
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Excluir contato?"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr ""
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#, fuzzy
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr ""
+"UtilitАrio de configuraГЦo do canal para catАlogo de endereГos do "
+"Evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Canal para catАlogo de endereГos do Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution addressbook component."
+msgstr ""
+"UtilitАrio de configuraГЦo do canal para catАlogo de endereГos do "
+"Evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#, fuzzy
+msgid "Factory for the sample Addressbook control"
+msgstr "Clique aqui para o catАlogo de endereГos"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "Servidor LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Arquivo"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Tipo de catАlogo de endereГos desconhecido"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "Nenhum (modo anТnimo)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Senha"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Tipo de autenticaГЦo desconhecido"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "Base"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "Um"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "SubАrvore"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr "Tipo de escopo desconhecido"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr "Vincular DN:"
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Lembrar esta senha"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "MАquina:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "DN raiz:"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Porta:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "Escopo de busca:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "AutenticaГЦo:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Caminho:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+#, fuzzy
+msgid "FIXME Path Help text here"
+msgstr "FIXME: o que vai aqui?"
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "Criar caminho se ele nЦo existir."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "Editar catАlogo de endereГos"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "Incluir catАlogo de endereГos"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"Selecione o tipo de catАlogo de endereГos vocЙ possui e entre os dados sobre "
+"ele."
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Nome:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "DescriГЦo"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:1
+msgid "Addressbook Sources"
+msgstr "Fontes de catАlogos de endereГos"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Excluir"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Nome"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
 msgid "_Add"
 msgstr "_Incluir"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
-msgstr "Tipos de telefone"
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "_Editar"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
-msgstr "Novo tipo de telefone"
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "Outros contatos"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:5
-msgid "Add"
-msgstr "Incluir"
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "Entre senha para %s"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
-msgid "Contact Editor"
-msgstr "Editor de contatos"
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "NЦo И possМvel abrir o catАlogo de endereГos"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-msgid "_Full Name..."
-msgstr "Nome _completo..."
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
-msgid "File As:"
-msgstr "Arquivar como:"
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-msgid "Web page address:"
-msgstr "EndereГo de pАgina web:"
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
-msgstr "Deseja receber correio _HTML"
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
+msgstr "Qualquer campo contИm"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
-msgstr "_Comercial"
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "Nome contИm"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
-msgid "_Home"
-msgstr "_Residencial"
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "E-mail contИm"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
-msgstr "_Fax comercial"
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "Nome contИm"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-msgid "_Mobile"
-msgstr "Cel_ular"
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "A URI que o navegador de pastas vai exibir"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
 msgid "Primary Email"
 msgstr "E-mail principal"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "E-mail 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "E-mail 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "Executar aГУes"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Criar novo contato"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "Editar catАlogo de endereГos"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "Outros contatos"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "EndereГo eletrТnico:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+#, fuzzy
+msgid "Disable Queries"
+msgstr "Desativado"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr ""
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#, fuzzy
+msgid "Evolution's addressbook name selection interface."
+msgstr "Canal para catАlogo de endereГos do Evolution"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Remover"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+#, fuzzy
+msgid "Remove All"
+msgstr "Remover"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "Sendmail"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Outros contatos"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "DestinatАrios da mensagem"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "Selecionar nomes"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "Selecionar nome de:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "Categoria:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+#, fuzzy
+msgid "_Search"
+msgstr "Buscar"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+msgid "Anni_versary:"
+msgstr "_Bodas:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "C_omercial"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
-msgstr "E_ste И o endereГo de correspondЙncia"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-msgid "C_ontacts..."
-msgstr "Co_ntatos..."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+msgid "Business _Fax"
+msgstr "_Fax comercial"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/event-editor-dialog.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ca_tegorias..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-msgid "_Job title:"
-msgstr "C_argo:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+msgid "Contact Editor"
+msgstr "Editor de contatos"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
-msgid "_Company:"
-msgstr "E_mpresa:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
+msgid "Details"
+msgstr "Detalhes"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-msgid "_Address..."
-msgstr "_EndereГo..."
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+msgid "File As:"
+msgstr "Arquivar como:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:11 mail/mail-config.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Geral"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
-msgid "_Department:"
-msgstr "_Departamento:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+msgid "New phone type"
+msgstr "Novo tipo de telefone"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
-msgid "_Office:"
-msgstr "_EscritСrio:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+msgid "No_tes:"
+msgstr "_Notas:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
-msgid "_Profession:"
-msgstr "_ProfissЦo:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Empresa:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
-msgstr "_Apelido:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+msgid "Phone Types"
+msgstr "Tipos de telefone"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
-msgid "_Spouse:"
-msgstr "_CТnjuge:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+msgid "Wants to receive _HTML mail"
+msgstr "Deseja receber correio _HTML"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
-msgstr "Ani_versАrio:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+msgid "Web page address:"
+msgstr "EndereГo de pАgina web:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+msgid "_Address..."
+msgstr "_EndereГo..."
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "Nome do a_ssistente:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+msgid "_Birthday:"
+msgstr "Ani_versАrio:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+msgid "_Business"
+msgstr "_Comercial"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "Co_ntatos..."
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
+msgid "_Delete"
+msgstr "_Excluir"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+msgid "_Department:"
+msgstr "_Departamento:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+msgid "_Full Name..."
+msgstr "Nome _completo..."
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+msgid "_Home"
+msgstr "_Residencial"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+msgid "_Job title:"
+msgstr "C_argo:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "Nome do _gerente:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
-msgstr "_Bodas:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+msgid "_Mobile"
+msgstr "Cel_ular"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-msgid "No_tes:"
-msgstr "_Notas:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+msgid "_Nickname:"
+msgstr "_Apelido:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Details"
-msgstr "Detalhes"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+msgid "_Office:"
+msgstr "_EscritСrio:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+msgid "_Profession:"
+msgstr "_ProfissЦo:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+msgid "_Spouse:"
+msgstr "_CТnjuge:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+msgid "_This is the mailing address"
+msgstr "E_ste И o endereГo de correspondЙncia"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Excluir contato?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
+msgid "This contact belongs to these categories:"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Assistente:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/contact-editor/e-contact-editor.c:1379
-#: addressbook/gui/widgets/e-addressbook-view.c:568
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Comercial"
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Comercial 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Fax comercial"
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Callback"
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Carro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Empresa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
-#: addressbook/contact-editor/e-contact-editor.c:1380
-#: addressbook/gui/widgets/e-addressbook-view.c:569
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Residencial"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Residencial 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Fax residencial"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Celular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: mail/mail-config.glade.h:45
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Outro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1287
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Outro fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/contact-editor/e-contact-editor.c:1290
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "RАdio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1291
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1292
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-msgid "Email 2"
-msgstr "E-mail 2"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
+msgid "Contact Quick-Add"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
-msgid "Email 3"
-msgstr "E-mail 3"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
+#, fuzzy
+msgid "Edit Full"
+msgstr "Editar filtros"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
+#, fuzzy
+msgid "Full Name"
+msgstr "Nome completo:"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#, fuzzy
+msgid "E-mail"
+msgstr "E-mail"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "EndereГo _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "CanadА"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Verificar endereГo"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "_PaМs:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "FinlБndia"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "EUA"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_EndereГo:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_Cidade:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "Cai_xa postal:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "E_stado:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "CEP/CСdi_go postal:"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Verificar nome completo"
 
-#: addressbook/contact-editor/fullname-strings.h:8
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
+#: addressbook/gui/contact-editor/fullname.glade.h:2
+msgid "Dr."
 msgstr ""
-"\n"
-"Sr.\n"
-"Sra.\n"
-"Srta.\n"
-"Senhorita\n"
-"Dr.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
+#: addressbook/gui/contact-editor/fullname.glade.h:3
+msgid "Esq."
 msgstr ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
-
-#: addressbook/contact-editor/fullname-strings.h:23
-msgid "_First:"
-msgstr "_Nome:"
-
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
-msgstr "_Tratamento:"
-
-#: addressbook/contact-editor/fullname-strings.h:25
-msgid "_Middle:"
-msgstr "Nome do _meio:"
-
-#: addressbook/contact-editor/fullname-strings.h:26
-msgid "_Last:"
-msgstr "_Sobrenome:"
-
-#: addressbook/contact-editor/fullname-strings.h:27
-msgid "_Suffix:"
-msgstr "S_ufixo:"
-
-#: addressbook/gui/component/addressbook.c:231
-msgid "As _Minicards"
-msgstr "Como _minicartУes"
-
-#: addressbook/gui/component/addressbook.c:237
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Como _tabela"
-
-#: addressbook/gui/component/addressbook.c:406
-#, c-format
-msgid "Enter password for %s"
-msgstr "Entre senha para %s"
-
-#: addressbook/gui/component/addressbook.c:434
-msgid "Unable to open addressbook"
-msgstr "NЦo И possМvel abrir o catАlogo de endereГos"
-
-#: addressbook/gui/component/addressbook.c:439
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"NЦo foi possМvel abrir este catАlogo de endereГos. Isto \n"
-"significa que vocЙ forneceu uma URI incorreta ou tentou\n"
-"acessar um servidor LDAP sem que o suporte para LDAP esteja\n"
-"compilado. Se vocЙ entrou uma URI, verifique a URI e tente \n"
-"novamente. Caso contrАrio, vocЙ provavelmente tentou\n"
-"acessar um servidor LDAP. Se vocЙ quiser usar LDAP, vocЙ\n"
-"vai precisar baixar e instalar OpenLDAP e recompilar e\n"
-"instalar Evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:562 mail/folder-browser.c:221
-msgid "Show All"
-msgstr "Exibir todos"
 
-#: addressbook/gui/component/addressbook.c:564 mail/folder-browser.c:223
-msgid "Advanced..."
-msgstr "AvanГado..."
-
-#: addressbook/gui/component/addressbook.c:594
-msgid "Any field contains"
-msgstr "Qualquer campo contИm"
-
-#: addressbook/gui/component/addressbook.c:595
-msgid "Name contains"
-msgstr "Nome contИm"
-
-#: addressbook/gui/component/addressbook.c:596
-msgid "Email contains"
-msgstr "E-mail contИm"
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#, fuzzy
+msgid "I"
+msgstr "Se"
 
-#: addressbook/gui/component/addressbook.c:739
-msgid "The URI that the Folder Browser will display"
-msgstr "A URI que o navegador de pastas vai exibir"
+#: addressbook/gui/contact-editor/fullname.glade.h:5
+msgid "II"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:95
-msgid "Other Contacts"
-msgstr "Outros contatos"
+#: addressbook/gui/contact-editor/fullname.glade.h:6
+msgid "III"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:139
-msgid "LDAP Server"
-msgstr "Servidor LDAP"
+#: addressbook/gui/contact-editor/fullname.glade.h:7
+msgid "Jr."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:141
-msgid "File"
-msgstr "Arquivo"
+#: addressbook/gui/contact-editor/fullname.glade.h:8
+#, fuzzy
+msgid "Miss"
+msgstr "И"
 
-#: addressbook/gui/component/addressbook-config.c:144
-msgid "Unknown addressbook type"
-msgstr "Tipo de catАlogo de endereГos desconhecido"
+#: addressbook/gui/contact-editor/fullname.glade.h:9
+msgid "Mr."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "None (anonymous mode)"
-msgstr "Nenhum (modo anТnimo)"
+#: addressbook/gui/contact-editor/fullname.glade.h:10
+msgid "Mrs."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:249
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
-msgid "Password"
-msgstr "Senha"
+#: addressbook/gui/contact-editor/fullname.glade.h:11
+msgid "Ms."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:157
-msgid "SASL"
-msgstr "SASL"
+#: addressbook/gui/contact-editor/fullname.glade.h:12
+msgid "Sr."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:160
-msgid "Unknown auth type"
-msgstr "Tipo de autenticaГЦo desconhecido"
+#: addressbook/gui/contact-editor/fullname.glade.h:13
+msgid "_First:"
+msgstr "_Nome:"
 
-#: addressbook/gui/component/addressbook-config.c:169
-msgid "Base"
-msgstr "Base"
+#: addressbook/gui/contact-editor/fullname.glade.h:14
+msgid "_Last:"
+msgstr "_Sobrenome:"
 
-#: addressbook/gui/component/addressbook-config.c:171
-msgid "One"
-msgstr "Um"
+#: addressbook/gui/contact-editor/fullname.glade.h:15
+msgid "_Middle:"
+msgstr "Nome do _meio:"
 
-#: addressbook/gui/component/addressbook-config.c:173
-msgid "Subtree"
-msgstr "SubАrvore"
+#: addressbook/gui/contact-editor/fullname.glade.h:16
+msgid "_Suffix:"
+msgstr "S_ufixo:"
 
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "Unknown scope type"
-msgstr "Tipo de escopo desconhecido"
+#: addressbook/gui/contact-editor/fullname.glade.h:17
+msgid "_Title:"
+msgstr "_Tratamento:"
 
-#: addressbook/gui/component/addressbook-config.c:309
-msgid "Bind DN:"
-msgstr "Vincular DN:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "Nome da mАquina:"
 
-#: addressbook/gui/component/addressbook-config.c:311
-msgid "Remember this password"
-msgstr "Lembrar esta senha"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "Dezembro"
 
-#: addressbook/gui/component/addressbook-config.c:360
-#: mail/mail-config.glade.h:27
-msgid "Host:"
-msgstr "MАquina:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:361
-msgid "Port:"
-msgstr "Porta:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:364
-msgid "Root DN:"
-msgstr "DN raiz:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
+msgstr "Remover"
 
-#: addressbook/gui/component/addressbook-config.c:384
-msgid "Search Scope:"
-msgstr "Escopo de busca:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "Editor de contatos"
 
-#: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config.glade.h:9
-msgid "Authentication:"
-msgstr "AutenticaГЦo:"
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "Editor de contatos"
 
-#: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-druid.c:460 mail/mail-config.glade.h:48
-msgid "Path:"
-msgstr "Caminho:"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:460
-msgid "Create path if it doesn't exist."
-msgstr "Criar caminho se ele nЦo existir."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:593
-msgid "Edit Addressbook"
-msgstr "Editar catАlogo de endereГos"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#, fuzzy
+msgid "New Contact:"
+msgstr "Novo contato"
 
-#: addressbook/gui/component/addressbook-config.c:595
-msgid "Add Addressbook"
-msgstr "Incluir catАlogo de endereГos"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#, fuzzy
+msgid "Original Contact:"
+msgstr "Autor original:"
 
-#: addressbook/gui/component/addressbook-config.c:611
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
 msgstr ""
-"Selecione o tipo de catАlogo de endereГos vocЙ possui e entre os dados sobre "
-"ele."
 
-#: addressbook/gui/component/addressbook-config.c:616
-#: mail/mail-config.glade.h:40
-msgid "Name:"
-msgstr "Nome:"
-
-#: addressbook/gui/component/addressbook-config.c:617
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "DescriГЦo"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Fontes de catАlogos de endereГos"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: filter/filter.glade.h:3 mail/folder-browser.c:670
-#: mail/mail-config.glade.h:22
-msgid "Edit"
-msgstr "Editar"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-msgid "Name"
-msgstr "Nome"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Localizar..."
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+msgid "Changed Contact:"
+msgstr "Outros contatos"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "DestinatАrios da mensagem"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Selecionar nomes"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Selecionar nome de:"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
+msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/mail-search-dialogue.c:104
+#: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Buscar"
 
@@ -1865,64 +1322,273 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "Salvar como vCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:566
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
+#, fuzzy
+msgid "Send contact to other"
+msgstr "E_nviar o contato a outro..."
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
+#, fuzzy
+msgid "Send message to contact"
+msgstr "Enviar _mensagem ao contato..."
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
+msgid "Print"
+msgstr "Imprimir"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
+#, fuzzy
+msgid "Print Envelope"
+msgstr "Imprimir en_velope..."
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Excluir"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "<b>Erro ao carregar agenda</b>"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "Fontes"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Erro desconhecido"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+msgid "Repository offline"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "PermissЦo negada"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "Arquivo nЦo encontrado"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "OperaГЦo nЦo suportada"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "Cancelada"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "Erro de E/S"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "Erro ao carregar arquivo: %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr ""
+"Erro ao ler dados:\n"
+"%s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Erro ao carregar arquivo: %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "Erro ao ler arquivo de correio: %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr ""
+"Erro ao ler dados:\n"
+"%s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#, fuzzy
+msgid "* Click here to add a contact *"
+msgstr "<clique aqui para selecionar uma data>"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:702
+#, fuzzy
+msgid "File As"
+msgstr "Arquivar como:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:570
+#: addressbook/gui/widgets/e-addressbook-view.c:705
+#, fuzzy
+msgid "Primary Phone"
+msgstr "Principal"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:706
+#, fuzzy
+msgid "Assistant Phone"
+msgstr "Assistente:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:707
+#, fuzzy
+msgid "Business Phone"
+msgstr "Comercial 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:708
+#, fuzzy
+msgid "Callback Phone"
+msgstr "Callback"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:709
+#, fuzzy
+msgid "Company Phone"
+msgstr "Empresa"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:710
+#, fuzzy
+msgid "Home Phone"
+msgstr "Residencial 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Empresa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/gui/widgets/e-addressbook-view.c:712
+#, fuzzy
+msgid "Business Address"
+msgstr "Comercial 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:713
+#, fuzzy
+msgid "Home Address"
+msgstr "Verificar endereГo"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:714
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "Celular"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:715
+msgid "Car Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#, fuzzy
+msgid "Business Phone 2"
+msgstr "Comercial 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+#, fuzzy
+msgid "Home Phone 2"
+msgstr "Residencial 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:721
+#, fuzzy
+msgid "Other Phone"
+msgstr "Outros contatos"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:726
+#, fuzzy
+msgid "TTY"
+msgstr "TTY/TDD"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:727
+#, fuzzy
+msgid "Other Address"
+msgstr "Verificar endereГo"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Site web"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "Departamento"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "EscritСrio"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "Tratamento"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "ProfissЦo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Gerente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Apelido"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "CТnjuge"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr "URL livre-ocupado"
 
-#: addressbook/gui/widgets/e-minicard-control.c:280
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "Terminado"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+msgid "Removing cards..."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Salvar no catАlogo de endereГos"
 
-#: addressbook/gui/widgets/e-minicard-view.c:129
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1936,6 +1602,11 @@ msgstr ""
 "\n"
 "Clique duas vezes aqui para criar um novo contato."
 
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
+#, fuzzy
+msgid "Card View"
+msgstr "CartЦo: "
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -1961,7 +1632,8 @@ msgid "Dimensions:"
 msgstr "Tamanho:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Fonte..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -2092,7 +1764,7 @@ msgstr "Nome do estilo:"
 msgid "Top:"
 msgstr "Superior:"
 
-#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:70
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Type:"
 msgstr "Tipo:"
 
@@ -2101,123 +1773,324 @@ msgid "Width:"
 msgstr "Largura:"
 
 #: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "label26"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Canal para agenda do Evolution"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution calendar conduit.\n"
-msgstr "UtilitАrio de configuraГЦo do canal para agenda do Evolution.\n"
+#, fuzzy
+msgid "_Font..."
+msgstr "Fonte..."
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Erro ao comunicar com o servidor de agenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "NЦo foi possМvel ler os dados do aplicativo de agenda do pilot"
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
-msgstr "Canal para tarefas do Evolution"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution todo conduit.\n"
-msgstr "UtilitАrio de configuraГЦo do canal para tarefas do Evolution.\n"
-
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "NЦo foi possМvel ler os dados do aplicativo de tarefas do pilot"
 
-#: calendar/gui/calendar-commands.c:245
-msgid "File not found"
-msgstr "Arquivo nЦo encontrado"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:269
-msgid "Open calendar"
-msgstr "Abrir agenda"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#, fuzzy
+msgid "Evolution calendar executive summary component."
+msgstr "NЦo И possМvel iniciar o componente Executive Summary do Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Canal para agenda do Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "UtilitАrio de configuraГЦo do canal para agenda do Evolution.\n"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:311
-msgid "Save calendar"
-msgstr "Salvar agenda"
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "NotificaГЦo sobre seu compromisso em %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "NotificaГЦo sobre seu compromisso em %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "NotificaГЦo sobre seu compromisso em %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "NotificaГЦo sobre seu compromisso em %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "NotificaГЦo sobre seu compromisso em %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "NotificaГЦo sobre seu compromisso em %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "NotificaГЦo sobre seu compromisso em %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "Exibir informaГЦo sobre o Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "Alarme em %A %d %b %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Fechar"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "Adiar"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "Tempo de adiamento (minutos)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "Editar compromisso"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "Sem resumo disponМvel."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+#, fuzzy
+msgid "Reminder of your appointment at "
+msgstr "Lembre-me de todos os compromissos"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "Adiar"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Ok"
 
-#: calendar/gui/calendar-commands.c:448
+#: calendar/gui/alarm-notify/notify-main.c:58
+#, c-format
 msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
+"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+"know."
 msgstr ""
-"NЦo foi possМvel criar a visualizaГЦo da agenda. Por favor verifique a "
-"configuraГЦo do seu ORBit e OAF."
 
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:332
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+msgid "Could not initialize GNOME"
+msgstr "NЦo foi possМvel iniciar Gnome"
 
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %d/%m/%Y %H:%M:%S"
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "NЦo foi possМvel iniciar Bonobo"
 
-#. strftime format of a weekday, a date and a time,
-#. in 12-hour format.
-#: calendar/gui/calendar-model.c:340 calendar/gui/calendar-model.c:769
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
+#: calendar/gui/alarm-notify/notify-main.c:115
+#, fuzzy
+msgid "Could not create the alarm notify service factory"
+msgstr "NЦo foi possМvel criar diretСrio temporАrio: %s"
+
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A, %e de %B de %Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-model.c:374
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: calendar/gui/calendar-commands.c:586
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
+msgstr ""
+"NЦo foi possМvel criar a visualizaГЦo da agenda. Por favor verifique a "
+"configuraГЦo do seu ORBit e OAF."
+
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "PЗblico"
 
-#: calendar/gui/calendar-model.c:377
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Particular"
 
-#: calendar/gui/calendar-model.c:380
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "L"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:545
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
+msgid "High"
+msgstr "Alta"
+
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
+msgid "Normal"
+msgstr "Normal"
+
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
+msgid "Low"
+msgstr "Baixa"
+
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Transparente"
 
-#: calendar/gui/calendar-model.c:548
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Opaco"
 
-#: calendar/gui/calendar-model.c:774
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
+msgid "Not Started"
+msgstr "NЦo iniciada"
+
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
+msgid "In Progress"
+msgstr "Em progresso"
+
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
+msgid "Completed"
+msgstr "Cumprida"
+
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: camel/camel-service.c:580
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -2228,36 +2101,27 @@ msgstr ""
 "\n"
 "%s"
 
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:893
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:896
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:900
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#: calendar/gui/calendar-model.c:981
+msgid ""
+"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+msgstr ""
 
-#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:903
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
+msgid "None"
+msgstr "Nenhum"
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2267,73 +2131,300 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "O valor percentual deve estar entre 0 e 100, inclusive"
 
-#: calendar/gui/calendar-model.c:1103
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "A prioridade deve estar entre 1 e 9, inclusive"
+#: calendar/gui/calendar-model.c:1168
+msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:97
-msgid "%A, %e %B %Y"
-msgstr "%A, %e de %B de %Y"
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
+msgid "Undefined"
+msgstr "Indefinido"
 
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
-msgid "%I:%M%p"
-msgstr "%H:%M"
+#: calendar/gui/calendar-model.c:1222
+msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:302
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Erro ao carregar agenda</b>"
+#: calendar/gui/calendar-model.c:1710
+#, fuzzy
+msgid "Recurring"
+msgstr "RepetiГЦo"
 
-#: calendar/gui/calendar-summary.c:314
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Erro ao carregar agenda:<br>MИtodo nЦo suportado"
+#: calendar/gui/calendar-model.c:1712
+#, fuzzy
+msgid "Assigned"
+msgstr "Atribuir pontuaГЦo"
 
-#: calendar/gui/calendar-summary.c:484
-msgid "Display"
-msgstr "ExibiГЦo"
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
+msgid "Yes"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:489
-msgid "Show appointments"
-msgstr "Exibir compromissos"
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
+#, fuzzy
+msgid "No"
+msgstr "Agora"
 
-#: calendar/gui/calendar-summary.c:497
-msgid "Show tasks"
-msgstr "Exibir tarefas"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "_Visualizar"
 
-#: calendar/gui/calendar-summary.c:583
-msgid "Loading Calendar"
-msgstr "Carregando agenda"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "Semana Зtil"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "Semana"
+
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "MЙs"
+
+#: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "A URI que a agenda vai exibir"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarme em %A %d %b %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "Alarmes audМveis"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "NotificaГЦo sobre seu compromisso em %A %d %b %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "DestinatАrios da mensagem"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
-msgid "No summary available."
-msgstr "Sem resumo disponМvel."
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "OpГУes de exibiГЦo"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Editar compromisso"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Adiar"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Tempo de adiamento (minutos)"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "Corpo da mensagem"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Senha:"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "E_xecutar programa:"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "dias"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+msgid "extra times every"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "horas"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "minutos"
+
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr "dias"
+
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr "dia"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr "semanas"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr "semana"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr "horas"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr "hora"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr "minutos"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr "10 minutos"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr "segundos"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr "segundo"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "_Mensagem de correio"
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+#, fuzzy
+msgid "Send an email"
+msgstr "Enviar uma mensagem para %s"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+#, fuzzy
+msgid "Run a program"
+msgstr "E_xecutar programa:"
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr "Criar um novo compromisso"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr "Criar um novo compromisso"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr "Lembre-me de todos os compromissos"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr "Criar um novo compromisso"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "Base"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+msgid "Date/Time:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "Lembretes"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+#, fuzzy
+msgid "Summary:"
+msgstr "R_esumo:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_OpГУes"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "apСs"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "antes"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "dia(s)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+#, fuzzy
+msgid "end of appointment"
+msgstr "Novo compromisso"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+#, fuzzy
+msgid "hour(s)"
+msgstr "horas"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#, fuzzy
+msgid "minute(s)"
+msgstr "minutos"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+#, fuzzy
+msgid "start of appointment"
+msgstr "Editar compromisso"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
@@ -2364,35 +2455,38 @@ msgid "60 minutes"
 msgstr "60 minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Alarmes param apСs"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Alarmes audМveis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "Soe um bip quando janelas de alarme aparecerem."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Agenda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "PreferЙncias da agenda"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Cores"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+#, fuzzy
+msgid "Compress weekends in month view"
 msgstr "Comprimir fins de semana"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+#, fuzzy
+msgid "Date Navigator"
 msgstr "OpГУes do navegador de datas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -2400,680 +2494,1169 @@ msgid "Defaults"
 msgstr "PadrУes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "OpГУes de exibiГЦo"
+#: mail/mail-config.glade.h:30
+msgid "Display"
+msgstr "ExibiГЦo"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr "Prazo de conclusЦo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Permitir adiamento por"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "TИrmino do dia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Primeiro dia da semana:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "sex"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:440
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Sexta-feira"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "RealГar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "Tarefas com prazo para hoje"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Tarefas com prazo para hoje"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Tarefas com prazo ainda nЦo vencido"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Tarefas com prazo ainda nЦo vencido"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "seg"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:436
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Segunda-feira"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Tarefas atrasadas"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#, fuzzy
+msgid "Overdue tasks"
 msgstr "Tarefas atrasadas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "Pick a color"
-msgstr "Escolha uma cor"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "Prioridade"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Lembre-me de todos os compromissos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "Reminders"
-msgstr "Lembretes"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "sАb"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:441
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "SАbado"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Exibir"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "Exibir hora de tИrmino de compromissos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Exibir nЗmeros das semanas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "InМcio do dia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "dom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:442
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Domigo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
 msgstr "Tarefas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "Tarefas com prazo para hoje"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "qui"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:439
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Quinta-feira"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Tempo atИ o prazo"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "Time"
+msgstr "Tempo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "Unidades de tempo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Formato da hora:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"Fuso horАrio: "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "ter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:437
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "TerГa-feira"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Alarmes visuais"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "qua"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:438
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
 msgstr "Semana Зtil"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "minutos antes que ocorram."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:76
-msgid "seconds."
-msgstr "segundos."
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "VocЙ tem certeza que deseja excluir esta tarefa sem tМtulo?"
 
-#: calendar/gui/dialogs/delete-comp.c:63
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "VocЙ tem certeza que deseja excluir a tarefa `%s'?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "VocЙ tem certeza que deseja excluir o item de diАrio `%s'?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+#, fuzzy
+msgid " to "
+msgstr "Ir para"
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "Cumprida"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "Cumprida"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#, fuzzy
+msgid "Due "
+msgstr "Prazo de conclusЦo"
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "Editar compromisso"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "Compromisso - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "Tarefa - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Item de diАrio - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Sem resumo"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "Sobrescrever arquivo?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"JА existe um arquivo com este nome.\n"
+"SobrescrevЙ-lo?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Salvar como..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "VocЙ tem certeza que deseja excluir o comprimisso `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:66
+#: calendar/gui/dialogs/delete-comp.c:87
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "VocЙ tem certeza que deseja excluir este comprimisso sem tМtulo?"
 
-#: calendar/gui/dialogs/delete-comp.c:72
+#: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "VocЙ tem certeza que deseja excluir a tarefa `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:75
+#: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "VocЙ tem certeza que deseja excluir esta tarefa sem tМtulo?"
 
-#: calendar/gui/dialogs/delete-comp.c:81
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "VocЙ tem certeza que deseja excluir o item de diАrio `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:84
+#: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "VocЙ tem certeza que deseja excluir este item de diАrio sem tМtulo?"
 
-#: calendar/gui/dialogs/save-comp.c:46
-msgid "Do you want to save changes?"
-msgstr "VocЙ deseja salvar as modificaГУes?"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "VocЙ tem certeza que deseja excluir o comprimisso `%s'?"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% Cu_mprida:"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "VocЙ tem certeza que deseja excluir a tarefa `%s'?"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-msgid "C_lassification:"
-msgstr "C_lassificaГЦo:"
+#: calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "VocЙ tem certeza que deseja excluir o item de diАrio `%s'?"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-msgid "Cancelled"
-msgstr "Cancelada"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Selecionar nome de:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-msgid "Completed"
-msgstr "Cumprida"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "SeГУes:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Cumprida em:"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Fuso horАrio: "
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "High"
-msgstr "Alta"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "In Progress"
+#: calendar/gui/dialogs/event-editor.c:154
+#, fuzzy
+msgid "Appointment"
+msgstr "Compromisso - %s"
+
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
+msgstr "Lembrete"
+
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
+msgstr "RepetiГЦo"
+
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "_ConfiguraГУes"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "Dia _inteiro"
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
+msgid "Classification"
+msgstr "ClassificaГЦo"
+
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
+#, fuzzy
+msgid "Date & Time"
+msgstr "Data de envio"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
+msgid "Pri_vate"
+msgstr "Pa_rticular"
+
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
+msgid "Pu_blic"
+msgstr "PЗ_blico"
+
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
+msgid "Su_mmary:"
+msgstr "R_esumo:"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
+msgid "_Confidential"
+msgstr "_Confidencial"
+
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "Hora de _tИrmino:"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "Hora de _inМcio:"
+
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Grupo %i"
+
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Fonte"
+
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+#, fuzzy
+msgid "Chair"
+msgstr "Carro"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+#, fuzzy
+msgid "Required Participant"
+msgstr "Pessoas _necessАrias"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Excluir aГЦo"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Accepted"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr "Recebida"
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Preliminar"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Excluir"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
 msgstr "Em progresso"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "Low"
-msgstr "Baixa"
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
 
-#. add a "None" option to the stores menu
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: mail/mail-account-editor.c:674 mail/mail-account-editor.c:676
-#: mail/mail-account-editor.c:725 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:872 mail/mail-config.glade.h:42
-#: shell/e-shell-view.c:1116 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Nenhum"
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Chair Persons"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "Normal"
-msgstr "Normal"
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+msgid "Required Participants"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "Not Started"
-msgstr "NЦo iniciada"
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Optional Participants"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "S_ummary"
-msgstr "_Resumo"
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Non-Participants"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Sta_rt Date:"
-msgstr "Data de _inМcio:"
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "Enviar como:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Tarefa"
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "Excluir..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#, fuzzy
+msgid "Attendee"
+msgstr "Todos os participantes"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
+msgstr "Data cumprida"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "Excluir"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "Excluir"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "Gerente"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "Dezembro"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#, fuzzy
+msgid "Role"
+msgstr "Celular"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Estado"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Tipo"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+#, fuzzy
+msgid "Organizer:"
+msgstr "Empresa:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+msgid "_Change Organizer"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "_Convidar outros..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+msgid "_Other Organizer"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a %d %b %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Este compromisso possui repetiГУes que o Evolution nЦo pode editar."
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr "no"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "dia"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr "no"
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr "╨"
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr "ocorrЙncias"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
+msgstr "RepetiГЦo personalizada"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "A cada"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "ExceГУes"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
+msgstr "Sem repetiГЦo"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
+msgstr "Visualizar"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
+msgstr "Regra de repetiГЦo"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
+msgstr "RepetiГЦo simples"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "Modificar"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "por"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "para sempre"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "mЙs(es)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr "atИ"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "semana(s)"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
+msgstr "ano(s)"
+
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr "VocЙ deseja salvar as modificaГУes?"
+
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "Cumprida em:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "Selecionar nome de:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "Excluir"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "Nenhum"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-msgid "Undefined"
-msgstr "Indefinido"
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "Tarefa"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-msgid "_Contacts..."
-msgstr "Co_ntatos..."
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% Cu_mprida:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: calendar/gui/dialogs/task-page.glade.h:14
+#, fuzzy
+msgid "Progress"
+msgstr "Em progresso"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "Data de _inМcio:"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
 msgid "_Due Date:"
 msgstr "Prazo de _conclusЦo:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: calendar/gui/dialogs/task-page.glade.h:22
 msgid "_Priority:"
 msgstr "_Prioridade:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
+#: calendar/gui/dialogs/task-page.glade.h:23
 msgid "_Status:"
 msgstr "_Estado:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "task-editor-dialog"
-msgstr "task-editor-dialog"
+#: calendar/gui/e-calendar-table.c:351
+#, c-format
+msgid "0%"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:692
-msgid "Edit Task"
-msgstr "Editar tarefa"
+#: calendar/gui/e-calendar-table.c:352
+#, c-format
+msgid "10%"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:698 calendar/gui/event-editor.c:338
-msgid "No summary"
-msgstr "Sem resumo"
+#: calendar/gui/e-calendar-table.c:353
+#, c-format
+msgid "20%"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:344
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
-msgid "Appointment - %s"
-msgstr "Compromisso - %s"
+msgid "30%"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:347
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
-msgid "Task - %s"
-msgstr "Tarefa - %s"
+msgid "40%"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:710 calendar/gui/event-editor.c:350
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
-msgid "Journal entry - %s"
-msgstr "Item de diАrio - %s"
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:357
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:358
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:359
+#, c-format
+msgid "80%"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:154
+#: calendar/gui/e-calendar-table.c:360
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:361
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+#, fuzzy
+msgid "_Open"
+msgstr "Abrir"
+
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "Recor_tar"
+
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Copiar"
+
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "C_olar"
+
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "Marcar como cumprida"
+
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
+msgstr "Excluir esta tarefa"
+
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
+msgstr "Marcar como cumprida"
+
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
+msgstr "Exclui a tarefa"
+
+#: calendar/gui/e-calendar-table.c:1137
+#, fuzzy
+msgid "Click here to add a task"
+msgstr "Clique aqui para o catАlogo de endereГos"
+
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% Cu_mprida:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Alarmes"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Categorias"
 
-#: calendar/gui/e-calendar-table.c:155
-#: calendar/gui/event-editor-dialog.glade.h:5
-msgid "Classification"
-msgstr "ClassificaГЦo"
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+#, fuzzy
+msgid "Complete"
+msgstr "Cumprida"
 
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "Data cumprida"
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "Prazo de conclusЦo"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Data de tИrmino"
 
-#: calendar/gui/e-calendar-table.c:158
-msgid "Start Date"
-msgstr "Data de inМcio"
-
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "PosiГЦo geogrАfica"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Precent complete"
-msgstr "Porcentagem cumprida"
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Prioridade"
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Data de inМcio"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Summary"
 msgstr "Resumo"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "Tarefas"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Transparency"
 msgstr "TransparЙncia"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Alarms"
-msgstr "Alarmes"
-
-#: calendar/gui/e-calendar-table.c:397
-msgid "Open..."
-msgstr "Abrir..."
-
-#: calendar/gui/e-calendar-table.c:398
-msgid "Open the task"
-msgstr "Abre a tarefa"
-
-#: calendar/gui/e-calendar-table.c:400
-msgid "Mark Complete"
-msgstr "Marcar como cumprida"
-
-#: calendar/gui/e-calendar-table.c:401
-msgid "Mark the task complete"
-msgstr "Marca a tarefa como cumprida"
-
-#: calendar/gui/e-calendar-table.c:404
-msgid "Delete the task"
-msgstr "Exclui a tarefa"
-
-#: calendar/gui/e-day-view-time-item.c:517
+#: calendar/gui/e-day-view-time-item.c:519
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i fraГУes de minuto"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
-#: calendar/gui/e-week-view-main-item.c:321
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
-#: calendar/gui/e-week-view-main-item.c:330
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
-#: calendar/gui/e-week-view-main-item.c:344
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
+#: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:610
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:609
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
-#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
-#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
-msgid "New appointment..."
-msgstr "Novo compromisso..."
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
+msgstr "Novo compromisso"
 
-#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
-#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
-msgid "Edit this appointment..."
-msgstr "Editar este compromisso..."
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
+msgstr "Dia _inteiro"
 
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
-#: ui/evolution-event-editor.xml.h:15
-msgid "Delete this appointment"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+#, fuzzy
+msgid "Go to _Today"
+msgstr "Ir para hoje"
+
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
+msgstr "Ir para data"
+
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Excluir este compromisso"
 
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
-msgid "Make this appointment movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Tornar este compromisso mСvel"
 
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
-msgid "Delete this occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "Excluir esta ocorrЙncia"
 
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
-msgid "Delete all occurrences"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "Excluir todas as ocorrЙncias"
 
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:454
-#: calendar/gui/e-tasks.c:487
-msgid "All"
-msgstr "Todos"
-
-#: calendar/gui/e-tasks.c:146
-msgid "Category:"
-msgstr "Categoria:"
-
-#: calendar/gui/e-tasks.c:284
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "NЦo foi possМvel carregar as tarefas em `%s'"
-
-#: calendar/gui/e-tasks.c:296
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "O mИtodo necessАrio para carregar `%s' nЦo И suportado"
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
-msgid "%d %B"
-msgstr "%d %B"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Dia _inteiro"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment Basics"
-msgstr "BАsico do compromisso"
-
-#: calendar/gui/event-editor-dialog.glade.h:6
-msgid "Custom recurrence"
-msgstr "RepetiГЦo personalizada"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Days"
-msgstr "Dias"
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Every"
-msgstr "A cada"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Exceptions"
-msgstr "ExceГУes"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Hours"
-msgstr "Horas"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Mail _to:"
-msgstr "Co_rreio para:"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Minutes"
-msgstr "Minutos"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Modify"
-msgstr "Modificar"
-
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "No recurrence"
-msgstr "Sem repetiГЦo"
-
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "Preview"
-msgstr "Visualizar"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Pri_vate"
-msgstr "Pa_rticular"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Pu_blic"
-msgstr "PЗ_blico"
+#: calendar/gui/e-itip-control.c:697
+#, fuzzy
+msgid "This is a meeting request."
+msgstr "E_ste И o endereГo de correspondЙncia"
 
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Recurrence"
-msgstr "RepetiГЦo"
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Recurrence Rule"
-msgstr "Regra de repetiГЦo"
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:22
-msgid "Reminder"
-msgstr "Lembrete"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:23
-msgid "Simple recurrence"
-msgstr "RepetiГЦo simples"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:24
-msgid "Su_mmary:"
-msgstr "R_esumo:"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+#, fuzzy
+msgid "The message is not understandable."
+msgstr "Este arquivo existe mas nЦo И legМvel."
 
-#: calendar/gui/event-editor-dialog.glade.h:25
-msgid "Time"
-msgstr "Tempo"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "_Audio"
-msgstr "_Audio"
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "_Confidential"
-msgstr "_Confidencial"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Contacts"
-msgstr "Co_ntatos"
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Display"
-msgstr "_ExibiГЦo"
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "Hora de _tИrmino:"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Mail"
-msgstr "_Correio"
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Program"
-msgstr "_Programa"
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "_Run program:"
-msgstr "E_xecutar programa:"
+#: calendar/gui/e-itip-control.c:834
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "A pasta aparenta estar corrompida de modo irrecuperАvel."
 
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Start time:"
-msgstr "Hora de _inМcio:"
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Starting date:"
-msgstr "Data de _inМcio:"
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "day(s)"
-msgstr "dia(s)"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "event-editor-dialog"
-msgstr "event-editor-dialog"
+#: calendar/gui/e-itip-control.c:1015
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "for"
-msgstr "por"
+#: calendar/gui/e-itip-control.glade.h:2
+#, fuzzy, no-c-format
+msgid "%P %%"
+msgstr "%A %d %B"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "forever"
-msgstr "para sempre"
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label21"
+#: calendar/gui/e-itip-control.glade.h:4
+#, fuzzy
+msgid "Calendar Message"
+msgstr "Agenda"
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr "mЙs(es)"
+#: calendar/gui/e-itip-control.glade.h:5
+#, fuzzy
+msgid "Date:"
+msgstr "Data"
 
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "until"
-msgstr "atИ"
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "Carregando agenda"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "week(s)"
-msgstr "semana(s)"
+#: calendar/gui/e-itip-control.glade.h:8
+#, fuzzy
+msgid "Loading calendar..."
+msgstr "Carregando agenda"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "year(s)"
-msgstr "ano(s)"
+#: calendar/gui/e-itip-control.glade.h:10
+#, fuzzy
+msgid "Server Message:"
+msgstr "Salvar mensagem como..."
 
-#: calendar/gui/event-editor.c:332
-msgid "Edit Appointment"
-msgstr "Editar compromisso"
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr ""
 
-#: calendar/gui/event-editor.c:410
-msgid "on"
-msgstr "no"
+#: calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr ""
 
-#: calendar/gui/event-editor.c:435 filter/filter-datespec.c:65
-msgid "day"
-msgstr "dia"
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
+msgid "All"
+msgstr "Todos"
 
-#: calendar/gui/event-editor.c:562
-msgid "on the"
-msgstr "no"
+#: calendar/gui/e-tasks.c:252
+msgid "Category:"
+msgstr "Categoria:"
 
-#: calendar/gui/event-editor.c:569
-msgid "th"
-msgstr "╨"
+#: calendar/gui/e-tasks.c:403
+#, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "NЦo foi possМvel carregar as tarefas em `%s'"
 
-#: calendar/gui/event-editor.c:723
-msgid "occurrences"
-msgstr "ocorrЙncias"
+#: calendar/gui/e-tasks.c:415
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr "O mИtodo necessАrio para carregar `%s' nЦo И suportado"
 
-#: calendar/gui/event-editor.c:840
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Este compromisso possui repetiГУes que o Evolution nЦo pode editar."
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
+msgid "%d %B"
+msgstr "%d %B"
 
-#: calendar/gui/event-editor.c:3092 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
-msgid "%a %b %d %Y"
-msgstr "%a %d %b %Y"
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "Novo compromisso..."
 
-#: calendar/gui/gnome-cal.c:696
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "NЦo foi possМvel abrir pasta em `%s'"
 
-#: calendar/gui/gnome-cal.c:707
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "O mИtodo necessАrio para abrir `%s' nЦo И suportado"
@@ -3099,399 +3682,814 @@ msgid "Go To Date"
 msgstr "Ir para data"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Ir para hoje"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Janeiro"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "Julho"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "Junho"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "MarГo"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "Maio"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "Novembro"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "Outubro"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Setembro"
 
-#: calendar/gui/main.c:50
-msgid "Could not initialize GNOME"
-msgstr "NЦo foi possМvel iniciar Gnome"
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Ir para hoje"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1╨"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2╨"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3╨"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4╨"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5╨"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6╨"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7╨"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8╨"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9╨"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10╨"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11╨"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12╨"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13╨"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14╨"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15╨"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16╨"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17╨"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18╨"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19╨"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20╨"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21╨"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22╨"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23╨"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24╨"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25╨"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26╨"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27╨"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28╨"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29╨"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30╨"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31╨"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "do"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "se"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "te"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "qu"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "qu"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "se"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "sА"
 
-#: calendar/gui/print.c:941
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tarefas"
 
 #. Day
-#: calendar/gui/print.c:1071
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "Dia atual (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1086
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1097
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Semana atual (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1105
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "MЙs atual (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1112
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Ano atual (%Y)"
 
-#: calendar/gui/print.c:1149
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Imprimir agenda"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1035
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Visualizar impressЦo"
 
-#: calendar/gui/tasks-control.c:105
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Imprime este item"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "Configurar impressЦo..."
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "A URI da pasta de tarefas a ser exibida"
 
-#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
+#: calendar/gui/tasks-migrate.c:106
+msgid ""
+"Evolution has taken the tasks that were in your calendar folder and "
+"automatically migrated them to the new tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:109
+msgid ""
+"Evolution has tried to take the tasks that were in your calendar folder and "
+"migrate them to the new tasks folder.\n"
+"Some of the tasks could not be migrated, so this process may be attempted "
+"again in the future."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:121
+#, c-format
+msgid ""
+"Could not open `%s'; no items from the calendar folder will be migrated to "
+"the tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:134
+#, c-format
+msgid ""
+"The method required to load `%s' is not supported; no items from the "
+"calendar folder will be migrated to the tasks folder."
+msgstr ""
+
+#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
 msgid "SMTWTFS"
 msgstr "DSTQQSS"
 
-#: camel/camel-filter-search.c:420 camel/camel-filter-search.c:426
+#: camel/camel-cipher-context.c:171
+#, fuzzy
+msgid "Signing is not supported by this cipher"
+msgstr "O tipo especificado nЦo И suportado neste repositСrio"
+
+#: camel/camel-cipher-context.c:211
+#, fuzzy
+msgid "Clearsigning is not supported by this cipher"
+msgstr "O tipo especificado nЦo И suportado neste repositСrio"
+
+#: camel/camel-cipher-context.c:251
+#, fuzzy
+msgid "Verifying is not supported by this cipher"
+msgstr "O tipo especificado nЦo И suportado neste repositСrio"
+
+#: camel/camel-cipher-context.c:294
+#, fuzzy
+msgid "Encryption is not supported by this cipher"
+msgstr "O tipo especificado nЦo И suportado neste repositСrio"
+
+#: camel/camel-cipher-context.c:336
+#, fuzzy
+msgid "Decryption is not supported by this cipher"
+msgstr "O tipo especificado nЦo И suportado neste repositСrio"
+
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
+#, fuzzy
+msgid "Syncing folders"
+msgstr "Sincronizando pasta"
+
+#: camel/camel-filter-driver.c:644
+#, fuzzy
+msgid "Unable to open spool folder"
+msgstr "NЦo И possМvel abrir o catАlogo de endereГos"
+
+#: camel/camel-filter-driver.c:653
+#, fuzzy
+msgid "Unable to process spool folder"
+msgstr ""
+"NЦo И possМvel registrar a pasta '%s':\n"
+"%s"
+
+#: camel/camel-filter-driver.c:667
+#, fuzzy
+msgid "Getting message %d (%d%%)"
+msgstr "Recuperando mensagem %s"
+
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, fuzzy, c-format
+msgid "Failed on message %d"
+msgstr "Mensagem encaminhada - %s"
+
+#: camel/camel-filter-driver.c:672
+#, fuzzy
+msgid "Cannot open message"
+msgstr ""
+"NЦo И possМvel obter mensagem: %s\n"
+"  %s"
+
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
+#, fuzzy
+msgid "Syncing folder"
+msgstr "Sincronizando pasta"
+
+#: camel/camel-filter-driver.c:766
+#, fuzzy, c-format
+msgid "Getting message %d of %d"
+msgstr "Salvando mensagem %d de %d (uid \"%s\")"
+
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
+#, fuzzy, c-format
+msgid "Failed at message %d of %d"
+msgstr "Salvando mensagem %d de %d (uid \"%s\")"
+
+#: camel/camel-filter-driver.c:892
+#, fuzzy, c-format
+msgid "Error parsing filter: %s: %s"
+msgstr "Erro ao salvar arquivo: %s"
+
+#: camel/camel-filter-driver.c:898
+#, fuzzy, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "Erro ao executar busca por filtro: %s: %s"
+
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro ao executar busca por filtro: %s: %s"
 
+#: camel/camel-folder-search.c:328
+#, fuzzy, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Erro na expressЦo regular '%s':\n"
+"%s"
+
+#: camel/camel-folder-search.c:338
+#, fuzzy, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Erro na expressЦo regular '%s':\n"
+"%s"
+
+#: camel/camel-folder-search.c:485 camel/camel-folder-search.c:513
+msgid "(match-all) requires a single bool result"
+msgstr ""
+
+#: camel/camel-folder-search.c:559
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
+
+#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
+msgid "Invalid type in body-contains, expecting string"
+msgstr ""
+
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "NЦo foi possМvel criar pipe: %s"
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr ""
+"NЦo И possМvel abrir local `%s':\n"
+"%s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "NЦo foi possМvel executar fork: %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "NЦo foi possМvel criar arquivo de bloqueio para %s: %s"
 
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "Tempo esgotado ao tentar obter arquivo de bloqueio em %s. Tente novamente "
 "mais tarde."
 
-#: camel/camel-lock.c:199
+#: camel/camel-lock.c:201
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Falha ao obter bloqueio usando fcntl(2): %s"
 
-#: camel/camel-lock.c:253
+#: camel/camel-lock.c:255
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Falha ao obter bloqueio usando flock(2): %s"
 
-#: camel/camel-movemail.c:99
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "NЦo foi possМvel verificar arquivo de correio %s: %s"
 
-#: camel/camel-movemail.c:146
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "NЦo foi possМvel abrir arquivo de correio %s: %s"
 
-#: camel/camel-movemail.c:156
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "NЦo foi possМvel abrir arquivo de correio temporАrio %s: %s"
 
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "NЦo foi possМvel testar arquivo de bloqueio para %s: %s"
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Erro ao ler arquivo de correio: %s"
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Erro ao escrever arquivo de correio temporАrio: %s"
-
-#: camel/camel-movemail.c:272
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Falha ao armazenar correio no arquivo temporАrio %s: %s"
 
-#: camel/camel-movemail.c:304
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "NЦo foi possМvel criar pipe: %s"
 
-#: camel/camel-movemail.c:316
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "NЦo foi possМvel executar fork: %s"
 
-#: camel/camel-movemail.c:354
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Falha no programa Movemail: %s"
 
-#: camel/camel-movemail.c:355
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Erro desconhecido)"
 
-#: camel/camel-provider.c:133
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Erro ao ler arquivo de correio: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Erro ao escrever arquivo de correio temporАrio: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
+#, fuzzy, c-format
+msgid "Error copying mail temp file: %s"
+msgstr "Erro ao escrever arquivo de correio temporАrio: %s"
+
+#: camel/camel-pgp-context.c:193
+#, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr "Por favor, entre a sua frase-senha de %s para %s"
+
+#: camel/camel-pgp-context.c:196
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr "Por favor, entre a sua frase-senha de %s"
+
+#: camel/camel-pgp-context.c:518
+msgid "No plaintext to sign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
+msgid "No password provided."
+msgstr "NЦo foi fornecida uma senha."
+
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "NЦo foi possМvel criar pipe para GPG/PGP: %s"
+
+#: camel/camel-pgp-context.c:693
+msgid "No plaintext to clearsign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:886
+msgid "No plaintext to verify."
+msgstr ""
+
+#: camel/camel-pgp-context.c:903
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "NЦo foi possМvel criar arquivo temporАrio: %s"
+
+#: camel/camel-pgp-context.c:1063
+#, fuzzy
+msgid "No plaintext to encrypt."
+msgstr "Clique no Мcone para decifrar."
+
+#: camel/camel-pgp-context.c:1089
+msgid "No recipients specified"
+msgstr "Sem destinatАrios especificados"
+
+#: camel/camel-pgp-context.c:1280
+msgid "No ciphertext to decrypt."
+msgstr ""
+
+#: camel/camel-provider.c:131
+#, c-format
+msgid "Could not load %s: Module loading not supported on this system."
+msgstr ""
+
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "NЦo foi possМvel carregar %s: %s"
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "NЦo foi possМvel carregar %s: Sem cСdigo de inicializaГЦo no mСdulo."
 
-#: camel/camel-remote-store.c:184
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s servidor %s"
 
-#: camel/camel-remote-store.c:188
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s serviГo para %s em %s"
 
-#: camel/camel-remote-store.c:318
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr "ConexЦo cancelada"
 
-#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "NЦo foi possМvel conectar Ю %s (porta %d): %s."
 
-#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:335
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr "(mАquina desconhecida)"
 
-#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
-#: camel/camel-remote-store.c:556
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "OperaГЦo cancelada"
 
-#: camel/camel-service.c:137
+#: camel/camel-remote-store.c:489
+#, fuzzy
+msgid "Server unexpectedly disconnected"
+msgstr "O servidor rejeitou o nome do usuАrio"
+
+#: camel/camel-sasl-anonymous.c:33
+msgid "Anonymous"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:35
+#, fuzzy
+msgid "This option will connect to the server using an anonymous login."
+msgstr "Esta opГЦo conectarА ao servidor IMAP usando uma senha em texto claro."
+
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
+#, fuzzy
+msgid "Authentication failed."
+msgstr "AutenticaГЦo"
+
+#: camel/camel-sasl-anonymous.c:119
+#, c-format
+msgid ""
+"Invalid email address trace information:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:131
+#, fuzzy, c-format
+msgid ""
+"Invalid opaque trace information:\n"
+"%s"
+msgstr ""
+"Erro ao carregar inforaГЦo do filtro:\n"
+"%s"
+
+#: camel/camel-sasl-anonymous.c:143
+#, fuzzy, c-format
+msgid ""
+"Invalid trace information:\n"
+"%s"
+msgstr ""
+"Erro ao carregar inforaГЦo do filtro:\n"
+"%s"
+
+#: camel/camel-sasl-cram-md5.c:35
+msgid "CRAM-MD5"
+msgstr "CRAM-MD5"
+
+#: camel/camel-sasl-cram-md5.c:37
+#, fuzzy
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr "Esta opГЦo conectarА ao servidor SMTP usando autenticaГЦo CRAM-MD5."
+
+#: camel/camel-sasl-digest-md5.c:43
+msgid "DIGEST-MD5"
+msgstr "DIGEST-MD5"
+
+#: camel/camel-sasl-digest-md5.c:45
+#, fuzzy
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr "Esta opГЦo conectarА ao servidor IMAP usando uma senha em texto claro."
+
+#: camel/camel-sasl-digest-md5.c:810
+msgid "Server challenge too long (>2048 octets)\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:819
+msgid "Server challenge invalid\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:825
+msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:847
+#, fuzzy
+msgid "Server response did not contain authorization data\n"
+msgstr "Resposta do servidor IMAP nЦo contИm informaГЦo de %s"
+
+#: camel/camel-sasl-digest-md5.c:865
+msgid "Server response contained incomplete authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:875
+#, fuzzy
+msgid "Server response does not match\n"
+msgstr "Resposta do servidor terminou cedo demais."
+
+#: camel/camel-sasl-kerberos4.c:40
+msgid "Kerberos 4"
+msgstr "Kerberos 4"
+
+#: camel/camel-sasl-kerberos4.c:42
+#, fuzzy
+msgid "This option will connect to the server using Kerberos 4 authentication."
+msgstr "Esta opГЦo conectarА ao servidor IMAP usando autenticaГЦo Kerberos 4."
+
+#: camel/camel-sasl-kerberos4.c:161
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+"NЦo foi possМvel obter ticket do Kerberos:\n"
+"%s"
+
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:440
+msgid "Bad authentication response from server."
+msgstr "Resposta de autenticaГЦo invАlida do servidor."
+
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
+msgstr ""
+
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
+#, fuzzy
+msgid "This option will connect to the server using a simple password."
+msgstr "Esta opГЦo conectarА ao servidor IMAP usando uma senha em texto claro."
+
+#: camel/camel-sasl-login.c:127
+#, fuzzy
+msgid "Unknown authentication state."
+msgstr "NЦo И necessАria autenticaГЦo"
+
+#: camel/camel-search-private.c:111
+#, fuzzy, c-format
+msgid "Regular expression compilation failed: %s: %s"
+msgstr "Falha ao escrever para o mbox temporАrio: %s: %s"
+
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "A URL '%s' precisa de um componente nome do usuАrio"
 
-#: camel/camel-service.c:146
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "A URL '%s' precisa de um componente mАquina"
 
-#: camel/camel-service.c:155
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "A URL '%s' precisa de um componente caminho"
 
-#: camel/camel-service.c:520
+#: camel/camel-service.c:548
 #, c-format
-msgid "No such host %s."
-msgstr "NЦo existe a mАquina %s."
+msgid "Resolving: %s"
+msgstr ""
 
-#: camel/camel-service.c:523
+#: camel/camel-service.c:575
 #, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "NЦo И possМvel temporariamente procurar nome de mАquina %s."
+msgid "Failure in name lookup: %s"
+msgstr ""
 
-#: camel/camel-session.c:299
+#: camel/camel-service.c:600
+#, c-format
+msgid "Host lookup failed: %s: host not found"
+msgstr ""
+
+#: camel/camel-service.c:602
+#, c-format
+msgid "Host lookup failed: %s: unknown reason"
+msgstr ""
+
+#: camel/camel-session.c:68
+msgid "Virtual folder email provider"
+msgstr "Provedor de correio em pastas virtuais"
+
+#: camel/camel-session.c:70
+msgid "For reading mail as a query of another set of folders"
+msgstr "Para ler correio como uma consulta a um outro conjunto de pastas"
+
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "NЦo existe provedor disponМvel para o protocolo `%s'"
 
-#: camel/camel-session.c:390
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3500,99 +4498,237 @@ msgstr ""
 "NЦo foi possМvel criar diretСrio %s:\n"
 "%s"
 
-#: camel/camel-url.c:75
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "A URL `%s' nЦo possui um protocolo"
+#: camel/camel-smime-context.c:173
+#, fuzzy, c-format
+msgid "Please enter your password for %s"
+msgstr "Por favor, entre a sua frase-senha de %s para %s"
+
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
 
-#: camel/camel-url.c:90
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "Este arquivo nЦo existe."
+
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "Este arquivo nЦo existe."
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, fuzzy, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "Falha ao enviar nome do usuАrio ao servidor"
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
+#, fuzzy
+msgid "Failed to decode message."
+msgstr "Anexar um arquivo Ю mensagem"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "A URL `%s' contИm um protocolo invАlido"
+msgid ""
+"Issuer: %s\n"
+"Subject: %s"
+msgstr ""
 
-#: camel/camel-url.c:150
+#. construct our user prompt
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "NЗmero de porta na URL `%s' nЦo И nЗmerico"
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:133
+#: camel/camel-tcp-stream-ssl.c:348
 #, c-format
 msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
 msgstr ""
-"NЦo foi possМvel obter ticket do Kerberos:\n"
+
+#: camel/camel-url.c:289
+#, fuzzy, c-format
+msgid "Could not parse URL `%s'"
+msgstr ""
+"NЦo foi possМvel abrir arquivo `%s':\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-auth.c:205
-msgid "Bad authentication response from server."
-msgstr "Resposta de autenticaГЦo invАlida do servidor."
+#: camel/camel-vee-folder.c:452
+#, fuzzy, c-format
+msgid "No such message %s in %s"
+msgstr "NЦo existe tal mensagem: %s"
 
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/camel-vee-folder.c:547
+#, c-format
+msgid "No such message: %s"
+msgstr "NЦo existe tal mensagem: %s"
+
+#: camel/camel-vtrash-folder.c:109
+#, fuzzy
+msgid "You cannot copy messages from this trash folder."
+msgstr ""
+"VocЙ pode apenas editar mensagens salvas\n"
+"na pasta Drafts."
+
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta inesperada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Falhou o comando IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:433
-msgid "Unknown error"
-msgstr "Erro desconhecido"
-
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "Resposta do servidor terminou cedo demais."
 
-#: camel/providers/imap/camel-imap-command.c:433
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Resposta do servidor IMAP nЦo contИm informaГЦo de %s"
 
-#: camel/providers/imap/camel-imap-command.c:469
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta OK inesperada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:198
+#: camel/providers/imap/camel-imap-folder.c:192
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr "NЦo foi possМvel criar o diretСrio %s: %s"
+
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "NЦo foi possМvel carregar resumo para %s"
 
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
+msgstr ""
+
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "Salvando modificaГУes Ю mensagem..."
+
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
+#, fuzzy
+msgid "This message is not currently available"
+msgstr ""
+"Esta mensagem nЦo possui um assunto.\n"
+"Enviar mesmo assim?"
+
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Salvando mensagens"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "NЦo foi possМvel localizar corpo da mensagem na resposta FETCH."
 
-#: camel/providers/imap/camel-imap-provider.c:39
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, fuzzy, c-format
+msgid "Could not open cache directory: %s"
+msgstr "NЦo foi possМvel criar o diretСrio %s: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
+#, fuzzy
+msgid "Checking for new mail"
+msgstr "Criar um novo correio eletrТnico"
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Check for new messages in all folders"
+msgstr "Copiar mensagem para uma nova pasta"
+
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
+msgid "Folders"
+msgstr "Pastas"
+
+#: camel/providers/imap/camel-imap-provider.c:50
+#, fuzzy
+msgid "Show only subscribed folders"
+msgstr "Assinar a pasta \"%s\""
+
+#: camel/providers/imap/camel-imap-provider.c:52
+msgid "Override server-supplied folder namespace"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:54
+#, fuzzy
+msgid "Namespace"
+msgstr "EspaГo de nomes:"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Apply filters to new messages in INBOX on this server"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAPv4"
 msgstr "IMAPv4"
 
-#: camel/providers/imap/camel-imap-provider.c:41
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para ler e armazenar correio em servidores IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:251
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Esta opГЦo conectarА ao servidor IMAP usando uma senha em texto claro."
 
-#: camel/providers/imap/camel-imap-store.c:260
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
+#: camel/providers/imap/camel-imap-store.c:463
+#, fuzzy, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
+msgstr ""
+"NЦo И possМvel conectar ao servidor POP.\n"
+"NЦo existe suporte para o mecanismo de autenticaГЦo pedido."
 
-#: camel/providers/imap/camel-imap-store.c:262
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
-msgstr "Esta opГЦo conectarА ao servidor IMAP usando autenticaГЦo Kerberos 4."
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
+#, fuzzy, c-format
+msgid "No support for authentication type %s"
+msgstr "NЦo И necessАria autenticaГЦo"
 
-#: camel/providers/imap/camel-imap-store.c:361
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPor favor entre a senha IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:389
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
+msgid "You didn't enter a password."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3603,97 +4739,109 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:645
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "NЦo foi possМvel criar o diretСrio %s: %s"
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
+#, fuzzy, c-format
+msgid "No such folder %s"
+msgstr "NЦo existe a pasta `%s'."
+
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:36
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "DiretСrios de correio no formato MH"
 
-#: camel/providers/local/camel-local-provider.c:37
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr "Para armazenar correio local em diretСrios de correio do tipo MH"
 
-#: camel/providers/local/camel-local-provider.c:47
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr "Arquivo mbox padrЦo do Unix"
 
-#: camel/providers/local/camel-local-provider.c:48
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr "Para armazenar correio local no formato padrЦo mbox"
 
-#: camel/providers/local/camel-local-provider.c:58
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr "Arquivos de correio no formato qmail maildir"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr "Para armazenar correio local em diretСrios no formato qmail maildir"
 
-#: camel/providers/local/camel-local-store.c:122
+#: camel/providers/local/camel-local-provider.c:70
+#, fuzzy
+msgid "Unix mbox spool-format mail files"
+msgstr "Arquivos de correio no formato qmail maildir"
+
+#: camel/providers/local/camel-local-provider.c:71
+#, fuzzy
+msgid "For storing local mail in standard Unix spool directories"
+msgstr "Para armazenar correio local em diretСrios no formato qmail maildir"
+
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Raiz de armazenagem %s nЦo И um caminho absoluto"
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-store.c:134
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Raiz de armazenagem %s nЦo И um diretСrio comum"
 
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "NЦo И possМvel obter pasta: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
+#: camel/providers/local/camel-local-store.c:173
+#, fuzzy
+msgid "Local stores do not have an inbox"
 msgstr "RepositСrios locais nЦo possuem uma pasta raiz"
 
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr "RepositСrios locais nЦo possuem uma pasta padrЦo"
-
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr "Pastas locais nЦo podem ser aninhadas."
-
-#: camel/providers/local/camel-local-store.c:200
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr "Arquivo de correio local %s"
 
-#: camel/providers/local/camel-local-store.c:256
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "NЦo foi possМvel renomear pasta %s para %s: %s"
 
-#: camel/providers/local/camel-local-store.c:297
+#: camel/providers/local/camel-local-store.c:279
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "NЦo foi possМvel excluir arquivo de resumo de pasta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:306
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "NЦo foi possМvel excluir arquivo de Мndice de pasta `%s': %s"
 
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
+msgid "Unable to add message to summary: unknown reason"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "NЦo И possМvel acrescentar mensagem Ю pasta maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3702,19 +4850,20 @@ msgstr ""
 "NЦo И possМvel obter mensagem: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "NЦo existe tal mensagem"
 
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr "ConteЗdo de mensagem invАlido"
 
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
+#: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -3723,15 +4872,15 @@ msgstr ""
 "NЦo foi possМvel abrir pasta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Pasta `%s' nЦo existe."
 
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-maildir-store.c:114
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -3740,35 +4889,58 @@ msgstr ""
 "NЦo foi possМvel criar pasta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:128
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' nЦo И um diretСrio maildir."
 
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
+#: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "NЦo foi possМvel excluir a pasta `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:158
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "nЦo И um diretСrio maildir"
 
-#: camel/providers/local/camel-mbox-folder.c:201
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"NЦo foi possМvel criar pasta `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
+#, fuzzy, c-format
+msgid "Cannot open maildir directory path: %s: %s"
+msgstr "NЦo И possМvel abrir mbox: %s: %s\n"
+
+#: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
+#, fuzzy, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "NЦo И possМvel obter pasta: %s: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "NЦo И possМvel abrir mbox: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:257
+#: camel/providers/local/camel-mbox-folder.c:259
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "NЦo И possМvel acrescentar mensagem ao arquivo mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3777,15 +4949,17 @@ msgstr ""
 "NЦo И possМvel obter mensagem: %s da pasta %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "A pasta aparenta estar corrompida de modo irrecuperАvel."
 
-#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Falha ao construir a mensagem: mbox corrompida?"
 
-#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -3794,7 +4968,7 @@ msgstr ""
 "NЦo foi possМvel abrir arquivo `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:117
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -3803,14 +4977,14 @@ msgstr ""
 "NЦo foi possМvel criar arquivo `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' nЦo И um arquivo comum."
 
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -3819,175 +4993,300 @@ msgstr ""
 "NЦo foi possМvel excluir pasta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Pasta `%s' nЦo estА vazia. Ela nЦo foi excluМda."
 
-#: camel/providers/local/camel-mbox-summary.c:240
+#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
+#. it should try and merge the summary info's.  This is a bit tricky.
+#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
+#, fuzzy
+msgid "Summarising folder"
+msgstr "Sincronizando pasta"
+
+#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "NЦo foi possМvel abrir pasta: %s: resumindo da posiГЦo %ld: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:274
+#: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Erro fatal do analisador de correio prСximo Ю posiГЦo %ld na pasta %s"
 
-#: camel/providers/local/camel-mbox-summary.c:349
+#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "NЦo И possМvel resumir a pasta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:483
-#: camel/providers/local/camel-mbox-summary.c:674
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
+msgid "Synchronising folder"
+msgstr "Sincronizando pasta"
+
+#: camel/providers/local/camel-mbox-summary.c:507
+#: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "NЦo foi possМvel abrir pasta para resumir: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:499
+#: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "NЦo И possМvel abrir mbox temporАrio: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:528
-#: camel/providers/local/camel-mbox-summary.c:707
-#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:557
+#: camel/providers/local/camel-mbox-summary.c:746
+#: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "O resumo e a pasta nЦo coincidem, mesmo apСs uma sincronizaГЦo"
 
-#: camel/providers/local/camel-mbox-summary.c:571
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Erro ao escrever para o mbox temporАrio: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Falha ao escrever para o mbox temporАrio: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:606
-#: camel/providers/local/camel-mbox-summary.c:765
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "NЦo foi possМvel fechar pasta fonte %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:615
+#: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "NЦo foi possМvel fechar pasta temporАria: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:626
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "NЦo foi possМvel renomear pasta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:836
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro desconhecido: %s"
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "NЦo И possМvel acrescentar mensagem a pasta MH: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:116
+#: camel/providers/local/camel-mh-store.c:110
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' nЦo И um diretСrio."
 
-#: camel/providers/nntp/camel-nntp-auth.c:41
+#: camel/providers/local/camel-mh-summary.c:218
+#, fuzzy, c-format
+msgid "Cannot open MH directory path: %s: %s"
+msgstr "NЦo И possМvel abrir mbox: %s: %s\n"
+
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "NЦo И possМvel acrescentar mensagem ao arquivo mbox: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "`%s' nЦo И um arquivo comum."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "Pasta `%s' nЦo existe."
+
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy
+msgid "Spool stores do not have an inbox"
+msgstr "RepositСrios locais nЦo possuem uma pasta raiz"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Arquivo de correio local %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+#, fuzzy
+msgid "Spool folders cannot be renamed"
+msgstr "Pastas locais nЦo podem ser aninhadas."
+
+#: camel/providers/local/camel-spool-store.c:230
+#, fuzzy
+msgid "Spool folders cannot be deleted"
+msgstr "Pastas locais nЦo podem ser aninhadas."
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "NЦo foi possМvel abrir arquivo de correio temporАrio %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "NЦo foi possМvel fechar pasta fonte %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Por favor entre a senha NNTP para %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:62
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "O servidor rejeitou o nome do usuАrio"
 
-#: camel/providers/nntp/camel-nntp-auth.c:68
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "Falha ao enviar nome do usuАrio ao servidor"
 
-#: camel/providers/nntp/camel-nntp-auth.c:77
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "Servidor rejeitou nome do usuАrio/senha"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "Mensagem %s nЦo encontrada."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "NЦo foi possМvel obter a lista de grupos do servidor."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "NЦo И possМvel carregar o arquivo de lista de grupos para %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "NЦo И possМvel salvar o arquivo de lista de grupos para %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:38
+#: camel/providers/nntp/camel-nntp-provider.c:42
 msgid "USENET news"
 msgstr "NotМcias USENET"
 
-#: camel/providers/nntp/camel-nntp-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:44
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "Este И um provedor para ler e publicar em grupos de notМcias da USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:226
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "NЦo foi possМvel abrir diretСrio para servidor de notМcias: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:288
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "NotМcias USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:295
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 "Esta opГЦo autenticarА com o servidor NNTP usando uma senha em texto claro."
 
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "NЦo И possМvel abrir ou criar o arquivo .newsrc para %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:180
+#: camel/providers/pop3/camel-pop3-folder.c:149
+#, fuzzy
+msgid "Retrieving POP summary"
+msgstr "Recuperando mensagens"
+
+#: camel/providers/pop3/camel-pop3-folder.c:155
+#, fuzzy, c-format
+msgid "Could not check POP server for new messages: %s"
+msgstr "NЦo foi possМvel conectar ao servidor POP em %s."
+
+#: camel/providers/pop3/camel-pop3-folder.c:199
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 "NЦo foi possМvel abrir pasta: a listagem das mensagens estava incompleta."
 
-#: camel/providers/pop3/camel-pop3-folder.c:274
+#: camel/providers/pop3/camel-pop3-folder.c:292
 #, c-format
 msgid "No message with uid %s"
 msgstr "NЦo existe mensagem com uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:288
+#: camel/providers/pop3/camel-pop3-folder.c:296
+#, fuzzy, c-format
+msgid "Retrieving POP message %d"
+msgstr "Recuperando mensagem %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:303
+#, fuzzy, c-format
+msgid "Could not fetch message: %s"
+msgstr "NЦo foi possМvel enviar a mensagem: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:320
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "NЦo foi possМvel recuperar mensagem do servidor POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-provider.c:34
+#: camel/providers/pop3/camel-pop3-provider.c:37
+#, fuzzy
+msgid "Message storage"
+msgstr "CabeГalho da mensagem"
+
+#: camel/providers/pop3/camel-pop3-provider.c:39
+#, fuzzy
+msgid "Leave messages on server"
+msgstr "Manter correio no servidor"
+
+#: camel/providers/pop3/camel-pop3-provider.c:41
+#, fuzzy, c-format
+msgid "Delete after %s day(s)"
+msgstr "Exclui a tarefa"
+
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:36
+#: camel/providers/pop3/camel-pop3-provider.c:50
 msgid ""
 "For connecting to POP servers. The POP protocol can also be used to retrieve "
 "mail from certain web mail providers and proprietary email systems."
@@ -3996,7 +5295,7 @@ msgstr ""
 "recuperar correio a partir de certos provedores de correio web e sistemas de "
 "correio proprietАrios."
 
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4004,7 +5303,7 @@ msgstr ""
 "Esta opГЦo conectarА ao servidor POP usando uma senha em texto claro. Esta И "
 "a Зnica opГЦo suportada por vАrios servidores POP."
 
-#: camel/providers/pop3/camel-pop3-store.c:158
+#: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -4014,28 +5313,33 @@ msgstr ""
 "protocolo APOP. Isto pode nЦo funcionar para todos os usuАrios mesmo em "
 "servidores que alegam suportar o protocolo."
 
-#: camel/providers/pop3/camel-pop3-store.c:170
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Esta opГЦo conectarА ao servidor POP usando Kerberos 4 para autenticaГЦo."
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "NЦo foi possМvel autenticar o servidor KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:215
+#, fuzzy, c-format
+msgid "Could not connect to server: %s"
+msgstr "NЦo foi possМvel conectar ao servidor POP em %s."
+
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "NЦo foi possМvel conectar ao servidor POP em %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:375
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sPor favor entre a senha POP3 para %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:394
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4044,12 +5348,12 @@ msgstr ""
 "NЦo И possМvel conectar ao servidor POP.\n"
 "Erro ao enviar nome do usuАrio: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:397
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr "(Desconhecido)"
 
-#: camel/providers/pop3/camel-pop3-store.c:424
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4057,7 +5361,7 @@ msgstr ""
 "NЦo И possМvel conectar ao servidor POP.\n"
 "NЦo existe suporte para o mecanismo de autenticaГЦo pedido."
 
-#: camel/providers/pop3/camel-pop3-store.c:432
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4066,17 +5370,17 @@ msgstr ""
 "NЦo И possМvel conectar ao servidor POP.\n"
 "Erro ao enviar senha: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:541
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr "NЦo existe a pasta `%s'."
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:59
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: camel/providers/sendmail/camel-sendmail-provider.c:39
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -4084,378 +5388,428 @@ msgstr ""
 "Para entregar correio passando-o para o programa \"sendmail\" no sistema "
 "local."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#: camel/providers/sendmail/camel-sendmail-transport.c:107
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "NЦo foi possМvel criar pipe para o sendmail: %s: a mensagem nЦo foi enviada"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#: camel/providers/sendmail/camel-sendmail-transport.c:124
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 "NЦo foi possМvel executar fork para o sendmail: %s: a mensagem nЦo foi "
 "enviada"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#: camel/providers/sendmail/camel-sendmail-transport.c:150
 #, c-format
 msgid "Could not send message: %s"
 msgstr "NЦo foi possМvel enviar a mensagem: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#: camel/providers/sendmail/camel-sendmail-transport.c:163
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail terminou com sinal %s: a mensagem nЦo foi enviada."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#: camel/providers/sendmail/camel-sendmail-transport.c:170
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "NЦo foi possМvel executar %s: a mensagem nЦo foi enviada"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#: camel/providers/sendmail/camel-sendmail-transport.c:175
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail terminou com estado %d: a mensagem nЦo foi enviada."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
+#: camel/providers/sendmail/camel-sendmail-transport.c:194
+#, fuzzy
+msgid "Could not find 'From' address in message"
+msgstr "NЦo foi possМvel localizar corpo da mensagem na resposta FETCH."
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
+#: camel/providers/sendmail/camel-sendmail-transport.c:249
 msgid "Mail delivery via the sendmail program"
 msgstr "Entrega de correio usando o programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:54
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:36
+#: camel/providers/smtp/camel-smtp-provider.c:40
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Para entregar correio conectando Ю um servidor remoto usando SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:141
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "Erro de sintaxe, comando nЦo reconhecido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:143
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "Erro de sintaxe nos parБmetros ou argumentos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:145
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Comando nЦo implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:147
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "ParБmetro de comando nЦo implementado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr "Estado do sistema ou resposta de ajuda do sistema"
 
-#: camel/providers/smtp/camel-smtp-transport.c:151
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "Mensagem de ajuda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:153
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "ServiГo pronto"
 
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr "ServiГo fechando canal de transmissЦo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr "ServiГo indisponМvel, fechando canal de transmissЦo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:159
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr "AГЦo de correio pedida OK, terminada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr "O usuАrio nЦo И local; irei encaminhar para <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "AГЦo de correio pedida nЦo executada: caixa postal indisponМvel"
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "AГЦo pedida nЦo executada: caixa postal indisponМvel"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr "AГЦo pedida abortada: erro no processamento"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr "O usuАrio nЦo И local; por favor tente <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr "AГЦo pedida nЦo executada: espaГo no sistema insuficiente"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "AГЦo de correio pedida abortada: espaГo alocado excedido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "AГЦo pedida nЦo executada: nome da caixa postal nЦo permitido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Inicie entrada da mensagem; termine com <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "A transaГЦo falhou"
 
-#: camel/providers/smtp/camel-smtp-transport.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:212
+#, fuzzy
+msgid "A password transition is needed"
+msgstr "NЦo foi fornecida uma senha."
+
+#: camel/providers/smtp/camel-smtp-transport.c:214
+msgid "Authentication mechanism is too weak"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:216
+#, fuzzy
+msgid "Encryption required for requested authentication mechanism"
+msgstr ""
+"NЦo И possМvel conectar ao servidor POP.\n"
+"NЦo existe suporte para o mecanismo de autenticaГЦo pedido."
+
+#: camel/providers/smtp/camel-smtp-transport.c:218
+#, fuzzy
+msgid "Temporary authentication failure"
+msgstr "NЦo И necessАria autenticaГЦo"
+
+#: camel/providers/smtp/camel-smtp-transport.c:220
+#, fuzzy
+msgid "Authentication required"
+msgstr "NЦo И necessАria autenticaГЦo"
+
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Erro na resposta de boas-vindas: %s: possivelmente nЦo-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-msgid "No authentication required"
-msgstr "NЦo И necessАria autenticaГЦo"
-
-#: camel/providers/smtp/camel-smtp-transport.c:339
-msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
-"Esta opГЦo conectarА ao servidor SMTP sem usar qualquer tipo de "
-"autenticaГЦo. Isto deve ser adequado para conectar Ю maioria dos servidores "
-"SMTP."
+"NЦo И possМvel conectar ao servidor POP.\n"
+"NЦo existe suporte para o mecanismo de autenticaГЦo pedido."
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
-#: camel/providers/smtp/camel-smtp-transport.c:353 mail/mail-config.glade.h:10
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
+#: camel/providers/smtp/camel-smtp-transport.c:397
+#, fuzzy, c-format
+msgid "%sPlease enter the SMTP password for %s@%s"
+msgstr "%sPor favor entre a senha IMAP para %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:420
+#, fuzzy, c-format
 msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr "Esta opГЦo conectarА ao servidor SMTP usando autenticaГЦo CRAM-MD5."
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"NЦo И possМvel autenticar com o servidor IMAP.\n"
+"%s\n"
+"\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Entrega de correio SMTP via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:405
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 "NЦo И possМvel enviar mensagem: endereГo do remetente nЦo foi definido."
 
-#: camel/providers/smtp/camel-smtp-transport.c:412
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr "NЦo И possМvel enviar mensagem: endereГo do remetente nЦo И vАlido."
 
-#: camel/providers/smtp/camel-smtp-transport.c:426
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "Enviando mensagem"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "NЦo И possМvel enviar mensagem: nЦo foram definido destinatАrios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Tempo excedido no pedido HELO: %s: nЦo-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:539
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Erro na resposta de HELO: %s: nЦo-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:578
+#: camel/providers/smtp/camel-smtp-transport.c:744
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "AutenticaГЦo"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
+#, fuzzy, c-format
+msgid "AUTH request timed out: %s"
+msgstr "Tempo excedido no pedido RSET: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:782
+msgid "AUTH request failed."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
+#, fuzzy
+msgid "Bad authentication response from server.\n"
+msgstr "Resposta de autenticaГЦo invАlida do servidor."
+
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Tempo excedido no pedido MAIL FROM: %s: a mensagem nЦo foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:597
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Erro na resposta de MAIL FROM: %s: a mensagem nЦo foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Tempo excedido no pedido RCPT TO: %s: a mensagem nЦo foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:641
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Erro na resposta de RCPT TO: %s: a mensagem nЦo foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:672
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Tempo excedido no pedido DATA: %s: a mensagem nЦo foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Erro na resposta de DATA: %s: a mensagem nЦo foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
-#: camel/providers/smtp/camel-smtp-transport.c:724
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Tempo excedido no envio de DATA: terminaГЦo de mensagem: %s: a mensagem nЦo "
 "foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:743
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 "Erro na resposta de DATA: terminaГЦo de mensagem: %s: a mensagem nЦo foi "
 "enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:767
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tempo excedido no pedido RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:786
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Erro na resposta de RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:809
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Tempo excedido no pedido QUIT: %s: nЦo-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:828
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Erro na resposta de QUIT: %s: nЦo-fatal"
 
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr "Provedor de correio em pastas virtuais"
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr "Para ler correio como uma consulta a um outro conjunto de pastas"
-
-#: composer/e-msg-composer-attachment-bar.c:87
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:96
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:100
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:154
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Anexar um arquivo"
-
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Remover"
-
-#: composer/e-msg-composer-attachment-bar.c:461
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "Remover itens selecionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Incluir anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "Anexar um arquivo Ю mensagem"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1109
-msgid "Attachment"
-msgstr "Anexo"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "Propriedades do anexo"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Nome do arquivo:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "Anexo embutido"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "Tipo MIME:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Enviar como:"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:328
+msgid "Click here for the address book"
+msgstr "Clique aqui para o catАlogo de endereГos"
 
-#: composer/e-msg-composer-hdrs.c:149 composer/e-msg-composer-hdrs.c:353
-#: mail/mail-format.c:626
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "De:"
 
-#: composer/e-msg-composer-hdrs.c:297
-msgid "Click here for the address book"
-msgstr "Clique aqui para o catАlogo de endereГos"
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:365
+msgid "Reply-To:"
+msgstr "Responder-a:"
 
-#: composer/e-msg-composer-hdrs.c:354
-msgid "Enter the identity you wish to send this message from"
-msgstr "Entre a identidade com a qual vocЙ deseja enviar esta mensagem"
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:376
+msgid "Subject:"
+msgstr "Assunto:"
 
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:359
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "Entre os destinatАrios da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:363 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Entre os endereГos que receberЦo uma cСpia da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:370
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4463,55 +5817,102 @@ msgstr ""
 "Entre os endereГos que receberЦo uma cСpia da mensagem sem aparecer na lista "
 "de destinatАrios da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:634
-msgid "Subject:"
-msgstr "Assunto:"
-
-#: composer/e-msg-composer-hdrs.c:377
-msgid "Enter the subject of the mail"
-msgstr "Entre o assunto da correspondЙncia"
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Anexar um arquivo"
 
-#: composer/e-msg-composer.c:497
+#: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
 "%s"
 msgstr ""
-"NЦo foi possМvel abrir arquivo de assinatura %s:\n"
+"NЦo foi possМvel abrir arquivo %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:665
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr ""
+"Erro ao preparar para %s:\n"
+"%s"
+
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Salvar como..."
 
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "Trabalhando"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro ao salvar arquivo: %s"
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao carregar arquivo: %s"
 
-#: composer/e-msg-composer.c:718
-msgid "Saving changes to message..."
-msgstr "Salvando modificaГУes Ю mensagem..."
+#: composer/e-msg-composer.c:997
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
 
-#: composer/e-msg-composer.c:720
-msgid "Save changes to message..."
-msgstr "Salvar modificaГУes Ю mensagem..."
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Erro ao salvar arquivo: %s"
 
-#: composer/e-msg-composer.c:761
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr "Erro ao salvar mensagem para 'Drafts': %s"
+#: composer/e-msg-composer.c:1055
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "NЦo foi possМvel recuperar mensagem do servidor POP %s: %s"
 
-#: composer/e-msg-composer.c:819 shell/e-shell-view-menu.c:183
-msgid "Evolution"
-msgstr "Evolution"
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"NЦo И possМvel criar arquivo de saМda: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"NЦo И possМvel criar arquivo de saМda: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"Erro ao salvar mensagens para: %s:\n"
+" %s"
 
-#: composer/e-msg-composer.c:825
+#: composer/e-msg-composer.c:1173
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4521,111 +5922,173 @@ msgstr ""
 "\n"
 "VocЙ deseja salvar as suas modificaГУes?"
 
-#: composer/e-msg-composer.c:850
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Abrir arquivo"
 
-#: composer/e-msg-composer.c:976
-msgid "That file does not exist."
-msgstr "Este arquivo nЦo existe."
-
-#: composer/e-msg-composer.c:986
-msgid "That is not a regular file."
-msgstr "Este nЦo И um arquivo comum."
-
-#: composer/e-msg-composer.c:996
-msgid "That file exists but is not readable."
-msgstr "Este arquivo existe mas nЦo И legМvel."
-
-#: composer/e-msg-composer.c:1006
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Este arquivo aparenta ser acessМvel mas open(2) falhou."
-
-#: composer/e-msg-composer.c:1028
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"O arquivo И muito grande (mais que 100K).\n"
-"VocЙ tem certeza que deseja inserМ-lo?"
-
-#: composer/e-msg-composer.c:1049
-msgid "An error occurred while reading the file."
-msgstr "Um erro ocorreu ao ler o arquivo."
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "FIXME: Inserir arquivo"
 
-#: composer/e-msg-composer.c:1292 composer/e-msg-composer.c:1527
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Redigir uma mensagem"
 
-#: composer/e-msg-composer.c:1608
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "NЦo foi possМvel criar janela de redaГЦo."
 
-#: composer/evolution-composer.c:360
+#: composer/evolution-composer.c:359
+msgid ""
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
+msgstr ""
+
+#: composer/evolution-composer.c:374
 msgid "Cannot initialize Evolution's composer."
 msgstr "NЦo И possМvel iniciar o redator do Evolution."
 
-#: filter/filter-datespec.c:62
+#: data/evolution.desktop.in.h:2
+msgid "The Evolution groupware suite"
+msgstr "SuМte do grupo Evolution"
+
+#: data/evolution.keys.in.h:1
+#, fuzzy
+msgid "address card"
+msgstr "EndereГo _2:"
+
+#: data/evolution.keys.in.h:2
+#, fuzzy
+msgid "calendar information"
+msgstr "InformaГЦo do usuАrio"
+
+#. strptime format for a date.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1480
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#. strptime format for a time of day, in 12-hour format.
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+#, fuzzy
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p%n"
+
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+#, fuzzy
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S%n"
+
+#. strptime format for time of day, without seconds, 12-hour format.
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
+
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %d/%m/%Y"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
+
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:298
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:303
+#, fuzzy
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:312
+#, fuzzy
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "ano"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "anos"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "mЙs"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "meses"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "semana"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "semanas"
 
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr "dias"
-
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "hora"
 
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr "horas"
-
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "minuto"
 
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "minutos"
-
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "segundo"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "segundos"
 
-#: filter/filter-datespec.c:183
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Oops. VocЙ esqueceu de escolher uma data."
 
-#: filter/filter-datespec.c:185
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Oops. VocЙ escolheu uma data invАlida."
 
-#: filter/filter-datespec.c:259
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -4635,7 +6098,7 @@ msgstr ""
 "ao instante quando o filtro И executado ou\n"
 "a pasta virtual И aberta."
 
-#: filter/filter-datespec.c:282
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -4643,7 +6106,7 @@ msgstr ""
 "A data da mensagem serА comparada em relaГЦo\n"
 "ao instante que vocЙ especificou aqui."
 
-#: filter/filter-datespec.c:322
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -4654,67 +6117,53 @@ msgstr ""
 "\"uma semana atrАs\", por exemplo."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "o instante atual"
 
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "um instante especificado"
 
-#: filter/filter-datespec.c:358
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "um instante relativo ao instante atual"
 
 #. The label
-#: filter/filter-datespec.c:416
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Comparar em relaГЦo a"
 
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "agora"
 
-#: filter/filter-datespec.c:690
-msgid "<click here to select a date>"
-msgstr "<clique aqui para selecionar uma data>"
-
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-msgid "Add Filter Rule"
-msgstr "Incluir regra de filtro"
-
-#: filter/filter-editor.c:233
-msgid "Edit Filter Rule"
-msgstr "Editar regra de filtro"
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
 
-#: filter/filter-editor.c:433
-msgid "incoming"
-msgstr "de entrada"
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
 
-#. "demand",
-#: filter/filter-editor.c:435
-msgid "outgoing"
-msgstr "de saМda"
+#: filter/filter-datespec.c:709
+msgid "<click here to select a date>"
+msgstr "<clique aqui para selecionar uma data>"
 
-#: filter/filter-editor.c:456 filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Editar filtros"
+#: filter/filter-editor.c:132 filter/filter.glade.h:6
+msgid "Filter Rules"
+msgstr "Regras de filtro"
 
 #. and now for the action area
-#: filter/filter-filter.c:403
+#: filter/filter-filter.c:452
 msgid "Then"
 msgstr "EntЦo"
 
-#: filter/filter-filter.c:416
+#: filter/filter-filter.c:466
 msgid "Add action"
 msgstr "Incluir aГЦo"
 
-#: filter/filter-filter.c:422
-msgid "Remove action"
-msgstr "Excluir aГЦo"
-
-#: filter/filter-folder.c:143
+#: filter/filter-folder.c:147
 msgid ""
 "Oops, you forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -4722,19 +6171,20 @@ msgstr ""
 "Oops, vocЙ esqueceu de escolher uma pasta.\n"
 "Por favor volte e especifique uma pasta vАlida para onde entregar correio."
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Selecionar pasta"
 
-#: filter/filter-folder.c:243
+#: filter/filter-folder.c:250
 msgid "Enter folder URI"
 msgstr "Entre URI da pasta"
 
-#: filter/filter-folder.c:289
+#: filter/filter-folder.c:296
 msgid "<click here to select a folder>"
 msgstr "<clique aqui para selecionar uma pasta>"
 
-#: filter/filter-input.c:185
+#: filter/filter-input.c:193
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -4743,64 +6193,65 @@ msgstr ""
 "Erro na expressЦo regular '%s':\n"
 "%s"
 
-#: filter/filter-part.c:467
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr "Teste"
 
-#: filter/filter-rule.c:530
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr "Nome da regra: "
 
-#: filter/filter-rule.c:534
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr "Sem tМtulo"
 
-#: filter/filter-rule.c:550
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:567
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Executar aГУes"
 
-#: filter/filter-rule.c:571
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "se todos os critИrios forem atendidos"
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "se algum critИrio for atendido"
 
-#: filter/filter-rule.c:587
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "Adicionar critИrio"
 
-#: filter/filter-rule.c:593
-msgid "Remove criterion"
-msgstr "Remover critИrio"
+#: filter/filter-rule.c:771
+msgid "incoming"
+msgstr "de entrada"
 
-#: filter/filter-system-flag.c:63
-msgid "Replied to"
-msgstr "Em resposta a"
+#: filter/filter-rule.c:771
+msgid "outgoing"
+msgstr "de saМda"
 
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
-msgid "Important"
-msgstr "Importante"
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Incluir"
 
-#: filter/filter-system-flag.c:67
-msgid "Read"
-msgstr "Lida"
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Editar"
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Editar filtros"
 
 #: filter/filter.glade.h:5
 msgid "Edit VFolders"
 msgstr "Editar pastas virtuais"
 
-#: filter/filter.glade.h:6
-msgid "Filter Rules"
-msgstr "Regras de filtro"
-
 #: filter/filter.glade.h:7
 msgid "Incoming"
 msgstr "De entrada"
@@ -4809,323 +6260,547 @@ msgstr "De entrada"
 msgid "Outgoing"
 msgstr "De saМda"
 
-#: filter/filter.glade.h:10
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Pastas virtuais"
 
 #: filter/filter.glade.h:11
+#, fuzzy
+msgid "specific folders only"
+msgstr "A pasta especificada nЦo foi achada"
+
+#: filter/filter.glade.h:12
 msgid "vFolder Sources"
 msgstr "Fontes de pastas virtuais"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
-msgstr "Atribuir cor"
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:15
+#, fuzzy
+msgid "with all local folders"
+msgstr "Registrar pasta local"
 
 #: filter/libfilter-i18n.h:3
-msgid "Assign Score"
-msgstr "Atribuir pontuaГЦo"
+#, fuzzy
+msgid "Assign Color"
+msgstr "Atribuir cor"
 
 #: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr "Copiar para pasta"
+msgid "Assign Score"
+msgstr "Atribuir pontuaГЦo"
 
 #: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr "Data de recebimento"
+#, fuzzy
+msgid "Attachments"
+msgstr "Anexo"
 
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr "Data de envio"
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "contИm"
 
 #: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "ExpressЦo"
+msgid "Copy to Folder"
+msgstr "Copiar para pasta"
 
 #: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Encaminhar para endereГo"
+msgid "Date received"
+msgstr "Data de recebimento"
 
 #: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Corpo da mensagem"
-
-#: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr "CabeГalho da mensagem"
+msgid "Date sent"
+msgstr "Data de envio"
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "Mensagem foi recebida"
+#, fuzzy
+msgid "Deleted"
+msgstr "Excluir"
 
 #: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "Mensagem foi enviada"
+msgid "does not contain"
+msgstr "nЦo contИm"
 
 #: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Mover para pasta"
+msgid "does not end with"
+msgstr "nЦo termina com"
 
 #: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr "DestinatАrios"
+msgid "does not exist"
+msgstr "nЦo existe"
 
 #: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr "CorrespondЙncia com expressЦo regular"
+msgid "does not sound like"
+msgstr "nЦo soa como"
 
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1109
-msgid "Score"
-msgstr "PontuaГЦo"
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
+msgstr "nЦo comeГa com"
 
 #: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Remetente"
+#, fuzzy
+msgid "Do Not Exist"
+msgstr "nЦo existe"
 
 #: filter/libfilter-i18n.h:19
-msgid "Set Status"
-msgstr "Atribuir estado"
+#, fuzzy
+msgid "Draft"
+msgstr "Data"
 
 #: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "Fonte"
+msgid "ends with"
+msgstr "termina com"
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr "CabeГalho especМfico"
+#, fuzzy
+msgid "Exist"
+msgstr "Sair"
 
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
-msgid "Status"
-msgstr "Estado"
+#: filter/libfilter-i18n.h:22
+msgid "exists"
+msgstr "existe"
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "Parar o processamento"
+msgid "Expression"
+msgstr "ExpressЦo"
 
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
-msgid "Subject"
-msgstr "Assunto"
+#: filter/libfilter-i18n.h:24
+msgid "Important"
+msgstr "Importante"
 
 #: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "apСs"
+msgid "is"
+msgstr "И"
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "antes"
+msgid "is greater than"
+msgstr "И maior que"
 
 #: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "contИm"
+msgid "is less than"
+msgstr "И menor que"
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "nЦo contИm"
+msgid "is not"
+msgstr "nЦo И"
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "nЦo termina com"
+#, fuzzy
+msgid "Mailing list"
+msgstr "Lista de discussЦo %s"
 
 #: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "nЦo existe"
+msgid "Message Body"
+msgstr "Corpo da mensagem"
 
 #: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr "nЦo soa como"
+msgid "Message Header"
+msgstr "CabeГalho da mensagem"
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "nЦo comeГa com"
+msgid "Message was received"
+msgstr "Mensagem foi recebida"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "termina com"
+msgid "Message was sent"
+msgstr "Mensagem foi enviada"
 
 #: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "existe"
+msgid "Move to Folder"
+msgstr "Mover para pasta"
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "И maior que"
+msgid "on or after"
+msgstr "em ou apСs"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "И menor que"
+msgid "on or before"
+msgstr "em ou antes"
 
 #: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "nЦo И"
+msgid "Read"
+msgstr "Lida"
 
 #: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "И"
+msgid "Recipients"
+msgstr "DestinatАrios"
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr "em ou apСs"
+msgid "Regex Match"
+msgstr "CorrespondЙncia com expressЦo regular"
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr "em ou antes"
+msgid "Replied to"
+msgstr "Em resposta a"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
+msgid "Score"
+msgstr "PontuaГЦo"
+
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
+msgid "Sender"
+msgstr "Remetente"
+
+#: filter/libfilter-i18n.h:43
+msgid "Set Status"
+msgstr "Atribuir estado"
+
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Tamanho"
+
+#: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "soa como"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "Source Account"
+msgstr "Conta"
+
+#: filter/libfilter-i18n.h:47
+msgid "Specific header"
+msgstr "CabeГalho especМfico"
+
+#: filter/libfilter-i18n.h:48
 msgid "starts with"
 msgstr "comeГa com"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:50
+msgid "Stop Processing"
+msgstr "Parar o processamento"
+
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
+msgid "Subject"
+msgstr "Assunto"
+
+#: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "foi apСs"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:53
 msgid "was before"
 msgstr "foi antes"
 
-#: filter/score-editor.c:127
+#: filter/rule-editor.c:147
+#, fuzzy
+msgid "Rules"
+msgstr "Adicionar regra"
+
+#: filter/rule-editor.c:240
 msgid "Add Rule"
 msgstr "Adicionar regra"
 
-#: filter/score-editor.c:166
-msgid "Edit Score Rule"
+#: filter/rule-editor.c:299
+#, fuzzy
+msgid "Edit Rule"
 msgstr "Editar regra de pontuaГЦo"
 
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr "Adicionar regra de pasta virtual"
+#: filter/score-editor.c:130
+#, fuzzy
+msgid "Score Rules"
+msgstr "Editar regra de pontuaГЦo"
 
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr "Editar regra de pasta virtual"
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
 
-#: mail/component-factory.c:294
-msgid "Cannot initialize Evolution's mail component."
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+#, fuzzy
+msgid "Import"
+msgstr "Importante"
+
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+msgid "Mail"
+msgstr "Correio"
+
+#: importers/elm-importer.c:498
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: importers/elm-importer.c:527
+#, fuzzy
+msgid "Elm mail"
+msgstr "E-mail"
+
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "Incluir catАlogo de endereГos"
+
+#: importers/evolution-gnomecard-importer.c:253
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "_ConfiguraГУes"
+
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: importers/pine-importer.c:691
+#, fuzzy
+msgid "Pine mail"
+msgstr "E-mail principal"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Evolution mail composer."
 msgstr "NЦo И possМvel iniciar o componente de correio do Evolution."
 
-#: mail/component-factory.c:320
-msgid "Cannot register storage with shell"
-msgstr "NЦo И possМvel registrar repositСrio com a shell."
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Evolution mail executive summary component."
+msgstr "NЦo И possМvel iniciar o componente Executive Summary do Evolution."
 
-#: mail/folder-browser.c:225
-msgid "Store search as vFolder"
-msgstr "Armazenar busca como pasta virtual"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution composer."
+msgstr "NЦo И possМvel iniciar o redator do Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution mail component."
+msgstr "NЦo И possМvel iniciar o componente de correio do Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "ConfiguraГЦo de correio"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "_Propriedades..."
 
-#: mail/folder-browser.c:239
-msgid "Body or subject contains"
-msgstr "Corpo ou assunto contИm"
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Modificar as propriedades do arquivo"
 
-#: mail/folder-browser.c:240
-msgid "Body contains"
-msgstr "Corpo contИm"
+#: mail/component-factory.c:757
+msgid "Cannot initialize Evolution's mail component."
+msgstr "NЦo И possМvel iniciar o componente de correio do Evolution."
 
-#: mail/folder-browser.c:241
-msgid "Subject contains"
-msgstr "Assunto contИm"
+#: mail/component-factory.c:894
+msgid "Cannot register storage with shell"
+msgstr "NЦo И possМvel registrar repositСrio com a shell."
 
-#: mail/folder-browser.c:242
-msgid "Body does not contain"
-msgstr "Corpo nЦo contИm"
+#: mail/folder-browser-ui.c:254
+#, fuzzy, c-format
+msgid "Properties for \"%s\""
+msgstr "Propriedades"
 
-#: mail/folder-browser.c:243
-msgid "Subject does not contain"
-msgstr "Assunto nЦo contИm"
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr "Propriedades"
 
-#: mail/folder-browser.c:244
-msgid "Sender contains"
-msgstr "Remetente contИm"
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "NЦo foi possМvel criar diretСrio temporАrio: %s"
 
-#: mail/folder-browser.c:656
-msgid "VFolder on Subject"
+#: mail/folder-browser.c:893
+msgid "Store search as vFolder"
+msgstr "Armazenar busca como pasta virtual"
+
+#: mail/folder-browser.c:1238
+#, fuzzy
+msgid "VFolder on _Subject"
 msgstr "Pasta virtual por assunto"
 
-#: mail/folder-browser.c:657
-msgid "VFolder on Sender"
-msgstr "Pasta virtual por remetente"
+#: mail/folder-browser.c:1241
+msgid "VFolder on Se_nder"
+msgstr "Pasta virtual por _remetente"
+
+#: mail/folder-browser.c:1244
+msgid "VFolder on _Recipients"
+msgstr "Pasta virtual por _destinatАrios"
 
-#: mail/folder-browser.c:658
-msgid "VFolder on Recipients"
-msgstr "Pasta virtual por destinatАrios"
+#: mail/folder-browser.c:1247
+#, fuzzy
+msgid "VFolder on Mailing _List"
+msgstr "Filtro por lista de discussЦo"
 
-#: mail/folder-browser.c:660
-msgid "Filter on Subject"
+#: mail/folder-browser.c:1253
+#, fuzzy
+msgid "Filter on Sub_ject"
 msgstr "Filtro por assunto"
 
-#: mail/folder-browser.c:661
-msgid "Filter on Sender"
+#: mail/folder-browser.c:1256
+#, fuzzy
+msgid "Filter on Sen_der"
 msgstr "Filtro por remetente"
 
-#: mail/folder-browser.c:662
-msgid "Filter on Recipients"
+#: mail/folder-browser.c:1259
+#, fuzzy
+msgid "Filter on Re_cipients"
 msgstr "Filtro por destinatАrios"
 
-#: mail/folder-browser.c:663 mail/folder-browser.c:777
-msgid "Filter on Mailing List"
+#: mail/folder-browser.c:1262
+#, fuzzy
+msgid "Filter on _Mailing List"
 msgstr "Filtro por lista de discussЦo"
 
-#: mail/folder-browser.c:669 ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Abrir"
+#: mail/folder-browser.c:1273
+#, fuzzy
+msgid "Resend"
+msgstr "segundo"
 
-#: mail/folder-browser.c:671
-msgid "Save As..."
-msgstr "Salvar como..."
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
+msgid "_Save As..."
+msgstr "Salvar _como..."
 
-#: mail/folder-browser.c:674
-msgid "Reply to Sender"
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+msgid "_Print"
+msgstr "_Imprimir"
+
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#, fuzzy
+msgid "_Reply to Sender"
 msgstr "Responder ao remetente"
 
-#: mail/folder-browser.c:675 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
-msgid "Reply to All"
-msgstr "Responder a todos"
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "Responder a _todos"
 
-#: mail/folder-browser.c:676 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
-msgid "Forward"
-msgstr "Encaminhar"
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+msgid "Reply to _All"
+msgstr "Responder a _todos"
 
-#: mail/folder-browser.c:677 ui/evolution-mail.xml.h:13
-msgid "Forward inline"
-msgstr "Encaminhar embutido"
+#: mail/folder-browser.c:1288
+msgid "_Forward"
+msgstr "_Encaminhar"
 
-#: mail/folder-browser.c:679
-msgid "Mark as Read"
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+#, fuzzy
+msgid "Mar_k as Read"
 msgstr "Marcar como lida"
 
-#: mail/folder-browser.c:680
-msgid "Mark as Unread"
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+#, fuzzy
+msgid "Mark as U_nread"
 msgstr "Marcar como nЦo lida"
 
-#: mail/folder-browser.c:682
-msgid "Move to Folder..."
-msgstr "Mover para pasta..."
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "Importante"
 
-#: mail/folder-browser.c:683
-msgid "Copy to Folder..."
-msgstr "Copiar para pasta..."
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Marcar como nЦo lida"
 
-#: mail/folder-browser.c:685
-msgid "Undelete"
-msgstr "Desfazer exclusЦo"
+#: mail/folder-browser.c:1302
+msgid "_Move to Folder..."
+msgstr "_Mover para pasta..."
+
+#: mail/folder-browser.c:1304
+msgid "_Copy to Folder..."
+msgstr "_Copiar para pasta..."
+
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+msgid "_Undelete"
+msgstr "Des_fazer exclusЦo"
 
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:689
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Incluir catАlogo de endereГos"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Aplicar filtros"
 
-#: mail/folder-browser.c:691
-msgid "Create Rule From Message"
+#: mail/folder-browser.c:1322
+#, fuzzy
+msgid "Create Ru_le From Message"
 msgstr "Criar regra a partir da mensagem"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:1479
+msgid "Filter on Mailing List"
+msgstr "Filtro por lista de discussЦo"
+
+#: mail/folder-browser.c:1480
+#, fuzzy
+msgid "VFolder on Mailing List"
+msgstr "Filtro por lista de discussЦo"
+
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtro por lista de discussЦo (%s)"
 
+#: mail/folder-browser.c:1483
+#, fuzzy, c-format
+msgid "VFolder on Mailing List (%s)"
+msgstr "Filtro por lista de discussЦo (%s)"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+msgid "Factory to import mbox into Evolution"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+msgid "Imports mbox files into Evolution"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+msgid "Imports Outlook Express 4 files into Evolution"
+msgstr ""
+
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Formato do repositСrio corrente:"
@@ -5160,49 +6835,100 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-accounts.c:115
-msgid " (default)"
-msgstr " (padrЦo)"
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+msgid "You have not filled in all of the required information."
+msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:367
-msgid "Evolution Account Manager"
-msgstr "Gerenciador de contas do Evolution"
-
-#: mail/mail-account-editor.c:265
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-"Um ou mais dos seus servidores nЦo estЦo configurados corretamente.\n"
-"VocЙ deseja salvar de qualquer forma?"
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Editor de contas do Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:625
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Editor de contas do Evolution"
 
-#: mail/mail-autofilter.c:71
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "Assinatura:"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Esta mensagem nЦo foi enviada.\n"
+"\n"
+"VocЙ deseja salvar as suas modificaГУes?"
+
+#: mail/mail-accounts.c:135
+msgid " (default)"
+msgstr " (padrЦo)"
+
+#: mail/mail-accounts.c:174
+#, fuzzy
+msgid "Disable"
+msgstr "Desativado"
+
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
+msgid "Enable"
+msgstr ""
+
+#: mail/mail-accounts.c:264
+#, fuzzy
+msgid "Are you sure you want to delete this account?"
+msgstr "VocЙ tem certeza que deseja excluir esta tarefa sem tМtulo?"
+
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Desfazer exclusЦo"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "Torne esta a minha conta padrЦo"
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#, fuzzy
+msgid "Are you sure you want to delete this news account?"
+msgstr "VocЙ tem certeza que deseja excluir este comprimisso sem tМtulo?"
+
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
+msgid "Evolution Account Manager"
+msgstr "Gerenciador de contas do Evolution"
+
+#: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Correio para %s"
 
-#: mail/mail-autofilter.c:214
+#: mail/mail-autofilter.c:213
 #, c-format
 msgid "Subject is %s"
 msgstr "Assunto И %s"
 
-#: mail/mail-autofilter.c:230
+#: mail/mail-autofilter.c:229
 #, c-format
 msgid "Mail from %s"
 msgstr "Correio de %s"
 
-#: mail/mail-autofilter.c:331
+#: mail/mail-autofilter.c:285
 #, c-format
 msgid "%s mailing list"
 msgstr "Lista de discussЦo %s"
 
-#: mail/mail-callbacks.c:82
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+msgid "Add Filter Rule"
+msgstr "Incluir regra de filtro"
+
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5214,7 +6940,7 @@ msgstr ""
 "receber ou redigir mensagens.\n"
 "VocЙ desejaria configurА-lo agora?"
 
-#: mail/mail-callbacks.c:135
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5222,7 +6948,7 @@ msgstr ""
 "VocЙ deve configurar uma identidade\n"
 "antes de poder redigir uma mensagem."
 
-#: mail/mail-callbacks.c:147
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5230,11 +6956,11 @@ msgstr ""
 "VocЙ deve configurar um transporte de correio\n"
 "antes de poder redigir uma mensagem."
 
-#: mail/mail-callbacks.c:191
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr "VocЙ nЦo estabeleceu um mИtodo de transporte de correio"
 
-#: mail/mail-callbacks.c:224
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5242,27 +6968,45 @@ msgstr ""
 "Esta mensagem nЦo possui um assunto.\n"
 "Enviar mesmo assim?"
 
-#: mail/mail-callbacks.c:290
-msgid "You must configure an account before you can send this email."
-msgstr "VocЙ deve configurar uma conta antes de poder enviar esta mensagem."
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
 
-#: mail/mail-callbacks.c:310
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr "VocЙ deve especificar destinatАrios para poder enviar esta mensagem."
 
-#: mail/mail-callbacks.c:535
+#: mail/mail-callbacks.c:410
+msgid "You must configure an account before you can send this email."
+msgstr "VocЙ deve configurar uma conta antes de poder enviar esta mensagem."
+
+#: mail/mail-callbacks.c:653
+#, fuzzy, c-format
+msgid "On %s, %s wrote:"
+msgstr "Em %s, %s escreveu:\n"
+
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Mensagem encaminhada:\n"
 
-#: mail/mail-callbacks.c:618
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "Mover mensagem(ns) para"
 
-#: mail/mail-callbacks.c:620
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Copiar mensagem(ns) para"
 
-#: mail/mail-callbacks.c:755
+#: mail/mail-callbacks.c:1374
+#, fuzzy, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr "VocЙ tem certeza que deseja excluir a tarefa `%s'?"
+
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5270,27 +7014,34 @@ msgstr ""
 "VocЙ pode apenas editar mensagens salvas\n"
 "na pasta Drafts."
 
-#: mail/mail-callbacks.c:788 mail/mail-display.c:78
-msgid "Overwrite file?"
-msgstr "Sobrescrever arquivo?"
-
-#: mail/mail-callbacks.c:792 mail/mail-display.c:82
+#: mail/mail-callbacks.c:1430
+#, fuzzy
 msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
+"You may only resend messages\n"
+"in the Sent folder."
 msgstr ""
-"JА existe um arquivo com este nome.\n"
-"SobrescrevЙ-lo?"
+"VocЙ pode apenas editar mensagens salvas\n"
+"na pasta Drafts."
+
+#: mail/mail-callbacks.c:1442
+#, fuzzy, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "VocЙ tem certeza que deseja excluir a tarefa `%s'?"
 
-#: mail/mail-callbacks.c:836
+#: mail/mail-callbacks.c:1463
+#, fuzzy
+msgid "No Message Selected"
+msgstr "Mensagem foi recebida"
+
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Salvar mensagem como..."
 
-#: mail/mail-callbacks.c:838
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Salvar mensagens como..."
 
-#: mail/mail-callbacks.c:946
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5299,43 +7050,133 @@ msgstr ""
 "Erro ao carregar inforaГЦo do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:995
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "Editar filtros"
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Imprimir mensagem"
 
-#: mail/mail-callbacks.c:1042
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "Falhou a impressЦo da mensagem"
 
+#: mail/mail-callbacks.c:1966
+#, fuzzy, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr "VocЙ tem certeza que deseja excluir esta tarefa sem tМtulo?"
+
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+
+#. set window title
+#: mail/mail-config-druid.c:466
+msgid "Evolution Account Wizard"
+msgstr "Assitente de contas do Evolution"
+
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+#, fuzzy
+msgid "Connecting to server..."
+msgstr "Conectando ao servidor"
+
 #: mail/mail-config.glade.h:1
+msgid " Check for supported types "
+msgstr ""
+
+#: mail/mail-config.glade.h:2
+#, fuzzy
+msgid " color"
+msgstr "Cores"
+
+#: mail/mail-config.glade.h:3
+msgid "(SSL is not supported in this build of evolution)"
+msgstr ""
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Conta"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "InformaГЦo de conta"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "GerЙncia de conta"
 
-#: mail/mail-config.glade.h:4
-msgid "Account Properties"
-msgstr "Propriedades de conta"
+#: mail/mail-config.glade.h:7
+#, fuzzy
+msgid "Accounts"
+msgstr "Conta"
 
-#: mail/mail-config.glade.h:6
-msgid "Advanced"
-msgstr "AvanГado"
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Anexo"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "AutenticaГЦo"
 
-#: mail/mail-config.glade.h:8
-msgid "Authentication Type:"
+#: mail/mail-config.glade.h:14
+#, fuzzy
+msgid "Authentication Type: "
 msgstr "Tipo de autenticaГЦo:"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:15
+msgid "Automatically check for new mail every"
+msgstr ""
+
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "Redigir"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -5351,191 +7192,297 @@ msgstr ""
 "\n"
 "Pressione \"Concluir\" para salvar suas configuraГУes."
 
-#: mail/mail-config.glade.h:17
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: mail/mail-config.glade.h:18
-msgid "Default"
+#: mail/mail-config.glade.h:25
+#, fuzzy
+msgid "De_fault"
 msgstr "PadrЦo"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Terminado"
 
-#: mail/mail-config.glade.h:21
-msgid "E-Mail Address:"
-msgstr "EndereГo eletrТnico:"
+#: mail/mail-config.glade.h:32
+#, fuzzy
+msgid "Drafts"
+msgstr "Dias"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:33
+#, fuzzy
+msgid "Drafts folder:"
+msgstr "Criando nova pasta"
+
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "Editar"
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "EndereГo eletrТnico:"
 
-#: mail/mail-config.glade.h:24
-msgid "Evolution Mail Configuration"
-msgstr "ConfiguraГЦo de correio do Evolution"
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "Desativado"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Nome completo:"
 
-#: mail/mail-config.glade.h:28
-msgid "Hostname:"
-msgstr "Nome da mАquina:"
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
+msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "Assinatura:"
+
+#: mail/mail-config.glade.h:43
+msgid "Highlight citations with"
+msgstr ""
+
+#: mail/mail-config.glade.h:45
+#, fuzzy
+msgid "IMAPv4 "
+msgstr "IMAPv4"
+
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Identidade"
 
-#: mail/mail-config.glade.h:30
-msgid "Incoming Mail Server"
-msgstr "Servidor de correio de entrada"
-
-#: mail/mail-config.glade.h:31
-msgid "Keep mail on server"
-msgstr "Manter correio no servidor"
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
 
-#: mail/mail-config.glade.h:32
-msgid "Kerberos"
-msgstr "Kerberos"
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Inline"
+msgstr "Visualizar embutido"
 
-#: mail/mail-config.glade.h:33
-msgid "Mail"
-msgstr "Correio"
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Kerberos "
+msgstr "Kerberos 4"
 
-#: mail/mail-config.glade.h:34
-msgid "Mail Account"
-msgstr "Conta de correio"
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "ConfiguraГЦo de correio"
 
-#: mail/mail-config.glade.h:36
-msgid "Mail Configuration Druid"
-msgstr "Assitente de configuraГЦo de correio"
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Formato da caixa de correio"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "Torne esta a minha conta padrЦo"
 
-#: mail/mail-config.glade.h:38
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "Marcar mensagens como \"Lida\" apСs:"
 
-#: mail/mail-config.glade.h:39
-msgid "Miscellaneous"
-msgstr "Diversos"
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "Servidor LDAP"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "NotМcias"
 
-#: mail/mail-config.glade.h:43
-msgid "Optional"
-msgstr "Opcional"
+#: mail/mail-config.glade.h:62
+#, fuzzy
+msgid "Optional Information"
+msgstr "Sem informaГЦo"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Empresa:"
 
-#: mail/mail-config.glade.h:46
-msgid "Outgoing Mail Server"
-msgstr "Servidor de correio de saМda"
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
 
-#: mail/mail-config.glade.h:47
-msgid "Password:"
-msgstr "Senha:"
+#: mail/mail-config.glade.h:66
+#, fuzzy
+msgid "PGP binary path:"
+msgstr "Cifrar com PGP"
 
-#: mail/mail-config.glade.h:49
-msgid "Plain Text"
-msgstr "Texto claro"
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "Escolha uma cor"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Prompt when sending messages with an empty subject"
+msgstr "Concatenando uma mensagem sem um assunto"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "NЦo И possМvel enviar mensagem: nЦo foram definido destinatАrios."
+
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Qmail maildir "
+msgstr "maildir"
+
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "Nota"
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "Recebendo mensagem"
 
-#: mail/mail-config.glade.h:51
-msgid "Remember my password"
-msgstr "Lembre a minha senha"
+#: mail/mail-config.glade.h:77
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "Recebendo mensagem"
 
-#: mail/mail-config.glade.h:52 mail/mail-format.c:628
-msgid "Reply-To:"
-msgstr "Responder-a:"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Receiving Options"
+msgstr "Recebendo mensagem"
 
-#: mail/mail-config.glade.h:53
-msgid "Required"
-msgstr "Exigido"
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
 
-#: mail/mail-config.glade.h:55
-msgid "Save password"
-msgstr "Salvar senha"
+#: mail/mail-config.glade.h:81
+#, fuzzy
+msgid "Required Information"
+msgstr "InformaГЦo do usuАrio"
 
-#: mail/mail-config.glade.h:56
-msgid "Select signature file"
-msgstr "Selecionar arquivo de assinatura"
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Security"
+msgstr "_SeguranГa"
+
+#: mail/mail-config.glade.h:85
+msgid "Select PGP binary"
+msgstr ""
+
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "Enviar mensagens em formato HTML como padrЦo."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "Enviando mensagem"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:88
+#, fuzzy
+msgid "Sending Mail"
+msgstr "Enviando mensagem"
+
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
+#, fuzzy
+msgid "Sent"
+msgstr "Vista"
+
+#: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "Sent and Draft Messages"
+msgstr "Enviar a mensagem agora"
+
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Sent messages folder:"
+msgstr "Enviar a mensagem mais tarde"
+
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "ConfiguraГЦo do servidor"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Tipo do servidor: "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Servidor requer autenticaГЦo"
 
-#: mail/mail-config.glade.h:63
-msgid "Servers"
-msgstr "Servidores"
-
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Arquivo de assinatura:"
 
-#: mail/mail-config.glade.h:65
-msgid "Signature:"
-msgstr "Assinatura:"
+#: mail/mail-config.glade.h:97
+msgid "Source"
+msgstr "Fonte"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Sem informaГЦo"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Fontes"
 
-#: mail/mail-config.glade.h:67
-msgid "This server requires a secure connection (SSL)"
-msgstr "Este servidor requer uma conexЦo segura (SSL)"
-
-#: mail/mail-config.glade.h:68
-msgid "Type"
-msgstr "Tipo"
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Special Folders"
+msgstr "Pastas virtuais"
 
-#: mail/mail-config.glade.h:69
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"Digite o nome com o qual deseja identificar estes servidores. Por exemplo: "
-"\"Trabalho\" ou \"Casa\"."
+#: mail/mail-config.glade.h:101
+#, fuzzy
+msgid "Standard Unix mbox"
+msgstr "Arquivo mbox padrЦo do Unix"
 
-#: mail/mail-config.glade.h:71
-msgid "User Information"
-msgstr "InformaГЦo do usuАrio"
+#: mail/mail-config.glade.h:103
+#, fuzzy
+msgid "Use secure connection (SSL)"
+msgstr "Este servidor requer uma conexЦo segura (SSL)"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Nome do usuАrio:"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -5545,171 +7492,246 @@ msgstr ""
 "\n"
 "Pressione \"PrСximo\" para comeГar. "
 
-#: mail/mail-config-druid.c:363
-#, c-format
-msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
 msgstr ""
-"Falha ao verificar a configuraГЦo de recebimento de correio.\n"
-"VocЙ pode enfrentar problemas ao recuperar mensagens de %s"
-
-#: mail/mail-config-druid.c:458
-msgid "Namespace:"
-msgstr "EspaГo de nomes:"
 
-#: mail/mail-config-druid.c:643
-#, c-format
-msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
 msgstr ""
-"Falha ao verificar a configuraГЦo de envio de correio.\n"
-"VocЙ pode enfrentar problemas ao enviar mensagens usando %s"
 
-#. set window title
-#: mail/mail-config-druid.c:992
-msgid "Evolution Account Wizard"
-msgstr "Assitente de contas do Evolution"
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr "segundos."
 
-#: mail/mail-display.c:97
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-"NЦo foi possМvel abrir arquivo %s:\n"
-"%s"
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "NЦo foi possМvel criar caixa de diАlogo."
 
-#: mail/mail-display.c:130
-#, c-format
-msgid "Could not write data: %s"
-msgstr "NЦo foi possМvel escrever dados: %s"
+#: mail/mail-crypto.c:86
+#, fuzzy
+msgid "Could not create a PGP verification context."
+msgstr "NЦo foi possМvel criar caixa de diАlogo."
+
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr "NЦo foi possМvel criar caixa de diАlogo."
 
-#: mail/mail-display.c:228
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
+msgstr "NЦo foi possМvel criar caixa de diАlogo."
+
+#: mail/mail-crypto.c:177
+#, fuzzy
+msgid "Could not create a S/MIME signature context."
+msgstr "NЦo foi possМvel criar caixa de diАlogo."
+
+#: mail/mail-crypto.c:209
+#, fuzzy
+msgid "Could not create a S/MIME certsonly context."
+msgstr "NЦo foi possМvel criar caixa de diАlogo."
+
+#: mail/mail-crypto.c:240
+#, fuzzy
+msgid "Could not create a S/MIME encryption context."
+msgstr "NЦo foi possМvel criar caixa de diАlogo."
+
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "NЦo foi possМvel criar caixa de diАlogo."
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr "NЦo foi possМvel criar caixa de diАlogo."
+
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Salvar anexo"
 
-#: mail/mail-display.c:268
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "NЦo foi possМvel criar diretСrio temporАrio: %s"
-
-#: mail/mail-display.c:310
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Salvar para o disco..."
 
-#: mail/mail-display.c:312
-#, c-format
-msgid "Open in %s..."
-msgstr "Abrir em %s..."
-
-#: mail/mail-display.c:314
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "Visualizar embutido"
 
-#: mail/mail-display.c:341
-msgid "External Viewer"
-msgstr "Visualizador externo"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "Abrir em %s..."
 
-#: mail/mail-display.c:364
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Visualizar embutido (via %s)"
 
-#: mail/mail-display.c:368
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Esconder"
 
-#: mail/mail-format.c:505
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "Visualizador externo"
+
+#: mail/mail-display.c:1048
+msgid "Loading message content"
+msgstr "Carregando conteЗdo da mensagem"
+
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
+msgstr "_Abrir em uma nova janela"
+
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "Copiar a seleГЦo"
+
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
+msgstr "Salvar na _pasta... (FIXME)"
+
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "Salvar como..."
+
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, c-format
+msgid "%d unsent"
+msgstr ""
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "anexo %s"
 
-#: mail/mail-format.c:653
-msgid "Loading message content"
-msgstr "Carregando conteЗdo da mensagem"
+#: mail/mail-format.c:662
+#, fuzzy
+msgid "Could not parse MIME message. Displaying as source."
+msgstr ""
+"NЦo foi possМvel abrir pasta: a listagem das mensagens estava incompleta."
+
+#: mail/mail-format.c:746
+msgid "Date"
+msgstr "Data"
+
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "EndereГo eletrТnico:"
 
-#: mail/mail-format.c:941
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr "De"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "Responder-a:"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "Para"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Cc:"
+
+#: mail/mail-format.c:1291
+#, fuzzy
+msgid "No GPG/PGP program configured."
+msgstr "Sem programa GPG/PGP disponМvel."
+
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "Mensagem cifrada nЦo exibida"
 
-#: mail/mail-format.c:947
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Mensagem cifrada"
 
-#: mail/mail-format.c:948
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Clique no Мcone para decifrar."
 
-#: mail/mail-format.c:1350
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Esta mensagem estА assinada digitalmente e И autЙntica."
 
-#: mail/mail-format.c:1358
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "Esta mensagem estА assinada digitalmente mas nЦo И possМvel estabelecer sua autenticidade."
+msgstr ""
+"Esta mensagem estА assinada digitalmente mas nЦo И possМvel estabelecer sua "
+"autenticidade."
 
-#: mail/mail-format.c:1562
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Apontador para site FTP (%s)"
 
-#: mail/mail-format.c:1574
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Apontador para arquivo local (%s) vАlido no site \"%s\""
 
-#: mail/mail-format.c:1578
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Apontador para arquivo local (%s)"
 
-#: mail/mail-format.c:1612
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Apontador para site FTP (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Apontador para dados externos desconhecidos (tipo \"%s\")"
 
-#: mail/mail-format.c:1617
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr "Parte external-body malformada."
 
-#: mail/mail-format.c:1788
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr "Em %s, %s escreveu:\n"
+#: mail/mail-local.c:458
+#, fuzzy, c-format
+msgid "Opening '%s'"
+msgstr "Abrir em %s..."
 
-#: mail/mail-local.c:204
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Alterando pasta \"%s\" para o formato \"%s\""
 
-#: mail/mail-local.c:208
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Alterar pasta \"%s\" para o formato \"%s\""
-
-#: mail/mail-local.c:251
-msgid "Reconfiguring folder"
-msgstr "Reconfigurando pasta"
-
-#: mail/mail-local.c:269
-msgid "Closing current folder"
-msgstr "Fechando pasta atual"
-
-#: mail/mail-local.c:295
-msgid "Renaming old folder and opening"
-msgstr "Renomeando pasta antiga e abrindo"
-
-#: mail/mail-local.c:313
-msgid "Creating new folder"
-msgstr "Criando nova pasta"
-
-#: mail/mail-local.c:327
-msgid "Copying messages"
-msgstr "Copiando mensagens"
-
-#: mail/mail-local.c:348
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -5718,7 +7740,7 @@ msgstr ""
 "NЦo И possМvel salvar metainfo da pasta; vocЙ provavelmente descobrirА que "
 "nЦo pode mais abrir esta pasta: %s"
 
-#: mail/mail-local.c:379
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -5726,24 +7748,16 @@ msgstr ""
 "Se vocЙ nЦo pode mais abrir esta caixa postal\n"
 "entЦo vocЙ precisar reparА-la manualmente."
 
-#: mail/mail-local.c:787
-msgid "Registering local folder"
-msgstr "Registrando pasta local"
-
-#: mail/mail-local.c:789
-msgid "Register local folder"
-msgstr "Registrar pasta local"
-
-#: mail/mail-local.c:893
-#, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
+#: mail/mail-local.c:1000
+msgid "You cannot change the format of a non-local folder."
 msgstr ""
-"NЦo И possМvel registrar a pasta '%s':\n"
-"%s"
 
-#: mail/mail-mt.c:87
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "Configurar %s"
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -5752,7 +7766,7 @@ msgstr ""
 "Erro enquanto '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:89
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -5761,116 +7775,108 @@ msgstr ""
 "Erro ao executar operaГЦo:\n"
 "%s"
 
-#: mail/mail-mt.c:372 mail/mail-mt.c:401
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Trabalhando"
 
-#: mail/mail-ops.c:510
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:512
-msgid "Sending message"
+#: mail/mail-ops.c:698
+#, fuzzy, c-format
+msgid "Sending message %d of %d"
 msgstr "Enviando mensagem"
 
-#: mail/mail-ops.c:740 mail/mail-ops.c:747
-#, c-format
-msgid "Appending \"%s\""
-msgstr "Concatenando \"%s\""
-
-#: mail/mail-ops.c:744 mail/mail-ops.c:750
-msgid "Appending a message without a subject"
-msgstr "Concatenando uma mensagem sem um assunto"
+#: mail/mail-ops.c:717
+#, fuzzy, c-format
+msgid "Failed on message %d of %d"
+msgstr "Salvando mensagem %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:833
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr "Movendo mensagens de \"%s\" para \"%s\""
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+#, fuzzy
+msgid "Complete."
+msgstr "Cumprida"
 
-#: mail/mail-ops.c:835
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr "Copiando mensagens de \"%s\" para \"%s\""
+#: mail/mail-ops.c:805
+#, fuzzy
+msgid "Saving message to folder"
+msgstr "Mover a mensagem para uma nova pasta"
 
-#: mail/mail-ops.c:838
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr "Mover mensagens de \"%s\" para \"%s\""
+#: mail/mail-ops.c:884
+#, fuzzy, c-format
+msgid "Moving messages to %s"
+msgstr "Mover mensagem(ns) para"
 
-#: mail/mail-ops.c:840
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr "Copiar mensagens de \"%s\" para \"%s\""
+#: mail/mail-ops.c:884
+#, fuzzy, c-format
+msgid "Copying messages to %s"
+msgstr "Copiando mensagens"
 
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Movendo"
 
-#: mail/mail-ops.c:874
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:894
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s mensagem %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:969
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Varrendo pastas em \"%s\""
 
-#: mail/mail-ops.c:1035 mail/subscribe-dialog.c:356
-msgid "(No description)"
-msgstr "(Sem descriГЦo)"
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#, fuzzy
+msgid "Trash"
+msgstr "Tarefa"
 
-#: mail/mail-ops.c:1100
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "Mensagens encaminhadas"
 
-#: mail/mail-ops.c:1141 mail/mail-ops.c:1210
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo pasta %s"
 
-#: mail/mail-ops.c:1272
-msgid "Synchronising folder"
-msgstr "Sincronizando pasta"
+#: mail/mail-ops.c:1297
+#, fuzzy, c-format
+msgid "Opening store %s"
+msgstr "Abrindo pasta %s"
 
-#: mail/mail-ops.c:1322
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "Abrindo pasta %s"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "Reconfigurando pasta"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "Excluindo permanentemente pasta"
 
-#: mail/mail-ops.c:1371
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recuperando mensagem %s"
 
-#: mail/mail-ops.c:1438
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Recuperando mensagens"
 
-#: mail/mail-ops.c:1448
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Recuperando mensagem nЗmero %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1596
-#, c-format
-msgid "Loading %s Folder for %s"
-msgstr "Carregando pasta %s para %s"
-
-#: mail/mail-ops.c:1598
-#, c-format
-msgid "Load %s Folder for %s"
-msgstr "Carregar pasta %s para %s"
-
-#: mail/mail-ops.c:1764
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Salvando mensagens"
 
-#: mail/mail-ops.c:1843
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -5879,12 +7885,7 @@ msgstr ""
 "NЦo И possМvel criar arquivo de saМda: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1856
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Salvando mensagem %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1870
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5893,275 +7894,1684 @@ msgstr ""
 "Erro ao salvar mensagens para: %s:\n"
 " %s"
 
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Ok"
-
-#: mail/mail-search-dialogue.c:104
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-msgid "Incomplete message written on pipe!"
-msgstr "Mensagem incompleta escrita no pipe!"
+#: mail/mail-ops.c:1987
+#, fuzzy
+msgid "Saving attachment"
+msgstr "Salvar anexo"
 
-#: mail/mail-threads.c:302
-#, c-format
+#: mail/mail-ops.c:2003
+#, fuzzy, c-format
 msgid ""
-"Error while preparing to %s:\n"
-"%s"
+"Cannot create output file: %s:\n"
+" %s"
 msgstr ""
-"Erro ao preparar para %s:\n"
-"%s"
+"NЦo И possМvel criar arquivo de saМda: %s\n"
+" %s"
 
-#: mail/mail-threads.c:676
+#: mail/mail-ops.c:2032
 #, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
+msgid "Could not write data: %s"
+msgstr "NЦo foi possМvel escrever dados: %s"
+
+#: mail/mail-ops.c:2101
+#, fuzzy, c-format
+msgid "Disconnecting from %s"
+msgstr "Conectando ao servidor"
+
+#: mail/mail-search.c:138
+#, fuzzy
+msgid "(Untitled Message)"
+msgstr "(Sem nome)"
+
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Imprimir mensagem"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "_Editar mensagem"
+
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "Enviando mensagem"
+
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
 msgstr ""
-"Erro enquanto `%s':\n"
-"%s"
 
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr "Erro ao ler comandos da thread de envio."
+#: mail/mail-search.c:315
+#, fuzzy
+msgid "Search Forward"
+msgstr "Buscar por uma expressЦo"
 
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
-msgstr "Mensagem corrompida da thread de envio?"
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
+msgstr "Localizar"
 
-#: mail/mail-threads.c:917
-msgid "Could not create dialog box."
-msgstr "NЦo foi possМvel criar caixa de diАlogo."
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "Caminho:"
 
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
+#: mail/mail-send-recv.c:141
+#, fuzzy
+msgid "Cancelling..."
+msgstr "Cancelada"
+
+#: mail/mail-send-recv.c:250
+#, fuzzy
+msgid "Send & Receive mail"
+msgstr "Recebendo mensagem"
+
+#: mail/mail-send-recv.c:253
+#, fuzzy
+msgid "Receiving"
+msgstr "Recebendo mensagem"
+
+#: mail/mail-send-recv.c:302
+msgid "Updating..."
+msgstr ""
+
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+msgid "Waiting..."
+msgstr ""
+
+#: mail/mail-send-recv.c:323
+#, fuzzy
+msgid "Sending"
+msgstr "Enviando \"%s\""
+
+#: mail/mail-send-recv.c:488
+#, fuzzy
+msgid "Cancelled."
+msgstr "Cancelada"
+
+#: mail/mail-session.c:171
+#, fuzzy
+msgid "User canceled operation."
 msgstr "O usuАrio cancelou a consulta."
 
-#: mail/mail-tools.c:192
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "NЦo foi possМvel criar mbox temporАrio `%s': %s"
 
-#: mail/mail-tools.c:250
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (mensagem encaminhada)"
-
-#: mail/mail-tools.c:260
-msgid "Fwd: (no subject)"
-msgstr "Enc: (sem assunto)"
-
-#: mail/mail-tools.c:277
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensagem encaminhada - %s"
 
-#: mail/mail-tools.c:279
-msgid "Forwarded message (no subject)"
-msgstr "Mensagem encaminhada (sem assunto)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Mensagens encaminhadas"
 
-#: mail/mail-tools.c:380
-#, c-format
-msgid ""
-"Cannot open location `%s':\n"
-"%s"
-msgstr ""
-"NЦo И possМvel abrir local `%s':\n"
-"%s"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Mensagens encaminhadas"
 
-#: mail/mail-vfolder.c:150
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "Pastas virtuais"
 
-#: mail/mail-vfolder.c:302
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Nova pasta virtual"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:31
-msgid "Reply"
-msgstr "Responder"
-
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
-msgid "Reply to the sender of this message"
-msgstr "Responder ao remetente desta mensagem"
-
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:35
-msgid "Reply to all recipients of this message"
-msgstr "Responder a todos os destinatАrios desta mensagem"
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
-msgid "Forward this message"
-msgstr "Encaminhar esta mensagem"
-
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
-msgid "Print the selected message"
-msgstr "Imprime a mensagem selecionada"
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
-msgid "Delete this message"
-msgstr "Exclui esta mensagem"
-
-#: mail/message-list.c:599
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "NЦo vista"
 
-#: mail/message-list.c:602
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:605
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:890
-#, c-format
-msgid "[ %s ]"
-msgstr "[ %s ]"
+#: mail/message-list.c:616
+#, fuzzy
+msgid "Multiple Unseen Messages"
+msgstr "Esconder mensagens _excluМdas"
 
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:902 mail/message-list.c:918
-#, c-format
-msgid "%s, et al."
-msgstr "%s, et al."
+#: mail/message-list.c:617
+#, fuzzy
+msgid "Multiple Messages"
+msgstr "_Mensagem de correio"
+
+#: mail/message-list.c:621
+#, fuzzy
+msgid "Lowest"
+msgstr "Baixa"
 
-#: mail/message-list.c:905 mail/message-list.c:921
-msgid "<unknown>"
-msgstr "<desconhecido>"
+#: mail/message-list.c:622
+#, fuzzy
+msgid "Lower"
+msgstr "Baixa"
+
+#: mail/message-list.c:626
+#, fuzzy
+msgid "Higher"
+msgstr "Alta"
 
-#: mail/message-list.c:973
+#: mail/message-list.c:627
+#, fuzzy
+msgid "Highest"
+msgstr "Alta"
+
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:980
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "Hoje %k:%M"
 
-#: mail/message-list.c:989
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "Ontem %k:%M"
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: mail/message-list.c:1009
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
-#: mail/message-list.c:1011
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:1109
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Salvando mensagens"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Marcada"
 
-#: mail/message-list.c:1110
-msgid "From"
-msgstr "De"
-
-#: mail/message-list.c:1110
-msgid "Date"
-msgstr "Data"
-
-#: mail/message-list.c:1110
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Recebida"
 
-#: mail/message-list.c:1111
-msgid "To"
-msgstr "Para"
-
-#: mail/message-list.c:1111
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "Tamanho"
 
-#: mail/openpgp-utils.c:77
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Por favor, entre a sua frase-senha de %s para %s"
-
-#: mail/openpgp-utils.c:80
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Por favor, entre a sua frase-senha de %s"
-
-#: mail/openpgp-utils.c:431 mail/openpgp-utils.c:534 mail/openpgp-utils.c:738
-#: mail/openpgp-utils.c:887 mail/openpgp-utils.c:1043
-msgid "No GPG/PGP program available."
-msgstr "Sem programa GPG/PGP disponМvel."
-
-#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:543 mail/openpgp-utils.c:745
-#: mail/openpgp-utils.c:894
-msgid "No password provided."
-msgstr "NЦo foi fornecida uma senha."
-
-#: mail/openpgp-utils.c:444 mail/openpgp-utils.c:551 mail/openpgp-utils.c:752
-#: mail/openpgp-utils.c:901 mail/openpgp-utils.c:1049
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "NЦo foi possМvel criar pipe para GPG/PGP: %s"
-
-#: mail/openpgp-utils.c:562 mail/openpgp-utils.c:607 mail/openpgp-utils.c:646
-msgid "No recipients specified"
-msgstr "Sem destinatАrios especificados"
-
-#: mail/openpgp-utils.c:1060
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "NЦo foi possМvel criar arquivo temporАrio: %s"
-
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Pasta"
 
-#: mail/subscribe-dialog.c:63
+#: mail/subscribe-dialog.c:77
 msgid "Store"
 msgstr "RepositСrio"
 
-#: mail/subscribe-dialog.c:145
+#: mail/subscribe-dialog.c:138
 msgid "Display folders starting with:"
 msgstr "Exibir pastas comeГando com:"
 
-#: mail/subscribe-dialog.c:178
+#: mail/subscribe-dialog.c:168
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr "Obtendo repositСrio para \"%s\""
 
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr "Obter repositСrio para \"%s\""
-
-#: mail/subscribe-dialog.c:289
+#: mail/subscribe-dialog.c:271
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Assinando a pasta \"%s\""
 
-#: mail/subscribe-dialog.c:293
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
+#: mail/subscribe-dialog.c:273
+#, fuzzy, c-format
+msgid "Unsubscribing to folder \"%s\""
 msgstr "Cancelando assinatura da pasta \"%s\""
 
-#: mail/subscribe-dialog.c:297
-#, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr "Assinar a pasta \"%s\""
+#. Construct the app
+#: mail/subscribe-dialog.c:878
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "Gerenciar assinaturas..."
 
-#: mail/subscribe-dialog.c:300
-#, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr "Cancelar a assinatura da pasta \"%s\""
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr ""
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the Evolution executive summary component."
+msgstr "NЦo И possМvel iniciar o componente Executive Summary do Evolution."
+
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "NЦo И possМvel iniciar o componente Executive Summary do Evolution."
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+#, fuzzy
+msgid "Appointments"
+msgstr "Compromisso - %s"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "Exibir compromissos"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%H:%M"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%a %k:%M"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Sem resumo"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "InstalaГЦo do Evolution"
+
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Erro ao carregar agenda</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "Exibir tarefas"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "SeГУes:"
+
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A, %e de %B de %Y"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "Falhou a impressЦo da mensagem"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "NЦo foi possМvel iniciar Bonobo"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "Limpar"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
+
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "Variable"
+msgstr "Desativado"
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "Nota"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "_Notas:"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "Colar"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "Fontes"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "mЙs"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "Fontes"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Teste"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "_Notas:"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "Exibir"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "RАdio"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Drifting rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "Localizar novamente"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "agora"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Moderate snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Drifting snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "Correio"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "Exibir todos"
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "E-mail principal"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "Recebendo mensagem"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Shallow small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Showers of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+msgid "Unknown precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "Erro desconhecido"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Freezing precipitation"
+msgstr ""
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "И"
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "Retrato"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Drifting mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "Fechar esta janela"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "PontuaГЦo"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "Exibir tarefas"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "Fechar esta janela"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "Enviar"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "CabeГalho"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "Dias"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "Agosto"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Raging tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Thunderous tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
 
-#: shell/e-setup.c:112 shell/e-setup.c:185
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "Respondida"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Pastas"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "Todos os participantes"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Exibir pastas comeГando com:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "OpГУes de exibiГЦo"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "ExibiГЦo"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "Sexta-feira"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "Quarta-feira"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "mЙs"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr "semana"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr "Agendar reuniЦo"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Exibir tarefas"
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "Show full path for folders"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "Exibir tarefas"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "Tarefas"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
+msgstr ""
+"\n"
+"  Unidade:  "
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Outro"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "Limpar a seleГЦo"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "Abril"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#, fuzzy
+msgid "The Evolution shell."
+msgstr "NЦo И possМvel iniciar o Evolution."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "Detalhes"
+
+#: shell/e-activity-handler.c:200
+msgid "Cancel Operation"
+msgstr ""
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Pastas virtuais"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "InstalaГЦo do Evolution"
 
-#: shell/e-setup.c:116
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6169,28 +9579,25 @@ msgstr ""
 "Esta nova versЦo do Evolution precisa instalar arquivos adicionais\n"
 "no seu diretСrio pessoal do Evolution"
 
-#: shell/e-setup.c:117
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Por favor clique \"OK\" para instalar os arquivos ou \"Cancelar\" para sair."
 
-#: shell/e-setup.c:157
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "NЦo foi possМvel atualizar os arquivos corretamente"
 
-#: shell/e-setup.c:160 shell/e-setup.c:228
-msgid "Evolution files successfully installed."
-msgstr "Arquivos do Evolution instalados com sucesso."
-
-#: shell/e-setup.c:189
-msgid "This seems to be the first time you run Evolution."
+#: shell/e-setup.c:200
+#, fuzzy
+msgid "This seems to be the first time you are running Evolution."
 msgstr "Esta parece ser a primeira vez que vocЙ executa o Evolution."
 
-#: shell/e-setup.c:190
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "Por favor clique \"OK\" para instalar os arquivos do Evolution em"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6201,16 +9608,14 @@ msgstr ""
 "%s\n"
 "Erro: %s"
 
-#: shell/e-setup.c:224
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"NЦo И possМvel copiar arquivos em\n"
+"An error occurred in copying files into\n"
 "`%s'."
+msgstr "Um erro ocorreu ao ler o arquivo."
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6221,7 +9626,16 @@ msgstr ""
 "Por favor o mova para permitir a instalaГЦo\n"
 "dos arquivos de usuАrio do Evolution."
 
-#: shell/e-setup.c:261
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6232,7 +9646,58 @@ msgstr ""
 "do Evolution. Por favor, o mova para permitir\n"
 "a instalaГЦo dos arquivos de usuАrio do Evolution."
 
-#: shell/e-shell-folder-creation-dialog.c:82
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "NЦo И possМvel obter pasta: %s: %s"
+
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"NЦo И possМvel copiar arquivos em\n"
+"`%s'."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "Copiar para pasta"
+
+#: shell/e-shell-folder-commands.c:313
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "Mover para pasta"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "Selecionar pasta"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "VocЙ tem certeza que deseja excluir a tarefa `%s'?"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "Abrindo pasta %s"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -6241,15 +9706,15 @@ msgstr ""
 "NЦo И possМvel criar a pasta especificada:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:134
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "O nome especificado para a pasta И invАlido."
 
-#: shell/e-shell-folder-creation-dialog.c:225
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Criar nova pasta"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -6257,27 +9722,122 @@ msgstr ""
 "O tipo da pasta selecionada nЦo И vАlido para\n"
 "a operaГЦo desejada."
 
-#: shell/e-shell-folder-selection-dialog.c:297
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Novo..."
 
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Sem nome)"
 
-#: shell/e-shell-view-menu.c:127
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-importer.c:362
+#, fuzzy
+msgid "Importing"
+msgstr "Importante"
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:383
+#, fuzzy, c-format
+msgid "Error starting %s"
+msgstr "Erro ao salvar arquivo: %s"
+
+#: shell/e-shell-importer.c:402
+#, fuzzy, c-format
+msgid "Error loading %s"
+msgstr "Erro ao carregar arquivo: %s"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/e-shell-importer.c:488
+#, fuzzy
+msgid "Automatic"
+msgstr "_Autoescolher"
+
+#: shell/e-shell-importer.c:538
+#, fuzzy
+msgid "Filename:"
+msgstr "Nome do arquivo:"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Select a file"
+msgstr "Selecionar arquivo de assinatura"
+
+#: shell/e-shell-importer.c:553
+#, fuzzy
+msgid "File type:"
+msgstr "Nome do arquivo:"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "Selecionar pasta"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy nЦo foi encontrado em seu $PATH."
 
-#: shell/e-shell-view-menu.c:133
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy nЦo pТde ser executado."
 
-#: shell/e-shell-view-menu.c:185
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:187
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -6287,34 +9847,72 @@ msgstr ""
 "para correio, agenda e gerenciamento de contatos\n"
 "dentro do ambiente GNOME."
 
-#: shell/e-shell-view-menu.c:347
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Ir para a pasta..."
 
-#: shell/e-shell-view.c:143
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Criar um novo grupo de atalhos"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
+msgstr "Trabalhando"
+
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+#, fuzzy
+msgid "Work Offline"
+msgstr "Trabalhando"
+
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr "(Nenhuma pasta exibida)"
 
-#: shell/e-shell-view.c:471
-msgid "Folders"
-msgstr "Pastas"
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
 
-#: shell/e-shell-view.c:1121
+#: shell/e-shell-view.c:1411
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1123
+#: shell/e-shell-view.c:1413
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell.c:372
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "NЦo И possМvel definir repositСrio local -- %s"
 
-#: shell/e-shell.c:1238
+#: shell/e-shell.c:1311
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6323,15 +9921,15 @@ msgstr ""
 "Ooops! A visualizaГЦo para `%s' terminou inesperadamente. :-(\n"
 "Isto provavelmente significa que o componente %s falhou."
 
-#: shell/e-shortcuts-view.c:123
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Criar um novo grupo de atalhos"
 
-#: shell/e-shortcuts-view.c:126
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Nome do grupo:"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -6340,159 +9938,275 @@ msgstr ""
 "VocЙ deseja realmente excluir o grupo\n"
 "`%s' da barra de atalhos?"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "NЦo remover"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "Exclui este atalho da barra de atalhos"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "Exclui este atalho da barra de atalhos"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "мcones _pequenos"
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Exibe os atalhos como Мcones pequenos"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "мcones _grandes"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Exibe os atalhos como Мcones grandes"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_Novo group..."
 
-#: shell/e-shortcuts-view.c:281
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Criar um novo grupo de atalhos"
 
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "_Excluir este grupo..."
 
-#: shell/e-shortcuts-view.c:284
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Exclui este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:289
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "_Excluir este grupo..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "Exclui este atalho da barra de atalhos"
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "Es_conder a barra de atalhos"
 
-#: shell/e-shortcuts-view.c:290
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Esconder a barra de atalhos"
 
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "Ativar"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "Exclui este atalho da barra de atalhos"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "Exclui este atalho da barra de atalhos"
+
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Abrir"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+#, fuzzy
+msgid "Open in New Window"
+msgstr "_Abrir em uma nova janela"
+
+#: shell/e-shortcuts-view.c:476
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr ""
 
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr "Ativa este atalho"
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "Nome da regra: "
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "Exclui este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:377
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Remove este atalho da barra de atalhos"
 
-#: shell/e-shortcuts.c:375
+#: shell/e-shortcuts.c:585
 msgid "Error saving shortcuts."
 msgstr "Erro ao salvar atalhos."
 
-#: shell/e-storage-set-view.c:338
-msgid "View the selected folder"
-msgstr "Visualizar a pasta selecionada"
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Fontes"
+
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
 
-#: shell/e-storage.c:160
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "Co_ntatos"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Sem nome)"
 
-#: shell/e-storage.c:411
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Sem erro"
 
-#: shell/e-storage.c:413
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Erro genИrico"
 
-#: shell/e-storage.c:415
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "JА existe uma pasta com o mesmo nome"
 
-#: shell/e-storage.c:417
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "O tipo de pasta especificado nЦo И vАlido"
 
-#: shell/e-storage.c:419
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "Erro de E/S"
 
-#: shell/e-storage.c:421
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "NЦo hА espaГo suficiente para criar a pasta"
 
-#: shell/e-storage.c:423
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "A pasta especificada nЦo foi achada"
 
-#: shell/e-storage.c:425
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "FunГЦo nЦo implementada neste repositСrio"
 
-#: shell/e-storage.c:427
-msgid "Permission denied"
-msgstr "PermissЦo negada"
-
-#: shell/e-storage.c:429
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "OperaГЦo nЦo suportada"
 
-#: shell/e-storage.c:431
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "O tipo especificado nЦo И suportado neste repositСrio"
 
-#: shell/main.c:74
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
+
+#: shell/e-task-widget.c:173
+#, fuzzy
+msgid "%s (%d%% complete)"
+msgstr "% Cu_mprida:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "Qualquer campo contИm"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "MАquina:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+msgid "Folder name:"
+msgstr "Nome do arquivo:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#, fuzzy
+msgid "Folder type:"
+msgstr "Pasta"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Specify where to create the folder:"
+msgstr "NЦo hА espaГo suficiente para criar a pasta"
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+
+#: shell/importer/import.glade.h:2
+#, fuzzy
+msgid "Evolution Import Utility"
+msgstr "Editor de contas do Evolution"
+
+#: shell/importer/import.glade.h:3
+#, fuzzy
+msgid "Evolution Importer Utility"
+msgstr "Editor de contas do Evolution"
+
+#: shell/importer/import.glade.h:6
 msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
-"\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
-"\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
 msgstr ""
+
+#: shell/importer/intelligent.c:191
+#, fuzzy
+msgid "Importers"
+msgstr "Importante"
+
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "NЦo remover"
+
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr ""
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, no-c-format
+msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
+"Evolution is not yet complete. It's getting close, but there are\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
 
-#: shell/main.c:101
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -6500,175 +10214,337 @@ msgstr ""
 "Obrigado\n"
 "The Evolution Team\n"
 
-#: shell/main.c:132
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "NЦo И possМvel iniciar o Evolution."
 
-#: shell/main.c:178
-msgid "Disable."
-msgstr "Desativar."
+#: shell/main.c:215
+msgid "Disable splash screen"
+msgstr ""
+
+#: shell/main.c:216
+msgid "Send the debugging output of all components to a file."
+msgstr ""
 
-#: shell/main.c:198
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "NЦo И possМvel iniciar o sistema de componentes Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Copiar"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
+msgstr "Copiar a seleГЦo"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "Criar novo contato"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Apagar um contato"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "Criar novo contato"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Localizar um contato"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Recortar"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr "Recortar a seleГЦo"
+
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "Apagar um contato"
+
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Novo contato"
 
-#: ui/evolution-addressbook.xml.h:9
-msgid "Print contacts"
+#: ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "New list"
+msgstr "NotМcias"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Colar"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "Colar a Аrea de transferЙncia"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
+msgstr "Visualiza a impressЦo da mensagem a ser impressa"
+
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "Imprimir contatos"
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "Selecionar todos"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "Apagar um contato"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Parar"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Parar a carga"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "View All"
-msgstr "Visualizar todos"
+#: ui/evolution-addressbook.xml.h:22
+#, fuzzy
+msgid "_Addressbook Sources..."
+msgstr "Fontes de catАlogos de endereГos"
 
-#: ui/evolution-addressbook.xml.h:13
-msgid "View all contacts"
-msgstr "Visualizar todos os contatos"
+#: ui/evolution-addressbook.xml.h:23
+#, fuzzy
+msgid "_Contact"
+msgstr "Co_ntatos"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "_Addressbook Configuration..."
-msgstr "ConfiguraГЦo do catАlogo de _endereГos..."
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "Co_ntatos"
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "_Print Contacts..."
-msgstr "_Imprimir contatos..."
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
+msgid "_Print..."
+msgstr "_Imprimir..."
 
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "_Busca por contatos"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 dias"
+#: ui/evolution-addressbook.xml.h:29
+#, fuzzy
+msgid "_Select All"
+msgstr "Selecionar todos"
 
-#: ui/evolution-calendar.xml.h:3
-msgid "Ca_lendar"
-msgstr "A_genda"
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
+msgid "_Tools"
+msgstr "_Ferramentas"
+
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Calendar Preferences..."
-msgstr "PreferЙncias da agenda..."
+#, fuzzy
+msgid "Create a New All-Day _Event"
+msgstr "Criar um novo compromisso"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Criar um novo compromisso"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Criar uma nova agenda"
+msgid "Create a new appointment"
+msgstr "Criar um novo compromisso"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "Dia"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
+#, fuzzy
+msgid "Go To"
+msgstr "Ir para"
+
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Voltar no tempo"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "AvanГar no tempo"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go to"
-msgstr "Ir para"
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Go to _Date"
+msgstr "Ir para data"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Ir para uma data especМfica"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Ir para o presente"
 
-#: ui/evolution-calendar.xml.h:13
-msgid "Month"
-msgstr "MЙs"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "New appointment"
+#: ui/evolution-calendar.xml.h:16
+#, fuzzy
+msgid "New Appointment"
 msgstr "Novo compromisso"
 
-#: ui/evolution-calendar.xml.h:16
-msgid "Open a calendar"
-msgstr "Abrir uma agenda"
+#: ui/evolution-calendar.xml.h:18
+#, fuzzy
+msgid "Previews the calendar to be printed"
+msgstr "Visualiza a impressЦo da mensagem a ser impressa"
 
-#: ui/evolution-calendar.xml.h:17
-msgid "Prev"
-msgstr "Ant"
+#: ui/evolution-calendar.xml.h:20
+#, fuzzy
+msgid "Print calendar"
+msgstr "Imprimir agenda"
 
-#: ui/evolution-calendar.xml.h:19
-msgid "Print this calendar"
+#: ui/evolution-calendar.xml.h:21
+#, fuzzy
+msgid "Print this Calendar"
 msgstr "Imprimir esta agenda"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Save calendar as something else"
-msgstr "Salvar agenda como outra coisa"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "InformaГЦo do usuАrio"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Exibe 1 dia"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Exibe 1 mЙs"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Exibe 1 semana"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Exibe a semana Зtil"
 
-#: ui/evolution-calendar.xml.h:25 widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Hoje"
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "W_ork Week"
+msgstr "Semana Зtil"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Week"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
+msgstr "Novo compromisso..."
+
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "PreferЙncias da agenda..."
+
+#: ui/evolution-calendar.xml.h:32
+#, fuzzy
+msgid "_Day"
+msgstr "Dia"
+
+#: ui/evolution-calendar.xml.h:33
+#, fuzzy
+msgid "_Month"
+msgstr "MЙs"
+
+#: ui/evolution-calendar.xml.h:37
+#, fuzzy
+msgid "_Week"
 msgstr "Semana"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution.xml.h:38
-msgid "_New"
-msgstr "_Novo"
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Fechar"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "_Open Calendar"
-msgstr "_Abrir agenda"
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "Fechar este compromisso"
 
-#: ui/evolution-calendar.xml.h:29
-msgid "_Print this calendar"
-msgstr "_Imprimir esta agenda"
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "Excluir este compromisso"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "Barra de tarefas principal"
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "Visualiza a impressЦo da mensagem a ser impressa"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Print Pre_view"
+msgstr "Visualizar impressЦo"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "Configurar impressЦo..."
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Imprime este item"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "Imprimir..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "Salvar e fechar"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "Salva o compromisso e fecha a caixa de diАlogo"
+
+#: ui/evolution-comp-editor.xml.h:17
+#, fuzzy
+msgid "Save this item to disk"
+msgstr "Mudar a visualizaГЦo para %s"
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr "Configurar a pАgina para a sua impressora atual"
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "_AГУes"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "_Arquivo"
 
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Exclui este item"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "Excluir..."
 
@@ -6680,6 +10556,12 @@ msgstr "Ajuda"
 msgid "Print En_velope..."
 msgstr "Imprimir en_velope..."
 
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
+msgid "Save _As..."
+msgstr "Salvar _como..."
+
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Salva o contato e fecha a caixa de diАlogo"
@@ -6688,641 +10570,2500 @@ msgstr "Salva o contato e fecha a caixa de diАlogo"
 msgid "Se_nd contact to other..."
 msgstr "E_nviar o contato a outro..."
 
+#: ui/evolution-contact-editor.xml.h:12
+msgid "See online help"
+msgstr "Ver ajuda on-line"
+
 #: ui/evolution-contact-editor.xml.h:13
 msgid "Send _message to contact..."
 msgstr "Enviar _mensagem ao contato..."
 
-#: ui/evolution-contact-editor.xml.h:15
-msgid "_Print..."
-msgstr "_Imprimir..."
-
-#: ui/evolution-event-editor.xml.h:9
-msgid "Close this appointment"
-msgstr "Fechar este compromisso"
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
+msgid "_Save"
+msgstr "_Salvar"
 
-#: ui/evolution-event-editor.xml.h:27
-msgid "FIXME: Forward as v_Calendar"
-msgstr "FIXME: Encaminar como vCa_lendar"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "Exclui este item"
 
-#: ui/evolution-event-editor.xml.h:52
-msgid "FIXME: _New Appointment"
-msgstr "FIXME: _Novo compromisso"
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "Salva a tarefa e fecha a caixa de diАlogo"
 
-#: ui/evolution-event-editor.xml.h:53
-msgid "FIXME: _Note"
-msgstr "FIXME: _Nota"
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "E_nviar o contato a outro..."
 
-#: ui/evolution-event-editor.xml.h:86
-msgid "Save the appointment and close the dialog box"
-msgstr "Salva o compromisso e fecha a caixa de diАlogo"
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "Enviar _mensagem ao contato..."
 
-#: ui/evolution-event-editor.xml.h:88
-msgid "Schedule Meeting"
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
 msgstr "Agendar reuniЦo"
 
-#: ui/evolution-event-editor.xml.h:89
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+msgid "Cancel the meeting for this item"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Forward as i_Calendar"
+msgstr "FIXME: Encaminar como vCa_lendar"
+
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "Encaminhar esta mensagem"
+
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr "Atualizar lista"
+
+#: ui/evolution-event-editor.xml.h:7
 msgid "Schedule _Meeting"
 msgstr "Agendar _reuniЦo"
 
-#: ui/evolution-event-editor.xml.h:90
-msgid "Schedule some sort of a meeting"
-msgstr "Agendar algum tipo de reuniЦo"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#, fuzzy
+msgid "Schedule a meeting for this item"
+msgstr "Agendar reuniЦo"
 
-#: ui/evolution-mail.xml.h:1
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+#, fuzzy
+msgid "_Actions"
+msgstr "_AГУes"
+
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "%s - Evolution %s"
+
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "Salvar o arquivo atual"
+
+#: ui/evolution-mail-global.xml.h:3
 msgid "Compose"
 msgstr "Redigir"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Compose a new message"
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
 msgstr "Redigir uma nova mensagem"
 
-#: ui/evolution-mail.xml.h:4
-msgid "Copy message to a new folder"
-msgstr "Copiar mensagem para uma nova pasta"
-
-#: ui/evolution-mail.xml.h:5
-msgid "Create Rule"
-msgstr "Criar regra"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
-msgid "F_older"
-msgstr "_Pasta"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:9
-msgid "Fi_lter on Sender"
-msgstr "Filtro por _remetente"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:10
-msgid "Filter on Rec_ipients"
-msgstr "Filtro por _destinatАrios"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget _Passwords"
 msgstr "Esquecer _senhas"
 
-#: ui/evolution-mail.xml.h:15
-msgid "Get Mail"
-msgstr "Pegar correio"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
+
+#: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Manage _Subscriptions..."
+msgstr "Gerenciar assinaturas..."
+
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
+
+#: ui/evolution-mail-global.xml.h:13
+msgid "Permanently remove all deleted messages from all folders"
+msgstr ""
+
+#: ui/evolution-mail-global.xml.h:14
+#, fuzzy
+msgid "Send / Receive"
+msgstr "Recebida"
+
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "Enviar mensagens na fila de saМda e recuperar novas mensagens"
+
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
+msgstr ""
+
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail-global.xml.h:18
+#, fuzzy
+msgid "Virtual Folder _Editor..."
+msgstr "Editor de pastas _virtuais..."
+
+#: ui/evolution-mail-global.xml.h:19
+#, fuzzy
+msgid "_Filters..."
+msgstr "_Filtros de correio..."
+
+#: ui/evolution-mail-global.xml.h:20
+#, fuzzy
+msgid "_Mail Message"
+msgstr "_Mensagem de correio"
+
+#: ui/evolution-mail-global.xml.h:21
+#, fuzzy
+msgid "_Mail Settings..."
+msgstr "_ConfiguraГУes"
+
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "Visualizar"
+
+#: ui/evolution-mail-global.xml.h:23
+#, fuzzy
+msgid "_Send / Receive"
+msgstr "Recebida"
+
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "Esconder mensagens _selecionadas"
+
+#: ui/evolution-mail-list.xml.h:5
+#, fuzzy
+msgid "Cut selected messages"
+msgstr "Imprime a mensagem selecionada"
+
+#: ui/evolution-mail-list.xml.h:6
 msgid "Hide S_elected Messages"
 msgstr "Esconder mensagens _selecionadas"
 
-#: ui/evolution-mail.xml.h:17
+#: ui/evolution-mail-list.xml.h:7
 msgid "Hide _Deleted Messages"
 msgstr "Esconder mensagens _excluМdas"
 
-#: ui/evolution-mail.xml.h:18
-msgid "Hide _Read messages"
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
 msgstr "Esconder mensagens _lidas"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Mail _Filters..."
-msgstr "_Filtros de correio..."
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:20
-msgid "Manage Subscriptions..."
-msgstr "Gerenciar assinaturas..."
+#: ui/evolution-mail-list.xml.h:10
+#, fuzzy
+msgid "Mark All as R_ead"
+msgstr "Marcar como lida"
+
+#: ui/evolution-mail-list.xml.h:11
+#, fuzzy
+msgid "Mark all visible messages as read"
+msgstr "Marcar mensagens como \"Lida\" apСs:"
+
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "Colar a Аrea de transferЙncia"
+
+#: ui/evolution-mail-list.xml.h:14
+msgid "Permanently remove all deleted messages from this folder"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "Selecionar _todos"
+
+#: ui/evolution-mail-list.xml.h:16
+#, fuzzy
+msgid "Select _Thread"
+msgstr "Selecionar _todos"
+
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:21
-msgid "Mar_k As Read"
-msgstr "Marcar como _lida"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:22
-msgid "Mark As U_nread"
-msgstr "Marcar como _nЦo lida"
+#: ui/evolution-mail-list.xml.h:19
+#, fuzzy
+msgid "Select all visible messages"
+msgstr "Exclui esta mensagem"
 
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail-list.xml.h:20
+#, fuzzy
+msgid "Show _All"
+msgstr "Exibir todos"
+
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:22
+msgid "Temporarily hide all messages that have already been read"
+msgstr ""
+
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "Imprime a mensagem selecionada"
+
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "Lista de mensagens encadeadas"
+
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "_Excluir permanentemente"
+
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Pasta"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_Inverter seleГЦo"
+
+#: ui/evolution-mail-list.xml.h:28
+msgid "_Properties..."
+msgstr "_Propriedades..."
+
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "Lista de mensagens encadeadas"
+
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "Apply filter rules to the selected messages"
+msgstr "Imprime a mensagem selecionada"
+
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "Responder a todos os destinatАrios desta mensagem"
+
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Responder ao remetente desta mensagem"
+
+#: ui/evolution-mail-message.xml.h:6
+#, fuzzy
+msgid "Copy selected messages to another folder"
+msgstr "Copiar mensagem para uma nova pasta"
+
+#: ui/evolution-mail-message.xml.h:7
+#, fuzzy
+msgid "Create _Virtual Folder From Message"
+msgstr "Criar regra a partir da mensagem"
+
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:12
+msgid "Create a virtual folder for these recipients"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:13
+msgid "Create a virtual folder for this mailing list"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:14
+msgid "Create a virtual folder for this sender"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:15
+msgid "Create a virtual folder for this subject"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:17
+#, fuzzy
+msgid "Display the next important message"
+msgstr "Responder ao remetente desta mensagem"
+
+#: ui/evolution-mail-message.xml.h:18
+#, fuzzy
+msgid "Display the next message"
+msgstr "Exclui esta mensagem"
+
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
+msgstr "Imprime a mensagem selecionada"
+
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:21
+msgid "Display the previous important message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:22
+#, fuzzy
+msgid "Display the previous message"
+msgstr "Exclui esta mensagem"
+
+#: ui/evolution-mail-message.xml.h:23
+msgid "Display the previous unread message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
+msgstr "Filtro por lista de discussЦo"
+
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
+msgstr "Filtro por remetente"
+
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
+msgstr "Filtro por destinatАrios"
+
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
+msgstr "Filtro por assunto"
+
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "Encaminhar"
+
+#: ui/evolution-mail-message.xml.h:30
+#, fuzzy
+msgid "Forward As"
+msgstr "Encaminhar"
+
+#: ui/evolution-mail-message.xml.h:31
+msgid "Forward _Attached"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:32
+#, fuzzy
+msgid "Forward _Inline"
+msgstr "Encaminhar embutido"
+
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Forward _Quoted"
+msgstr "Encaminhar"
+
+#: ui/evolution-mail-message.xml.h:34
+msgid "Forward the selected message in the body of a new message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:35
+msgid "Forward the selected message quoted like a reply"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward the selected message to someone"
+msgstr "Imprime a mensagem selecionada"
+
+#: ui/evolution-mail-message.xml.h:37
+msgid "Forward the selected message to someone as an attachment"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:39
+#, fuzzy
+msgid "Load _Images"
+msgstr "Mensagens encaminhadas"
+
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "Importante"
+
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
+msgstr "Marcar como nЦo lida"
+
+#: ui/evolution-mail-message.xml.h:44
+#, fuzzy
+msgid "Mark the selected messages as having been read"
+msgstr "Imprime a mensagem selecionada"
+
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "Imprime a mensagem selecionada"
+
+#: ui/evolution-mail-message.xml.h:46
+msgid "Mark the selected messages as not having been read"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Imprime a mensagem selecionada"
+
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "Imprime a mensagem selecionada"
+
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Mover"
 
-#: ui/evolution-mail.xml.h:24
-msgid "Move message to a new folder"
+#: ui/evolution-mail-message.xml.h:50
+#, fuzzy
+msgid "Move selected messages to another folder"
 msgstr "Mover a mensagem para uma nova pasta"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "PrСximo"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Responder ao remetente desta mensagem"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "_Mensagem"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Selecionar _todos"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Imprimir mensagem"
+
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Open the selected message in a new window"
+msgstr "Imprime a mensagem selecionada"
+
+#: ui/evolution-mail-message.xml.h:57
+msgid "Open the selected message in the composer to re-send it"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:58
 msgid "Previews the message to be printed"
 msgstr "Visualiza a impressЦo da mensagem a ser impressa"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Print Preview of message..."
-msgstr "Visualizar impressЦo da mensagem..."
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "Anterior"
+
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Imprimir mensagem"
 
-#: ui/evolution-mail.xml.h:28
-msgid "Print message to the printer"
-msgstr "Imprime a mensagem na impressora"
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Imprimir mensagem"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Imprimir mensagem"
 
-#: ui/evolution-mail.xml.h:29
-msgid "Print message..."
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
+msgid "Print Message..."
 msgstr "Imprimir mensagem..."
 
-#: ui/evolution-mail.xml.h:33
-msgid "Reply to _All"
-msgstr "Responder a _todos"
+#: ui/evolution-mail-message.xml.h:65
+#, fuzzy
+msgid "Print Preview..."
+msgstr "Visualizar impressЦo"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Reply to _Sender"
-msgstr "Responder ao _remetente"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "Imprimir mensagem"
 
-#: ui/evolution-mail.xml.h:37
-msgid "S_ource"
-msgstr "_Fonte"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "Responder"
 
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Selecionar _todos"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "Responder a todos"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Send queued mail and retrieve new mail"
-msgstr "Enviar mensagens na fila de saМda e recuperar novas mensagens"
+#: ui/evolution-mail-message.xml.h:71
+#, fuzzy
+msgid "S_earch Message"
+msgstr "_Mensagem"
+
+#: ui/evolution-mail-message.xml.h:72
+#, fuzzy
+msgid "Save the message as a text file"
+msgstr "Salvar a mensagem em uma pasta especificada"
 
-#: ui/evolution-mail.xml.h:40
-msgid "Show _All Messages"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:74
+msgid "Show Email _Source"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:75
+#, fuzzy
+msgid "Show Full _Headers"
 msgstr "Exibir _todas as mensagens"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Threaded Message list"
-msgstr "Lista de mensagens encadeadas"
+#: ui/evolution-mail-message.xml.h:76
+msgid "Show message in the normal style"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:43
-msgid "VFolder on Se_nder"
+#: ui/evolution-mail-message.xml.h:77
+#, fuzzy
+msgid "Show message with all email headers"
+msgstr "NЦo existe mensagem com uid %s"
+
+#: ui/evolution-mail-message.xml.h:78
+#, fuzzy
+msgid "Show the raw email source of the message"
+msgstr "Anexar um arquivo Ю mensagem"
+
+#: ui/evolution-mail-message.xml.h:79
+#, fuzzy
+msgid "Un-delete the selected messages"
+msgstr "Imprime a mensagem selecionada"
+
+#: ui/evolution-mail-message.xml.h:80
+#, fuzzy
+msgid "VFolder on Mailing _List..."
+msgstr "Filtro por lista de discussЦo"
+
+#: ui/evolution-mail-message.xml.h:81
+#, fuzzy
+msgid "VFolder on Se_nder..."
 msgstr "Pasta virtual por _remetente"
 
-#: ui/evolution-mail.xml.h:44
-msgid "VFolder on _Recipients"
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "VFolder on _Recipients..."
 msgstr "Pasta virtual por _destinatАrios"
 
-#: ui/evolution-mail.xml.h:45
-msgid "View Raw Message Source"
-msgstr "Ver o cСdigo fonte da mensagem"
+#: ui/evolution-mail-message.xml.h:83
+#, fuzzy
+msgid "VFolder on _Subject..."
+msgstr "Pasta virtual por assunto"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_Aplicar filtros"
 
-#: ui/evolution-mail.xml.h:47
-msgid "_Configure Folder..."
-msgstr "_Configurar pasta..."
-
-#: ui/evolution-mail.xml.h:48
-msgid "_Copy to Folder..."
-msgstr "_Copiar para pasta..."
-
-#: ui/evolution-mail.xml.h:50
-msgid "_Edit Message"
-msgstr "_Editar mensagem"
+#: ui/evolution-mail-message.xml.h:85
+#, fuzzy
+msgid "_Copy to Folder"
+msgstr "Copiar para pasta"
 
-#: ui/evolution-mail.xml.h:51
-msgid "_Expunge"
-msgstr "_Excluir permanentemente"
+#: ui/evolution-mail-message.xml.h:86
+#, fuzzy
+msgid "_Create Filter From Message"
+msgstr "Criar regra a partir da mensagem"
 
-#: ui/evolution-mail.xml.h:52
-msgid "_Filter on Subject"
-msgstr "_Filtro por assunto"
+#: ui/evolution-mail-message.xml.h:88
+#, fuzzy
+msgid "_Forward Message"
+msgstr "Mensagens encaminhadas"
 
-#: ui/evolution-mail.xml.h:53
-msgid "_Forward"
-msgstr "_Encaminhar"
+#: ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Message Display"
+msgstr "_ExibiГЦo"
 
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Inverter seleГЦo"
+#: ui/evolution-mail-message.xml.h:90
+#, fuzzy
+msgid "_Move to Folder"
+msgstr "Mover para pasta"
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Mail Configuration..."
-msgstr "_ConfiguraГЦo de correio..."
+#: ui/evolution-mail-message.xml.h:91
+#, fuzzy
+msgid "_Normal Display"
+msgstr "_ExibiГЦo"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Message"
+#: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Open Message"
 msgstr "_Mensagem"
 
-#: ui/evolution-mail.xml.h:57
-msgid "_Move to Folder..."
-msgstr "_Mover para pasta..."
-
-#: ui/evolution-mail.xml.h:58
-msgid "_Open in New Window"
-msgstr "_Abrir em uma nova janela"
+#: ui/evolution-mail-message.xml.h:93
+#, fuzzy
+msgid "_Re-send Message"
+msgstr "_Editar mensagem"
 
-#: ui/evolution-mail.xml.h:59
-msgid "_Print Message"
-msgstr "_Imprimir mensagem"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Fechar esta janela"
 
-#: ui/evolution-mail.xml.h:60
-msgid "_Save Message As..."
-msgstr "_Salvar mensagem como..."
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+#, fuzzy
+msgid "Customi_ze Toolbars..."
+msgstr "Personalizar barras de ferramentas"
 
-#: ui/evolution-mail.xml.h:61
-msgid "_Threaded"
-msgstr "_Encadeado"
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "Personalizar"
 
-#: ui/evolution-mail.xml.h:62
-msgid "_Undelete"
-msgstr "Des_fazer exclusЦo"
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "Personalizar barras de ferramentas"
 
-#: ui/evolution-mail.xml.h:63
-msgid "_VFolder on Subject"
-msgstr "_Pasta virtual por assunto"
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "_Fechar"
 
-#: ui/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
-msgstr "Editor de pastas _virtuais..."
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "_Visualizar"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Anexar"
 
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
+msgid "Close the current file"
+msgstr "Fechar o arquivo atual"
+
 #: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Delete all but signature"
+msgstr "Selecionar arquivo de assinatura"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Cifrar esta mensagem com PGP"
 
 #: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
+msgid "F_ormat"
+msgstr "F_ormato"
+
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "Inserir arquivo texto..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Inserir um arquivo como texto na mensagem"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Inserir arquivo texto..."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Abrir um arquivo"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "Cifrar com PGP"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "Assinar com PGP"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:17
+#, fuzzy
+msgid "S/MIME Encrypt"
+msgstr "Cifrar com PGP"
+
+#: ui/evolution-message-composer.xml.h:18
+msgid "S/MIME Sign"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "Salvar"
+
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr "Salvar como"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save _Draft"
 msgstr "Salvar _rascunho"
 
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Salvar na _pasta... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Salvar na pasta..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "Salvar o arquivo atual"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Salvar o arquivo atual com um nome diferente"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Salvar a mensagem em uma pasta especificada"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Enviar"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Enviar mais _tarde"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Enviar mais _tarde"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Enviar as mensagens em formato HTML"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Enviar a mensagem mais tarde"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Enviar a mensagem agora"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Enviar esta mensagem agora"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Exibir / esconder anexos"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Exibir _anexos"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Exibir anexos"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "Assinar esta mensagem com a sua chave PGP"
 
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Assinar esta mensagem com a sua chave PGP"
+
+#: ui/evolution-message-composer.xml.h:38
+#, fuzzy
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Alternar a exibiГЦo da barra de pastas"
+
+#: ui/evolution-message-composer.xml.h:39
+#, fuzzy
+msgid "Toggles whether the CC field is displayed"
+msgstr "Alternar a exibiГЦo da barra de pastas"
+
 #: ui/evolution-message-composer.xml.h:40
-msgid "_Insert text file... (FIXME)"
-msgstr "_Inserir arquivo texto... (FIXME)"
+#, fuzzy
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Alternar a exibiГЦo da barra de pastas"
 
 #: ui/evolution-message-composer.xml.h:41
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "Incluir anexo..."
+
+#: ui/evolution-message-composer.xml.h:43
+msgid "_Bcc Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:44
+msgid "_Cc Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "_Depurar"
+
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Delete all"
+msgstr "_Excluir"
+
+#: ui/evolution-message-composer.xml.h:50
+msgid "_From Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
+msgid "_Insert"
+msgstr "_Inserir"
+
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:53
+#, fuzzy
+msgid "_Reply-To Field"
+msgstr "Responder-a:"
+
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "_SeguranГa"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "Aj_uda"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Adicionar pasta em sua lista de pastas assinadas"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:2
+msgid "F_older"
+msgstr "_Pasta"
+
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Atualizar lista"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Atualizar lista de pastas"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Remover pasta de sua lista de pastas assinadas"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Assinar"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Cancelar a assinatura"
 
+#: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Task"
+msgstr "Cancelar"
+
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "Exclui a tarefa"
+
+#: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Re_fresh Task"
+msgstr "Atualizar lista"
+
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "Copy selected task"
+msgstr "Copiar a seleГЦo"
+
+#: ui/evolution-tasks.xml.h:4
+msgid "Create a new task"
+msgstr "Criar uma nova tarefa"
+
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "Exclui a tarefa"
+
+#: ui/evolution-tasks.xml.h:7
+#, fuzzy
+msgid "Delete selected tasks"
+msgstr "Exclui a tarefa"
+
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
+msgid "New Task"
+msgstr "FIXME: _Nova tarefa"
+
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "Colar a Аrea de transferЙncia"
+
+#: ui/evolution-tasks.xml.h:12
+msgid "Save task as something else"
+msgstr "Salvar tarefa como outra coisa"
+
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "_ConfiguraГУes"
+
+#: ui/evolution-tasks.xml.h:19
+#, fuzzy
+msgid "_Task"
+msgstr "Tarefa"
+
 #: ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "Sobre o Evolution..."
 
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Fechar esta janela"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze..."
-msgstr "_Personalizar..."
+#: ui/evolution.xml.h:2
+#, fuzzy
+msgid "Add to _Shortcut Bar"
+msgstr "Es_conder a barra de atalhos"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Personalizar"
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the name of this folder"
+msgstr "Mudar a visualizaГЦo para %s"
 
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Personalizar barras de ferramentas"
+#, fuzzy
+msgid "Copy this folder"
+msgstr "Copiar para pasta"
 
 #: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "Criando nova pasta"
+
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "Remove este atalho da barra de atalhos"
+
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Criando nova pasta"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "Exclui este item"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Exibir uma pasta diferente"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "Sai_r"
 
-#: ui/evolution.xml.h:9
-msgid "Evolution bar _shortcut"
-msgstr "Barra de _atalhos do Evolution"
+#: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
 
-#: ui/evolution.xml.h:10
-msgid "Exit"
-msgstr "Sair"
+#: ui/evolution.xml.h:17
+#, fuzzy
+msgid "Evolution _Window"
+msgstr "Evolution"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Sair do programa"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "Primeiros passos"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Importar um formato de arquivo externo"
 
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "Barra de tarefas principal"
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "Mover %s para a esquerda"
 
-#: ui/evolution.xml.h:15
-msgid "Show information about Evolution"
-msgstr "Exibir informaГЦo sobre o Evolution"
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Open in New _Window"
+msgstr "_Abrir em uma nova janela"
 
-#: ui/evolution.xml.h:16
-msgid "Show the _Folder Bar"
-msgstr "Exibir a barra de _pastas"
+#: ui/evolution.xml.h:25
+msgid "Open this folder in an other window"
+msgstr ""
 
-#: ui/evolution.xml.h:17
-msgid "Show the _Shortcut Bar"
-msgstr "Exibir a barra de _atalhos"
+#: ui/evolution.xml.h:26
+msgid "Show information about Evolution"
+msgstr "Exibir informaГЦo sobre o Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Enviar relatСrio de erro"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "Enviar relatСrio de _erro"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "Enviar relatСrio de erro usando o Bug Buddy."
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:30
+msgid "Toggle"
+msgstr ""
+
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Alternar a exibiГЦo da barra de pastas"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Alternar a exibiГЦo da barra de atalhos"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:33
+msgid "Toggle whether we are working offline."
+msgstr ""
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "Usando o gerenciador de _contatos"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "Usando a _agenda"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "Usando o _correio"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr "Visualizar a pasta selecionada"
+
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "_Sobre o Evolution"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:41
 msgid "_Appointment (FIXME)"
 msgstr "_Compromisso (FIXME)"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:43
 msgid "_Contact (FIXME)"
 msgstr "_Contato (FIXME)"
 
-#: ui/evolution.xml.h:32
-msgid "_Folder"
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Copiar"
+
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder Bar"
 msgstr "_Pasta"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Ir para pasta..."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "_Importar arquivo..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "_Indexar"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "_Mensagem de correio"
 
-#: ui/evolution.xml.h:39
-msgid "_Settings"
-msgstr "_ConfiguraГУes"
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "Mover"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Novo"
+
+#: ui/evolution.xml.h:57
+#, fuzzy
+msgid "_New Folder"
+msgstr "Nova pasta virtual"
+
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Substituir..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:59
+msgid "_Shortcut"
+msgstr ""
+
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut Bar"
+msgstr "Es_conder a barra de atalhos"
+
+#: ui/evolution.xml.h:61
 msgid "_Task (FIXME)"
 msgstr "_Tarefa (FIXME)"
 
+#: ui/evolution.xml.h:64
+#, fuzzy
+msgid "_Work Offline"
+msgstr "Trabalhando"
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "_Sobre o Evolution"
+
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "Address Cards"
+msgstr "EndereГo _2:"
+
+#: views/addressbook/galview.xml.h:2
+#, fuzzy
+msgid "By Company"
+msgstr "Empresa"
+
+#: views/addressbook/galview.xml.h:3
+#, fuzzy
+msgid "Phone List"
+msgstr "Tipos de telefone"
+
+#: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "By Sender"
+msgstr "Remetente"
+
+#: views/mail/galview.xml.h:2
+#, fuzzy
+msgid "By Status"
+msgstr "Estado"
+
+#: views/mail/galview.xml.h:3
+#, fuzzy
+msgid "By Subject"
+msgstr "Assunto"
+
+#: views/mail/galview.xml.h:4
+#, fuzzy
+msgid "Messages"
+msgstr "_Mensagem"
+
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With Category"
+msgstr "Categoria:"
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B, %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Preliminar"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Ocupado"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "Fora do escritСrio"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr "Sem informaГЦo"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr "_Convidar outros..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 msgid "_Options"
 msgstr "_OpГУes"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
 msgstr "Exibir apenas _horas do expediente"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr "Exibir com _menos ampliaГЦo"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
 msgstr "_Atualizar livre/ocupado"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
 msgstr "_Autoescolher"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
 msgstr "_Todas as pessoas e recursos"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr "Todas as _pessoas e um recurso"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
 msgstr "Pessoas _necessАrias"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
 msgstr "Pessoas necessАrias e _um recurso"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 msgid "Meeting _start time:"
 msgstr "Hora de _inМcio da reuniЦo:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 msgid "Meeting _end time:"
 msgstr "Hora de _tИrmino da reuniЦo:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
 msgstr "Todos os participantes"
 
+#: widgets/menus/gal-view-menus.c:218
+#, fuzzy
+msgid "_Current View"
+msgstr "o instante atual"
+
+#: widgets/menus/gal-view-menus.c:259
+msgid "Define Views"
+msgstr ""
+
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "STQQSSD"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr "%B %Y"
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
+msgid "Now"
+msgstr "Agora"
+
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Hoje"
+
+#: widgets/misc/e-cell-date-edit.c:248
+msgid "OK"
+msgstr ""
+
+#: widgets/misc/e-cell-date-edit.c:731
+#, fuzzy, c-format
+msgid "The time must be in the format: %s"
+msgstr ""
+"A data deve ser fornecida no formato: \n"
+"\n"
+"%s"
+
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "semana"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+msgid "Turkish"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "Opcional"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+msgid "New"
+msgstr "Novo"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Erro desconhecido: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "Outro"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
+#: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Agora"
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Editor de contatos"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
+#: widgets/misc/e-filter-bar.c:173
+#, fuzzy
+msgid "Save Search"
+msgstr "Buscar"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
+#: widgets/misc/e-filter-bar.c:241
+#, fuzzy
+msgid "Advanced Search"
+msgstr "AvanГado"
+
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "Exibir todos"
+
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "AvanГado..."
+
+#: widgets/misc/e-messagebox.c:152
+#, fuzzy
+msgid "Information"
+msgstr "Sem informaГЦo"
+
+#: widgets/misc/e-messagebox.c:159
+#, fuzzy
+msgid "Warning"
+msgstr "Trabalhando"
+
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Erro"
 
-#: widgets/misc/e-search-bar.c:176
+#: widgets/misc/e-messagebox.c:173
+#, fuzzy
+msgid "Question"
+msgstr "DescriГЦo"
+
+#: widgets/misc/e-messagebox.c:180
+#, fuzzy
+msgid "Message"
+msgstr "_Mensagem"
+
+#. Add the "Don't show this message again." checkbox
+#: widgets/misc/e-messagebox.c:224
+#, fuzzy
+msgid "Don't show this message again."
+msgstr "Enviar esta mensagem agora"
+
+#: widgets/misc/e-search-bar.c:155
 msgid "Sear_ch"
 msgstr "_Buscar"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Grupo %i"
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
+#, fuzzy
+msgid "The Personal Addressbook Server"
+msgstr "Fontes de catАlogos de endereГos"
 
-#: evolution.desktop.in:4
-msgid "The Evolution groupware suite"
-msgstr "SuМte do grupo Evolution"
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
+msgid "The Personal Calendar Server; calendar factory"
+msgstr ""
+
+#: wombat/wombat.c:173
+#, fuzzy
+msgid "setup_vfs(): could not initialize GNOME-VFS"
+msgstr "NЦo foi possМvel iniciar Gnome"
+
+#: wombat/wombat.c:185
+#, fuzzy
+msgid "init_corba(): could not initialize GNOME"
+msgstr "NЦo foi possМvel iniciar Gnome"
+
+#: wombat/wombat.c:198
+#, fuzzy
+msgid "init_bonobo(): could not initialize Bonobo"
+msgstr "NЦo foi possМvel iniciar Bonobo"
+
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "Mudar preferЙncias"
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "PreferЙncias da tarefa..."
+
+#~ msgid "Add Service"
+#~ msgstr "Adicionar serviГo"
+
+#~ msgid "Add a new service to the Executive Summary"
+#~ msgstr "Adicionar um novo serviГo ao Executive Summary"
+
+#~ msgid "Executive Summary Settings..."
+#~ msgstr "ConfiguraГУes do Executive Summary..."
+
+#~ msgid "New Mail"
+#~ msgstr "Nova mensagem"
+
+#~ msgid ""
+#~ "You can select a different HTML page for the background of the Executive "
+#~ "Summary.\n"
+#~ "\n"
+#~ "Just leave it blank for the default"
+#~ msgstr ""
+#~ "VocЙ pode selecionar uma pАgina HTML diferente para o fundo do Executive "
+#~ "Summary.\n"
+#~ "\n"
+#~ "Apenas deixe-o vazio para o padrЦo"
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "Abrir %s com o aplicativo Gnome padrЦo"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "Abrir %s com o navegador web Gnome padrЦo"
+
+#~ msgid "Run %s"
+#~ msgstr "Executar %s"
+
+#~ msgid "Close %s"
+#~ msgstr "Fechar %s"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "Mover %s para a direita"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Mover %s para a linha anterior"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "Mover %s para a prСxima linha"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "NЦo И possМvel abrir o arquivo HTML:\n"
+#~ "%s"
+
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "Arquivo nЦo possui um lugar para os serviГos.\n"
+
+#~ msgid ""
+#~ "Executive summary component could not initialize Bonobo.\n"
+#~ "If there was a warning message about the RootPOA, it probably means\n"
+#~ "you compiled Bonobo against GOAD instead of OAF."
+#~ msgstr ""
+#~ "O componente Executive Summary nЦo pode iniciar o Bonobo.\n"
+#~ "Se ocorreu uma mensagem de alerta sobre o RootPOA, isto provavelmente\n"
+#~ "significa vocЙ compilou Bonobo com GOAD no lugar de OAF."
+
+#~ msgid "Connect to server"
+#~ msgstr "Conectar ao servidor"
+
+#~ msgid "About this application"
+#~ msgstr "Sobre este aplicativo"
+
+#~ msgid "About..."
+#~ msgstr "Sobre..."
+
+#~ msgid "C_lear"
+#~ msgstr "_Limpar"
+
+#~ msgid "Dump XML"
+#~ msgstr "Descarregar XML"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "Descarregar a descriГЦo de IU XML"
+
+#~ msgid "FIXME: Address _Book..."
+#~ msgstr "FIXME: _CatАlogo de endereГos..."
+
+#~ msgid "FIXME: Assig_n Task"
+#~ msgstr "FIXME: Atri_buir tarefa"
+
+#~ msgid "FIXME: Ch_oose Form..."
+#~ msgstr "FIXME: Escolher _formulАrio..."
+
+#~ msgid "FIXME: Chec_k Names"
+#~ msgstr "FIXME: _Verificar nomes"
+
+#~ msgid "FIXME: Cop_y to Folder..."
+#~ msgstr "FIXME: _Copiar para pasta..."
+
+#~ msgid "FIXME: D_esign a Form..."
+#~ msgstr "FIXME: _Projetar um formulАrio..."
+
+#~ msgid "FIXME: Define Print _Styles"
+#~ msgstr "FIXME: Definir estilos de _impressЦo"
+
+#~ msgid "FIXME: Desi_gn This Form"
+#~ msgstr "FIXME: Pro_jetar este formulАrio"
+
+#~ msgid "FIXME: Fi_rst Item in Folder"
+#~ msgstr "FIXME: P_rimeiro item na pasta"
+
+#~ msgid "FIXME: For_ward"
+#~ msgstr "FIXME: E_ncaminhar"
+
+#~ msgid "FIXME: Help"
+#~ msgstr "FIXME: Ajuda"
+
+#~ msgid "FIXME: In_complete Task"
+#~ msgstr "FIXME: Tarefa imcom_pleta"
+
+#~ msgid "FIXME: It_em..."
+#~ msgstr "FIXME: It_em..."
+
+#~ msgid "FIXME: Meeting Re_quest"
+#~ msgstr "FIXME: _Pedido de reuniЦo"
+
+#~ msgid "FIXME: Paste _Special... "
+#~ msgstr "FIXME: Colar e_special..."
+
+#~ msgid "FIXME: Print Pre_view"
+#~ msgstr "FIXME: Visuali_zar impressЦo"
+
+#~ msgid "FIXME: Pu_blish Form As..."
+#~ msgstr "FIXME: Pu_blicar formulАrio como..."
+
+#~ msgid "FIXME: Publish _Form..."
+#~ msgstr "FIXME: Publicar _formulАrio..."
+
+#~ msgid "FIXME: Rec_urrence..."
+#~ msgstr "FIXME: _RepetiГЦo..."
+
+#~ msgid "FIXME: Reply to A_ll"
+#~ msgstr "FIXME: Responder a _todos"
+
+#~ msgid "FIXME: S_end"
+#~ msgstr "FIXME: En_viar"
+
+#~ msgid "FIXME: S_end Status Report"
+#~ msgstr "FIXME: En_viar relatСrio de estado"
+
+#~ msgid "FIXME: S_kip Occurrence"
+#~ msgstr "FIXME: Pu_lar ocorrЙncia"
+
+#~ msgid "FIXME: Save Attac_hments..."
+#~ msgstr "FIXME: Salvar ane_xo..."
+
+#~ msgid "FIXME: Script _Debugger"
+#~ msgstr "FIXME: _Depurador de scripts"
+
+#~ msgid "FIXME: Task _Request"
+#~ msgstr "FIXME: _Pedido de tarefa"
+
+#~ msgid "FIXME: _Appointment"
+#~ msgstr "FIXME: _Compromisso"
+
+#~ msgid "FIXME: _Contact"
+#~ msgstr "FIXME: _Contato"
+
+#~ msgid "FIXME: _Customize..."
+#~ msgstr "FIXME: _Personalizar..."
+
+#~ msgid "FIXME: _File..."
+#~ msgstr "FIXME: _Arquivo..."
+
+#~ msgid "FIXME: _Font..."
+#~ msgstr "FIXME: _Fonte..."
+
+#~ msgid "FIXME: _Formatting"
+#~ msgstr "FIXME: _FormataГЦo"
+
+#~ msgid "FIXME: _Item"
+#~ msgstr "FIXME: _Item"
+
+#~ msgid "FIXME: _Journal Entry"
+#~ msgstr "FIXME: Item de _diАrio"
+
+#~ msgid "FIXME: _Last Item in Folder"
+#~ msgstr "FIXME: зl_timo item na pasta"
+
+#~ msgid "FIXME: _Mail Message"
+#~ msgstr "FIXME: _Mensagem de correio"
+
+#~ msgid "FIXME: _Mark Complete"
+#~ msgstr "FIXME: _Marcar como cumprida"
+
+#~ msgid "FIXME: _Memo Style"
+#~ msgstr "FIXME: Estilo de _memorando"
+
+#~ msgid "FIXME: _Move to Folder..."
+#~ msgstr "FIXME: _Mover para pasta..."
+
+#~ msgid "FIXME: _Object..."
+#~ msgstr "FIXME: _Objeto..."
+
+#~ msgid "FIXME: _Paragraph..."
+#~ msgstr "FIXME: _ParАgrafo..."
+
+#~ msgid "FIXME: _Reply"
+#~ msgstr "FIXME: _Responder"
+
+#~ msgid "FIXME: _Spelling..."
+#~ msgstr "FIXME: _Ortografia..."
+
+#~ msgid "FIXME: _Standard"
+#~ msgstr "FIXME: _PadrЦo"
+
+#~ msgid "FIXME: _Task"
+#~ msgstr "FIXME: _Tarefa"
+
+#~ msgid "FIXME: _Unread Item"
+#~ msgstr "FIXME: Item _nЦo lido"
+
+#~ msgid "FIXME: _note"
+#~ msgstr "FIXME: _nota"
+
+#~ msgid "Find _Again"
+#~ msgstr "Localizar _novamente"
+
+#~ msgid "Go to the next item"
+#~ msgstr "Vai para o prСximo item"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "Vai para o item anterior"
+
+#~ msgid "N_ext"
+#~ msgstr "P_rСximo"
+
+#~ msgid "Pre_vious"
+#~ msgstr "An_terior"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "Configurar i_mpressЦo..."
+
+#~ msgid "Redo"
+#~ msgstr "Refazer"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Refazer a aГЦo desfeita"
+
+#~ msgid "Replace"
+#~ msgstr "Substituir"
+
+#~ msgid "Replace a string"
+#~ msgstr "Substituir uma expressЦo"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "Buscar novamente pela mesma espressЦo"
+
+#~ msgid "Select everything"
+#~ msgstr "Selecionar tudo"
+
+#~ msgid "Undo"
+#~ msgstr "Desfazer"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Desfazer a Зltima aГЦo"
+
+#~ msgid "_About..."
+#~ msgstr "_Sobre..."
+
+#~ msgid "_Find..."
+#~ msgstr "_Localizar..."
+
+#~ msgid "_Forms"
+#~ msgstr "_FormulАrios"
+
+#~ msgid "_Object"
+#~ msgstr "_Objeto"
+
+#~ msgid "_Redo"
+#~ msgstr "_Refazer"
+
+#~ msgid "_Toolbars"
+#~ msgstr "_Barras de ferramentas"
+
+#~ msgid "_Undo"
+#~ msgstr "_Desfazer"
+
+#~ msgid "Synchronize"
+#~ msgstr "Sincronizar"
+
+#~ msgid "Copy From Pilot"
+#~ msgstr "Copiar a partir do pilot"
+
+#~ msgid "Copy To Pilot"
+#~ msgstr "Copiar para o pilot"
+
+#~ msgid "Merge From Pilot"
+#~ msgstr "Mesclar a partir do pilot"
+
+#~ msgid "Merge To Pilot"
+#~ msgstr "Mesclar para o pilot"
+
+#~ msgid "JP Rosevear <jpr@helixcode.com>"
+#~ msgstr "JP Rosevear <jpr@helixcode.com>"
+
+#~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+#~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
+
+#~ msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+#~ msgstr "(C) 1998-2000 the Free Software Foundation and Helix Code"
+
+#~ msgid "gnome-unknown.xpm"
+#~ msgstr "gnome-unknown.xpm"
+
+#~ msgid "Synchronize Action"
+#~ msgstr "AГЦo ao sincronizar"
+
+#~ msgid "Conduit state"
+#~ msgstr "Estado do canal"
+
+#~ msgid ""
+#~ "No pilot configured, please choose the\n"
+#~ "'Pilot Link Properties' capplet first."
+#~ msgstr ""
+#~ "Nenhum pilot configurado, por favor visite primeiramente\n"
+#~ "o painel Pilot Link na central de controle."
+
+#~ msgid "Not connected to the gnome-pilot daemon"
+#~ msgstr "NЦo conectado ao daemon Gnome Pilot"
+
+#~ msgid ""
+#~ "An error occured when trying to fetch\n"
+#~ "pilot list from the gnome-pilot daemon"
+#~ msgstr ""
+#~ "Ocorreu um erro ao tentar ler a lista de\n"
+#~ "pilots a partir do daemon Gnome Pilot"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "Co_ntatos..."
+
+#~ msgid "_Company:"
+#~ msgstr "E_mpresa:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Mr.\n"
+#~ "Mrs.\n"
+#~ "Ms.\n"
+#~ "Miss\n"
+#~ "Dr.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Sra.\n"
+#~ "Srta.\n"
+#~ "Senhorita\n"
+#~ "Dr.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Jr.\n"
+#~ "I\n"
+#~ "II\n"
+#~ "III\n"
+#~ "Esq.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Jr.\n"
+#~ "I\n"
+#~ "II\n"
+#~ "III\n"
+#~ "Esq.\n"
+
+#~ msgid "As _Minicards"
+#~ msgstr "Como _minicartУes"
+
+#~ msgid "As _Table"
+#~ msgstr "Como _tabela"
+
+#~ msgid ""
+#~ "We were unable to open this addressbook.  This either\n"
+#~ "means you have entered an incorrect URI, or have tried\n"
+#~ "to access an LDAP server and don't have LDAP support\n"
+#~ "compiled in.  If you've entered a URI, check the URI for\n"
+#~ "correctness and reenter.  If not, you probably have\n"
+#~ "attempted to access an LDAP server.  If you wish to be\n"
+#~ "able to use LDAP, you'll need to download and install\n"
+#~ "OpenLDAP and recompile and install Evolution.\n"
+#~ msgstr ""
+#~ "NЦo foi possМvel abrir este catАlogo de endereГos. Isto \n"
+#~ "significa que vocЙ forneceu uma URI incorreta ou tentou\n"
+#~ "acessar um servidor LDAP sem que o suporte para LDAP esteja\n"
+#~ "compilado. Se vocЙ entrou uma URI, verifique a URI e tente \n"
+#~ "novamente. Caso contrАrio, vocЙ provavelmente tentou\n"
+#~ "acessar um servidor LDAP. Se vocЙ quiser usar LDAP, vocЙ\n"
+#~ "vai precisar baixar e instalar OpenLDAP e recompilar e\n"
+#~ "instalar Evolution.\n"
+
+#~ msgid "SASL"
+#~ msgstr "SASL"
+
+#~ msgid "Find..."
+#~ msgstr "Localizar..."
+
+#~ msgid "label26"
+#~ msgstr "label26"
+
+#~ msgid "Evolution ToDo Conduit"
+#~ msgstr "Canal para tarefas do Evolution"
+
+#~ msgid "Configuration utility for the evolution todo conduit.\n"
+#~ msgstr "UtilitАrio de configuraГЦo do canal para tarefas do Evolution.\n"
+
+#~ msgid "Open calendar"
+#~ msgstr "Abrir agenda"
+
+#~ msgid "Save calendar"
+#~ msgstr "Salvar agenda"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#~ msgid "The priority must be between 1 and 9, inclusive"
+#~ msgstr "A prioridade deve estar entre 1 e 9, inclusive"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>Erro ao carregar agenda:<br>MИtodo nЦo suportado"
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "Alarmes param apСs"
+
+#~ msgid "Enable snoozing for"
+#~ msgstr "Permitir adiamento por"
+
+#~ msgid "Highlight"
+#~ msgstr "RealГar"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "Tarefas com prazo para hoje"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Tarefas com prazo ainda nЦo vencido"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Tarefas com prazo ainda nЦo vencido"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "Tarefas atrasadas"
+
+#~ msgid "TaskPad"
+#~ msgstr "Tarefas"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Tempo atИ o prazo"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Alarmes visuais"
+
+#~ msgid "C_lassification:"
+#~ msgstr "C_lassificaГЦo:"
+
+#~ msgid "S_ummary"
+#~ msgstr "_Resumo"
+
+#~ msgid "task-editor-dialog"
+#~ msgstr "task-editor-dialog"
+
+#~ msgid "Edit Task"
+#~ msgstr "Editar tarefa"
+
+#~ msgid "Precent complete"
+#~ msgstr "Porcentagem cumprida"
+
+#~ msgid "Open..."
+#~ msgstr "Abrir..."
+
+#~ msgid "Open the task"
+#~ msgstr "Abre a tarefa"
+
+#~ msgid "Mark the task complete"
+#~ msgstr "Marca a tarefa como cumprida"
+
+#~ msgid "Edit this appointment..."
+#~ msgstr "Editar este compromisso..."
+
+#~ msgid "Appointment Basics"
+#~ msgstr "BАsico do compromisso"
+
+#~ msgid "Hours"
+#~ msgstr "Horas"
+
+#~ msgid "Mail _to:"
+#~ msgstr "Co_rreio para:"
+
+#~ msgid "Minutes"
+#~ msgstr "Minutos"
+
+#~ msgid "_Audio"
+#~ msgstr "_Audio"
+
+#~ msgid "_Mail"
+#~ msgstr "_Correio"
+
+#~ msgid "_Program"
+#~ msgstr "_Programa"
+
+#~ msgid "_Starting date:"
+#~ msgstr "Data de _inМcio:"
+
+#~ msgid "event-editor-dialog"
+#~ msgstr "event-editor-dialog"
+
+#~ msgid "label21"
+#~ msgstr "label21"
+
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "NЦo foi possМvel testar arquivo de bloqueio para %s: %s"
+
+#~ msgid "No such host %s."
+#~ msgstr "NЦo existe a mАquina %s."
+
+#~ msgid "Temporarily unable to look up hostname %s."
+#~ msgstr "NЦo И possМvel temporariamente procurar nome de mАquina %s."
+
+#~ msgid "URL string `%s' contains no protocol"
+#~ msgstr "A URL `%s' nЦo possui um protocolo"
+
+#~ msgid "URL string `%s' contains an invalid protocol"
+#~ msgstr "A URL `%s' contИm um protocolo invАlido"
+
+#~ msgid "Port number in URL `%s' is non-numeric"
+#~ msgstr "NЗmero de porta na URL `%s' nЦo И nЗmerico"
+
+#~ msgid "Local stores do not have a default folder"
+#~ msgstr "RepositСrios locais nЦo possuem uma pasta padrЦo"
+
+#~ msgid ""
+#~ "This option will connect to the SMTP server without using any kind of "
+#~ "authentication. This should be fine for connecting to most SMTP servers."
+#~ msgstr ""
+#~ "Esta opГЦo conectarА ao servidor SMTP sem usar qualquer tipo de "
+#~ "autenticaГЦo. Isto deve ser adequado para conectar Ю maioria dos servidores "
+#~ "SMTP."
+
+#~ msgid "Inline attachment"
+#~ msgstr "Anexo embutido"
+
+#~ msgid "Enter the identity you wish to send this message from"
+#~ msgstr "Entre a identidade com a qual vocЙ deseja enviar esta mensagem"
+
+#~ msgid "Enter the subject of the mail"
+#~ msgstr "Entre o assunto da correspondЙncia"
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "NЦo foi possМvel abrir arquivo de assinatura %s:\n"
+#~ "%s"
+
+#~ msgid "Save changes to message..."
+#~ msgstr "Salvar modificaГУes Ю mensagem..."
+
+#~ msgid "Error saving composition to 'Drafts': %s"
+#~ msgstr "Erro ao salvar mensagem para 'Drafts': %s"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "Este nЦo И um arquivo comum."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "Este arquivo aparenta ser acessМvel mas open(2) falhou."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "O arquivo И muito grande (mais que 100K).\n"
+#~ "VocЙ tem certeza que deseja inserМ-lo?"
+
+#~ msgid "Edit Filter Rule"
+#~ msgstr "Editar regra de filtro"
+
+#~ msgid "Remove criterion"
+#~ msgstr "Remover critИrio"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Encaminhar para endereГo"
+
+#~ msgid "Add VFolder Rule"
+#~ msgstr "Adicionar regra de pasta virtual"
+
+#~ msgid "Edit VFolder Rule"
+#~ msgstr "Editar regra de pasta virtual"
+
+#~ msgid "Body or subject contains"
+#~ msgstr "Corpo ou assunto contИm"
+
+#~ msgid "Body contains"
+#~ msgstr "Corpo contИm"
+
+#~ msgid "Subject contains"
+#~ msgstr "Assunto contИm"
+
+#~ msgid "Body does not contain"
+#~ msgstr "Corpo nЦo contИm"
+
+#~ msgid "Subject does not contain"
+#~ msgstr "Assunto nЦo contИm"
+
+#~ msgid "Sender contains"
+#~ msgstr "Remetente contИm"
+
+#~ msgid "VFolder on Sender"
+#~ msgstr "Pasta virtual por remetente"
+
+#~ msgid "VFolder on Recipients"
+#~ msgstr "Pasta virtual por destinatАrios"
+
+#~ msgid "Move to Folder..."
+#~ msgstr "Mover para pasta..."
+
+#~ msgid "Copy to Folder..."
+#~ msgstr "Copiar para pasta..."
+
+#~ msgid ""
+#~ "One or more of your servers are not configured correctly.\n"
+#~ "Do you wish to save anyway?"
+#~ msgstr ""
+#~ "Um ou mais dos seus servidores nЦo estЦo configurados corretamente.\n"
+#~ "VocЙ deseja salvar de qualquer forma?"
+
+#~ msgid "Account Properties"
+#~ msgstr "Propriedades de conta"
+
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "ConfiguraГЦo de correio do Evolution"
+
+#~ msgid "Incoming Mail Server"
+#~ msgstr "Servidor de correio de entrada"
+
+#~ msgid "Kerberos"
+#~ msgstr "Kerberos"
+
+#~ msgid "Mail Account"
+#~ msgstr "Conta de correio"
+
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "Assitente de configuraГЦo de correio"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Diversos"
+
+#~ msgid "Outgoing Mail Server"
+#~ msgstr "Servidor de correio de saМda"
+
+#~ msgid "Plain Text"
+#~ msgstr "Texto claro"
+
+#~ msgid "Remember my password"
+#~ msgstr "Lembre a minha senha"
+
+#~ msgid "Required"
+#~ msgstr "Exigido"
+
+#~ msgid "Save password"
+#~ msgstr "Salvar senha"
+
+#~ msgid "Servers"
+#~ msgstr "Servidores"
+
+#~ msgid ""
+#~ "Type the name by which you would like to refer to these servers. For "
+#~ "example: \"Work\" or \"Home\"."
+#~ msgstr ""
+#~ "Digite o nome com o qual deseja identificar estes servidores. Por exemplo: "
+#~ "\"Trabalho\" ou \"Casa\"."
+
+#~ msgid ""
+#~ "Failed to verify the incoming mail configuration.\n"
+#~ "You may experience problems retrieving your mail from %s"
+#~ msgstr ""
+#~ "Falha ao verificar a configuraГЦo de recebimento de correio.\n"
+#~ "VocЙ pode enfrentar problemas ao recuperar mensagens de %s"
+
+#~ msgid ""
+#~ "Failed to verify the outgoing mail configuration.\n"
+#~ "You may experience problems sending your mail using %s"
+#~ msgstr ""
+#~ "Falha ao verificar a configuraГЦo de envio de correio.\n"
+#~ "VocЙ pode enfrentar problemas ao enviar mensagens usando %s"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "Alterar pasta \"%s\" para o formato \"%s\""
+
+#~ msgid "Closing current folder"
+#~ msgstr "Fechando pasta atual"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Renomeando pasta antiga e abrindo"
+
+#~ msgid "Registering local folder"
+#~ msgstr "Registrando pasta local"
+
+#~ msgid "Appending \"%s\""
+#~ msgstr "Concatenando \"%s\""
+
+#~ msgid "Moving messages from \"%s\" into \"%s\""
+#~ msgstr "Movendo mensagens de \"%s\" para \"%s\""
+
+#~ msgid "Copying messages from \"%s\" into \"%s\""
+#~ msgstr "Copiando mensagens de \"%s\" para \"%s\""
+
+#~ msgid "Move messages from \"%s\" into \"%s\""
+#~ msgstr "Mover mensagens de \"%s\" para \"%s\""
+
+#~ msgid "Copy messages from \"%s\" into \"%s\""
+#~ msgstr "Copiar mensagens de \"%s\" para \"%s\""
+
+#~ msgid "%s message %d of %d (uid \"%s\")"
+#~ msgstr "%s mensagem %d de %d (uid \"%s\")"
+
+#~ msgid "(No description)"
+#~ msgstr "(Sem descriГЦo)"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Recuperando mensagem nЗmero %d de %d (uid \"%s\")"
+
+#~ msgid "Loading %s Folder for %s"
+#~ msgstr "Carregando pasta %s para %s"
+
+#~ msgid "Load %s Folder for %s"
+#~ msgstr "Carregar pasta %s para %s"
+
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "Mensagem incompleta escrita no pipe!"
+
+#~ msgid ""
+#~ "Error while `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Erro enquanto `%s':\n"
+#~ "%s"
+
+#~ msgid "Error reading commands from dispatching thread."
+#~ msgstr "Erro ao ler comandos da thread de envio."
+
+#~ msgid "Corrupted message from dispatching thread?"
+#~ msgstr "Mensagem corrompida da thread de envio?"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (mensagem encaminhada)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Enc: (sem assunto)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Mensagem encaminhada (sem assunto)"
+
+#~ msgid "[ %s ]"
+#~ msgstr "[ %s ]"
+
+#~ msgid "%s, et al."
+#~ msgstr "%s, et al."
+
+#~ msgid "<unknown>"
+#~ msgstr "<desconhecido>"
+
+#~ msgid "Get store for \"%s\""
+#~ msgstr "Obter repositСrio para \"%s\""
+
+#~ msgid "Unsubscribe from folder \"%s\""
+#~ msgstr "Cancelar a assinatura da pasta \"%s\""
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Arquivos do Evolution instalados com sucesso."
+
+#~ msgid "Activate"
+#~ msgstr "Ativar"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "Ativa este atalho"
+
+#~ msgid ""
+#~ "Hi.  Thanks for taking the time to download this preview release\n"
+#~ "of the Evolution groupware suite.\n"
+#~ "\n"
+#~ "Over the time since the past release, our focus has been on making\n"
+#~ "Evolution usable.  Many of the Evolution developers are now using\n"
+#~ "Evolution to read their mail full time. You could too. (Just\n"
+#~ "be sure to keep a backup.)\n"
+#~ "\n"
+#~ "But while we have fixed many bugs affecting its stability and\n"
+#~ "security, you still get the disclaimer:  Evolution will: crash,\n"
+#~ "lose your mail when you don't want it to, refuse to delete your\n"
+#~ "mail when you do want it to, leave stray processes running,\n"
+#~ "consume 100% CPU, race, lock, send HTML mail to random mailing\n"
+#~ "lists, and embarass you in front of your friends and co-workers.\n"
+#~ "Use only as directed.\n"
+#~ "\n"
+#~ "We hope that you enjoy the results of our hard work, and we eagerly\n"
+#~ "await your contributions!\n"
+#~ msgstr ""
+#~ "Hi.  Thanks for taking the time to download this preview release\n"
+#~ "of the Evolution groupware suite.\n"
+#~ "\n"
+#~ "Over the time since the past release, our focus has been on making\n"
+#~ "Evolution usable.  Many of the Evolution developers are now using\n"
+#~ "Evolution to read their mail full time. You could too. (Just\n"
+#~ "be sure to keep a backup.)\n"
+#~ "\n"
+#~ "But while we have fixed many bugs affecting its stability and\n"
+#~ "security, you still get the disclaimer:  Evolution will: crash,\n"
+#~ "lose your mail when you don't want it to, refuse to delete your\n"
+#~ "mail when you do want it to, leave stray processes running,\n"
+#~ "consume 100% CPU, race, lock, send HTML mail to random mailing\n"
+#~ "lists, and embarass you in front of your friends and co-workers.\n"
+#~ "Use only as directed.\n"
+#~ "\n"
+#~ "We hope that you enjoy the results of our hard work, and we eagerly\n"
+#~ "await your contributions!\n"
+
+#~ msgid "Disable."
+#~ msgstr "Desativar."
+
+#~ msgid "Find a contact"
+#~ msgstr "Localizar um contato"
+
+#~ msgid "View All"
+#~ msgstr "Visualizar todos"
+
+#~ msgid "View all contacts"
+#~ msgstr "Visualizar todos os contatos"
+
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "ConfiguraГЦo do catАlogo de _endereГos..."
+
+#~ msgid "_Print Contacts..."
+#~ msgstr "_Imprimir contatos..."
+
+#~ msgid "5 Days"
+#~ msgstr "5 dias"
+
+#~ msgid "Ca_lendar"
+#~ msgstr "A_genda"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Criar uma nova agenda"
+
+#~ msgid "Open a calendar"
+#~ msgstr "Abrir uma agenda"
+
+#~ msgid "Prev"
+#~ msgstr "Ant"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Salvar agenda como outra coisa"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Abrir agenda"
+
+#~ msgid "_Print this calendar"
+#~ msgstr "_Imprimir esta agenda"
+
+#~ msgid "FIXME: _New Appointment"
+#~ msgstr "FIXME: _Novo compromisso"
+
+#~ msgid "FIXME: _Note"
+#~ msgstr "FIXME: _Nota"
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "Agendar algum tipo de reuniЦo"
+
+#~ msgid "Create Rule"
+#~ msgstr "Criar regra"
+
+#~ msgid "Fi_lter on Sender"
+#~ msgstr "Filtro por _remetente"
+
+#~ msgid "Filter on Rec_ipients"
+#~ msgstr "Filtro por _destinatАrios"
+
+#~ msgid "Get Mail"
+#~ msgstr "Pegar correio"
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "Marcar como _lida"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Marcar como _nЦo lida"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Visualizar impressЦo da mensagem..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Imprime a mensagem na impressora"
+
+#~ msgid "Reply to _Sender"
+#~ msgstr "Responder ao _remetente"
+
+#~ msgid "S_ource"
+#~ msgstr "_Fonte"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "Ver o cСdigo fonte da mensagem"
+
+#~ msgid "_Configure Folder..."
+#~ msgstr "_Configurar pasta..."
+
+#~ msgid "_Filter on Subject"
+#~ msgstr "_Filtro por assunto"
+
+#~ msgid "_Mail Configuration..."
+#~ msgstr "_ConfiguraГЦo de correio..."
+
+#~ msgid "_Print Message"
+#~ msgstr "_Imprimir mensagem"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "_Salvar mensagem como..."
+
+#~ msgid "_Threaded"
+#~ msgstr "_Encadeado"
+
+#~ msgid "_VFolder on Subject"
+#~ msgstr "_Pasta virtual por assunto"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_Inserir arquivo texto... (FIXME)"
+
+#~ msgid "Customi_ze..."
+#~ msgstr "_Personalizar..."
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Barra de _atalhos do Evolution"
+
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "Exibir a barra de _pastas"
+
+#~ msgid "Show the _Shortcut Bar"
+#~ msgstr "Exibir a barra de _atalhos"
diff --git a/po/ro.po b/po/ro.po
index 91a6c2a505..9f69ca8229 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,19 +6,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.10\n"
-"POT-Creation-Date: 2001-04-26 10:52-0400\n"
-"POT-Creation-Date: 2001-06-26 10:52-0400\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "Last-Translator: Tiberiu Micu <tibimicu@gmx.net>\n"
 "Language-Team: RomБnЦ <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3269
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import VCard files into Evolution."
+msgstr "Configurarea importului fi╨ierelor GnomeCard in Evolution"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports VCard files into Evolution."
+msgstr "Import fi╨ierele GnomeCard Нn Evolution."
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Card: "
 
-#: addressbook/backend/ebook/e-card.c:3271
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -26,7 +35,7 @@ msgstr ""
 "\n"
 "Nume: "
 
-#: addressbook/backend/ebook/e-card.c:3272
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -34,7 +43,7 @@ msgstr ""
 "\n"
 "  Prefix:     "
 
-#: addressbook/backend/ebook/e-card.c:3273
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -42,7 +51,7 @@ msgstr ""
 "\n"
 "  Dat:        "
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -50,7 +59,7 @@ msgstr ""
 "\n"
 "  Suplimentar:  "
 
-#: addressbook/backend/ebook/e-card.c:3275
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -58,7 +67,7 @@ msgstr ""
 "\n"
 "  Familia:    "
 
-#: addressbook/backend/ebook/e-card.c:3276
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -66,7 +75,7 @@ msgstr ""
 "\n"
 "  Sufix:      "
 
-#: addressbook/backend/ebook/e-card.c:3290
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -74,7 +83,7 @@ msgstr ""
 "\n"
 "Data na╨terii:"
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -82,7 +91,7 @@ msgstr ""
 "\n"
 "Adresa:"
 
-#: addressbook/backend/ebook/e-card.c:3303
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -90,7 +99,7 @@ msgstr ""
 "\n"
 "  CЦsuЧa po╨talЦ:"
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -98,7 +107,7 @@ msgstr ""
 "\n"
 "  Ext:         "
 
-#: addressbook/backend/ebook/e-card.c:3305
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -106,7 +115,7 @@ msgstr ""
 "\n"
 "  Strada:      "
 
-#: addressbook/backend/ebook/e-card.c:3306
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -114,7 +123,7 @@ msgstr ""
 "\n"
 "  Ora╨:        "
 
-#: addressbook/backend/ebook/e-card.c:3307
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -122,7 +131,7 @@ msgstr ""
 "\n"
 "  Regiunea:    "
 
-#: addressbook/backend/ebook/e-card.c:3308
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -130,7 +139,7 @@ msgstr ""
 "\n"
 "  Cod po╨tal:  "
 
-#: addressbook/backend/ebook/e-card.c:3309
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -138,7 +147,7 @@ msgstr ""
 "\n"
 "  чara:        "
 
-#: addressbook/backend/ebook/e-card.c:3322
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
@@ -146,7 +155,7 @@ msgstr ""
 "\n"
 "Eticheta de livrare:"
 
-#: addressbook/backend/ebook/e-card.c:3334
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -154,7 +163,7 @@ msgstr ""
 "\n"
 "Telefoane:\n"
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -162,7 +171,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3361
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -170,7 +179,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3364
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -178,7 +187,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3383
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -186,25 +195,25 @@ msgstr ""
 "\n"
 "Program de mail:"
 
-#: addressbook/backend/ebook/e-card.c:3389
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3397
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3401
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3413
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -212,7 +221,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3414
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -220,7 +229,7 @@ msgstr ""
 "\n"
 "  Nume:  "
 
-#: addressbook/backend/ebook/e-card.c:3415
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -228,7 +237,7 @@ msgstr ""
 "\n"
 "  Unitate:"
 
-#: addressbook/backend/ebook/e-card.c:3416
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -236,7 +245,7 @@ msgstr ""
 "\n"
 "  Unitate2:"
 
-#: addressbook/backend/ebook/e-card.c:3417
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -244,7 +253,7 @@ msgstr ""
 "\n"
 "  Unitate3:"
 
-#: addressbook/backend/ebook/e-card.c:3418
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -252,7 +261,7 @@ msgstr ""
 "\n"
 "  Unitate4"
 
-#: addressbook/backend/ebook/e-card.c:3422
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -260,7 +269,7 @@ msgstr ""
 "\n"
 "Categorii:  "
 
-#: addressbook/backend/ebook/e-card.c:3423
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -278,7 +287,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3436
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -286,7 +295,7 @@ msgstr ""
 "\n"
 "╙ir unic:      "
 
-#: addressbook/backend/ebook/e-card.c:3439
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -294,23 +303,25 @@ msgstr ""
 "\n"
 "Cheia publicЦ:"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr "Configurarea importului fi╨ierelor GnomeCard in Evolution"
+#: addressbook/backend/ebook/e-card.c:4037
+#, fuzzy
+msgid "Multiple VCards"
+msgstr "Mesaje multiple"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "Import fi╨ierele GnomeCard Нn Evolution."
+#: addressbook/backend/ebook/e-card.c:4045
+#, fuzzy, c-format
+msgid "VCard for %s"
+msgstr "IntroduceЧi parola pentru %s"
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:40
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:57
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+#: addressbook/backend/ebook/load-pine-addressbook.c:22
+#: addressbook/backend/ebook/test-client-list.c:23
+#: addressbook/backend/ebook/test-client.c:33
+#: addressbook/conduit/address-conduit.c:1092
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Nu pot iniЧializa Bonobo"
 
@@ -322,743 +333,862 @@ msgstr "Nu pot НncЦrca cursorul\n"
 msgid "EBook not loaded\n"
 msgstr "EBook neНncЦrcat\n"
 
-#: addressbook/conduit/address-conduit.c:651
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Nu pot porni serverul wombat"
 
-#: addressbook/conduit/address-conduit.c:652
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:655
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Nu pot porni wombat"
 
-#: addressbook/conduit/address-conduit.c:684
 #: addressbook/conduit/address-conduit.c:687
+#: addressbook/conduit/address-conduit.c:690
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr "Control Bonobo pentru o adresЦ popup."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "Control Bonobo pentru afi╨area unei adrese."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "Control Bonobo de probЦ care afi╨eazЦ o agendЦ."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Control care afi╨eazЦ o agendЦ minicard pentru Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Vizualizare agendЦ minicard Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "ComponentЦ Evolution pentru manipulare contacte"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Configurare pentru controlul agendei minicard"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Configurare pentru afi╨orul agendei de adrese"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr "Configurare pentru componentele agendei Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "LDAP Server"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Fi╨ier"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Tip de agendЦ necunoscut"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "FЦrЦ (mod anonim)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Parola"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Tip de autorizare necunoscut"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "Baza"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "Unu"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "Subarbore"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Memorez aceastЦ parolЦ"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "GazdЦ:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr "FIXME Text ajutor gazdЦ"
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "DN rЦdЦcinЦ"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr "FIXME Text ajutor DN rЦdЦcinЦ"
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Port:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr "FIXME Text ajutor port"
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "Scop cЦutare:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Autentificare:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Cale:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr "FIXME Text ajutor cale"
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "Creez calea dacЦ nu existЦ."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "Editare agendЦ"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "AdЦugare agendЦ"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"AlegeЧi tipul de agendЦ pe care Нl aveЧi, ╨i introduceЧi informaЧiile "
+"relevante"
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Nume:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr "FIXME Text ajutor nume"
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Descriere:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr ""
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "AdaugЦ"
+msgid "Addressbook Sources"
+msgstr "Surse agendЦ"
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "╙terg"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Nume"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "_AdЦugare"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "_Editare"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "Alte contacte"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "IntroduceЧi parola pentru %s"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Nu pot deschide agenda"
+
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
+msgstr "Orice cБmp conЧine"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "Numele conЧine"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "Email-ul conЧine"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "Numele conЧine"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "URI pe care Folder Browser Нl va afi╨a"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "Email principal"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "Email 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "Email 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "Selectez un fi╨ier"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "CreazЦ contact nou"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "Editare agendЦ"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "Editare InformaЧii contact"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "AdЦugare la contacte"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "Adresa email:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "Dezactivare interogЦri"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Activare interogЦri (Periculos!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "InterfaЧa de selectare nume a agendei Evolution."
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr "Configurare interfaЧa de selectare nume a agendei"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "MutЦ"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "MutЦ tot"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "Trimitere mail"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Alte contacte"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "SelecЧie nume"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "SelecЧie nume din:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "Categorie:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_CautЦ"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "Ani_versare:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "Serviciu"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "_Fax serviciu"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "C_ontacte..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ca_tegorii..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Editor de contacte"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Detalii"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Fi╨ier ca..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "General"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Tip nou de telefon"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "No_tiЧe"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "OrganizaЧie:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Tipuri de telefon"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1271
-msgid "Primary Email"
-msgstr "Email principal"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "DoriЧi sa primiЧi mail-uri _HTML"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Adresa paginii de web:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
-msgstr "_AdЦugare"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "_Adresa..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "_Nume asistent:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "_Ziua de na╨tere:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Business"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Compania:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "_Contacte..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:60 ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_╙tergere"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "_Departament:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "_Nume complet..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_AcasЦ"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "_FuncЧia:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "_Nume manager:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_Mobil"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "_PoreclЦ:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "_Birou:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_Profesie:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "_SoЧ/soЧie:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "_Aceasta este adresa de expediere"
 
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 msgid "Delete Contact?"
 msgstr "╙terg persoana de contact?"
 
-#: addressbook/contact-editor/e-contact-editor.c:590
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "AceastЦ persoanЦ de contact aparЧine categoriilor:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1229
-#: addressbook/gui/widgets/e-addressbook-view.c:628
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Asistent"
 
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1297
-#: addressbook/gui/widgets/e-addressbook-view.c:608
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Serviciu"
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
-#: addressbook/gui/widgets/e-addressbook-view.c:615
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Serviciu 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1232
-#: addressbook/gui/widgets/e-addressbook-view.c:613
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Fax serviciu"
 
-#: addressbook/contact-editor/e-contact-editor.c:1233
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Rechemare"
 
-#: addressbook/contact-editor/e-contact-editor.c:1234
-#: addressbook/gui/widgets/e-addressbook-view.c:612
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Ma╨inЦ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Companie"
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
-#: addressbook/contact-editor/e-contact-editor.c:1298
-#: addressbook/gui/widgets/e-addressbook-view.c:609
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Adresa de acasЦ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1237
-#: addressbook/gui/widgets/e-addressbook-view.c:616
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Adresa de acasЦ 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1238
-#: addressbook/gui/widgets/e-addressbook-view.c:614
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Fax acasЦ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1239
-#: addressbook/gui/widgets/e-addressbook-view.c:617
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1240
-#: addressbook/gui/widgets/e-addressbook-view.c:611
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1241
-#: addressbook/contact-editor/e-contact-editor.c:1299
-#: addressbook/gui/widgets/e-addressbook-view.c:618
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Alte"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Alt Fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/gui/widgets/e-addressbook-view.c:619
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
-#: addressbook/gui/widgets/e-addressbook-view.c:607
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Principal"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
-#: addressbook/gui/widgets/e-addressbook-view.c:620
-msgid "Email 2"
-msgstr "Email 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1273
-#: addressbook/gui/widgets/e-addressbook-view.c:621
-msgid "Email 3"
-msgstr "Email 3"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:225
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Contact AdЦugare-RapidЦ"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:227
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "Editare completЦ"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:268
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Nume complet"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:274
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresa _2"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Canada"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "VerificЦ adresa"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "_чara"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Finlanda"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "SUA"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Adresa:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_Localitate:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "_CЦsuЧa po╨talЦ:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "_Stat/Provincie"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "Cod _po╨tal:"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Verificare nume"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Esq."
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "D-ra."
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Dl."
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "D-na."
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Prenume:"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_Nume:"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_IniЧiala tatЦlui:"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_Sufix:"
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Titlu:"
 
-#: addressbook/gui/component/addressbook.c:241
-msgid "As _Minicards"
-msgstr "Ca Minicard"
-
-#: addressbook/gui/component/addressbook.c:247
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Ca tabel"
-
-#: addressbook/gui/component/addressbook.c:399
-#, c-format
-msgid "Enter password for %s"
-msgstr "IntroduceЧi parola pentru %s"
-
-#: addressbook/gui/component/addressbook.c:427
-msgid "Unable to open addressbook"
-msgstr "Nu pot deschide agenda"
-
-#: addressbook/gui/component/addressbook.c:432
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Nu pot deschide agenda. Aceasta inseamnЦ\n"
-"cЦ aЧi introdus URI incorect sau aЧi Нncercat\n"
-"sЦ accesaЧi un server LDAP ╨i "
-"nu aveЧi compilat suport pentru acesta.\n"
-"DacЦ aЧi introdus URI, verificaЧi corectitudinea si reintroduceЧi.\n"
-"DacЦ nu, probabil aЧi Нncercat sЦ accesaЧi un server LDAP.\n"
-"DacЦ doriЧi sЦ folosiЧi LDAP, trebuie sЦ descЦrcaЧi ╨i sЦ\n"
-"instalaЧi OpenLDAP ╨i sЦ recompilaЧi ╨i instalaЧi Evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:555
-msgid "Show All"
-msgstr "Afi╨eazЦ tot"
-
-#: addressbook/gui/component/addressbook.c:557
-msgid "Advanced..."
-msgstr "Avansat..."
-
-#: addressbook/gui/component/addressbook.c:587
-msgid "Any field contains"
-msgstr "Orice cБmp conЧine"
-
-#: addressbook/gui/component/addressbook.c:588
-msgid "Name contains"
-msgstr "Numele conЧine"
-
-#: addressbook/gui/component/addressbook.c:589
-msgid "Email contains"
-msgstr "Email-ul conЧine"
-
-#: addressbook/gui/component/addressbook.c:732
-msgid "The URI that the Folder Browser will display"
-msgstr "URI pe care Folder Browser Нl va afi╨a"
-
-#: addressbook/gui/component/addressbook-storage.c:95
-msgid "Other Contacts"
-msgstr "Alte contacte"
-
-#: addressbook/gui/component/addressbook-config.c:143
-msgid "LDAP Server"
-msgstr "LDAP Server"
-
-#: addressbook/gui/component/addressbook-config.c:145
-msgid "File"
-msgstr "Fi╨ier"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "Unknown addressbook type"
-msgstr "Tip de agendЦ necunoscut"
-
-#: addressbook/gui/component/addressbook-config.c:158
-msgid "None (anonymous mode)"
-msgstr "FЦrЦ (mod anonim)"
-
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/camel-sasl-plain.c:29 camel/providers/imap/camel-imap-provider.c:77
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-provider.c:64 mail/mail-config.glade.h:43
-msgid "Password"
-msgstr "Parola"
-
-#: addressbook/gui/component/addressbook-config.c:162
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:165
-msgid "Unknown auth type"
-msgstr "Tip de autorizare necunoscut"
-
-#: addressbook/gui/component/addressbook-config.c:174
-msgid "Base"
-msgstr "Baza"
-
-#: addressbook/gui/component/addressbook-config.c:176
-msgid "One"
-msgstr "Unu"
-
-#: addressbook/gui/component/addressbook-config.c:178
-msgid "Subtree"
-msgstr "Subarbore"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "Nume fi╨ier:"
 
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Unknown scope type"
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "Decembrie"
 
-#: addressbook/gui/component/addressbook-config.c:348
-msgid "Bind DN:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "FIXME Bind DN Help text here"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:351
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
-msgstr "Memorez aceastЦ parolЦ"
-
-#: addressbook/gui/component/addressbook-config.c:401
-#: mail/mail-config.glade.h:28
-msgid "Host:"
-msgstr "GazdЦ:"
-
-#: addressbook/gui/component/addressbook-config.c:402
-msgid "FIXME Host help text here."
-msgstr "FIXME Text ajutor gazdЦ"
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "Port:"
-msgstr "Port:"
-
-#: addressbook/gui/component/addressbook-config.c:405
-msgid "FIXME Port help text here."
-msgstr "FIXME Text ajutor port"
-
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Root DN:"
-msgstr "DN rЦdЦcinЦ"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Root DN help text here."
-msgstr "FIXME Text ajutor DN rЦdЦcinЦ"
-
-#: addressbook/gui/component/addressbook-config.c:430
-msgid "Search Scope:"
-msgstr "Scop cЦutare:"
-
-#: addressbook/gui/component/addressbook-config.c:484
-msgid "Authentication:"
-msgstr "Autentificare:"
-
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config.glade.h:44
-msgid "Path:"
-msgstr "Cale:"
-
-#: addressbook/gui/component/addressbook-config.c:503
-msgid "FIXME Path Help text here"
-msgstr "FIXME Text ajutor cale"
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "Create path if it doesn't exist."
-msgstr "Creez calea dacЦ nu existЦ."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
+msgstr "MutЦ"
 
-#: addressbook/gui/component/addressbook-config.c:642
-msgid "Edit Addressbook"
-msgstr "Editare agendЦ"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "Editor de contacte"
 
-#: addressbook/gui/component/addressbook-config.c:644
-msgid "Add Addressbook"
-msgstr "AdЦugare agendЦ"
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "Editor de contacte"
 
-#: addressbook/gui/component/addressbook-config.c:660
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
 msgstr ""
-"AlegeЧi tipul de agendЦ pe care Нl aveЧi, ╨i introduceЧi informaЧiile "
-"relevante"
 
-#: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:35
-msgid "Name:"
-msgstr "Nume:"
-
-#: addressbook/gui/component/addressbook-config.c:667
-msgid "FIXME Name help text here"
-msgstr "FIXME Text ajutor nume"
-
-#: addressbook/gui/component/addressbook-config.c:669
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Descriere:"
-
-#: addressbook/gui/component/addressbook-config.c:670
-msgid "FIXME Description help text here"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Surse agendЦ"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:8 mail/folder-browser.c:593
-#: mail/mail-config.glade.h:19 mail/mail-view.c:150
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "╙terg"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "Editez"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:605
-msgid "Name"
-msgstr "Nume"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "Dezactivare interogЦri"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "Activare interogЦri (Periculos!)"
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:200
-msgid "Edit Contact Info"
-msgstr "Editare InformaЧii contact"
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:259
-msgid "Add to Contacts"
-msgstr "AdЦugare la contacte"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Control Bonobo pentru o adresЦ popup."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Control Bonobo pentru afi╨area unei adrese."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Control Bonobo de probЦ care afi╨eazЦ o agendЦ."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Control care afi╨eazЦ o agendЦ minicard pentru Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Vizualizare agendЦ minicard Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "ComponentЦ Evolution pentru manipulare contacte"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Configurare pentru controlul agendei minicard"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#, fuzzy
+msgid "New Contact:"
+msgstr "Contact nou"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Configurare pentru afi╨orul agendei de adrese"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#, fuzzy
+msgid "Original Contact:"
+msgstr "Alte contacte"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
+msgid ""
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "Configurare pentru componentele agendei Evolution."
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+msgid "Changed Contact:"
+msgstr "Alte contacte"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "InterfaЧa de selectare nume a agendei Evolution."
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Configurare interfaЧa de selectare nume a agendei"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:121
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "MutЦ"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:136
-msgid "Remove All"
-msgstr "MutЦ tot"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "GЦse╨te..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "SelecЧie nume"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "SelecЧie nume din:"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
+msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
+#: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "CautЦ"
 
@@ -1170,73 +1300,258 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
-#: addressbook/gui/widgets/e-minicard.c:450
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "SalveazЦ ca VCard"
 
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
+msgid "Send contact to other"
+msgstr "Trimite contact la altcineva"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
+msgid "Send message to contact"
+msgstr "Trimite mesaj la contact"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
 #: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
+msgid "Print"
+msgstr "TipЦre╨te"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
+msgid "Print Envelope"
+msgstr "TipЦre╨te plic"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "╙terg"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "Eroare la НncЦrcarea %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "Surse"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Eroare necunoscutЦ"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "LucreazЦ offline"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "Acces interzis"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "Nu gЦsesc fi╨ierul"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "OperaЧie nesuportatЦ"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "Anulat"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "Eroare I/O"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "Eroare la НncЦrcarea %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Eroare la НncЦrcarea %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Eroare la НncЦrcarea %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "Eroare la НncЦrcarea %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr ""
+"Eroarea la citirea datelor:\n"
+"%s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* Click aici sЦ adЦugaЧi un contact *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:606
+#: addressbook/gui/widgets/e-addressbook-view.c:702
+msgid "File As"
+msgstr "Fi╨ier ca"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:610
+#: addressbook/gui/widgets/e-addressbook-view.c:705
+msgid "Primary Phone"
+msgstr "Telefon principal"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:706
+msgid "Assistant Phone"
+msgstr "Telefon asistent"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:707
+#, fuzzy
+msgid "Business Phone"
+msgstr "Serviciu 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:708
+#, fuzzy
+msgid "Callback Phone"
+msgstr "Rechemare"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:709
+msgid "Company Phone"
+msgstr "Telefon companie"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:710
+msgid "Home Phone"
+msgstr "Telefon acasЦ"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "OrganizaЧie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:622
+#: addressbook/gui/widgets/e-addressbook-view.c:712
+#, fuzzy
+msgid "Business Address"
+msgstr "Serviciu 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:713
+msgid "Home Address"
+msgstr "Adresa acasЦ"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:714
+msgid "Mobile Phone"
+msgstr "Telefon mobil"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:715
+msgid "Car Phone"
+msgstr "Telefon ma╨inЦ"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:718
+#, fuzzy
+msgid "Business Phone 2"
+msgstr "Serviciu 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:719
+msgid "Home Phone 2"
+msgstr "Telefon acasЦ 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:721
+msgid "Other Phone"
+msgstr "Alt telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:726
+msgid "TTY"
+msgstr "TTY"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:727
+msgid "Other Address"
+msgstr "AltЦ adresЦ"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Site web"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:623
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "Departament"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:624
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Birou"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:625
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "Titlu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:626
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Profesie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:627
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Manager"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:629
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "PoreclЦ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:630
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "SoЧ/soЧie"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:631
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "NotЦ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:632
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:633
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 #, fuzzy
-msgid "Click here to add a contact"
-msgstr "* Click aici sЦ adЦugaЧi un contact *"
+msgid "Done."
+msgstr "Gata"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "Incarc calendarul..."
 
-#: addressbook/gui/widgets/e-minicard-control.c:280
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Salvez in agendЦ"
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1250,7 +1565,7 @@ msgstr ""
 "\n"
 "Dublu-click aici pentru creare Contact nou."
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr "Vizualizare Card"
 
@@ -1279,7 +1594,8 @@ msgid "Dimensions:"
 msgstr "Dimensiuni:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Font..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1339,7 +1655,6 @@ msgid "Margins"
 msgstr "Margini"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "NumЦr de coloane"
 
@@ -1419,139 +1734,320 @@ msgstr "Tip"
 msgid "Width:"
 msgstr "LЦЧime:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Font..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Eroare in timpul comunicЦrii cu serverul calendar"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
-msgstr "Nu gЦsesc fi╨ierul"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "MostrЦ de control Bonobo care afi╨eaza un calendar."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolution calendar iTip/iMip vizualizator"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr "ComponentЦ Evolution pentru manipularea calendarului."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr "Procesator pentru componenta Centralizator a calendarului"
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
-msgstr "Deschide calendar"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr "Procesator pentru componenta calendarului Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr "Procesator pentru controlul calendar iTip"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr "Procesator pentru mostra controlului calendar"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Procesator pentru componenta calendarului Evolution."
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr "Serviciu notificare alarme"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "Notificare depre НntБlnire in %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "Notificare depre НntБlnire in %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "Notificare depre НntБlnire in %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "Notificare depre НntБlnire in %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "Notificare depre НntБlnire in %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "Notificare depre НntБlnire in %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "Notificare depre НntБlnire in %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "AratЦ informaЧii despre Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "Alarma Нn %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "нnchide"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+msgid "Snoo_ze"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "Editare НntЦlniri"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "Rezumat indisponibil."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "Aminte╨te de НntБlnire la "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr ""
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
+#, c-format
+msgid ""
+"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
+"know."
+msgstr ""
+"Este %s. Ora sistemului Unix este acum %ld. Ne-am gБndit cЦ poate vrei sЦ "
+"stii."
+
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+msgid "Could not initialize GNOME"
+msgstr "Nu pot iniЧializa GNOME"
+
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Nu pot iniЧializa Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
+msgid "Could not create the alarm notify service factory"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
-msgstr "Salvare calendar"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A, %e %B %Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: calendar/gui/calendar-commands.c:468
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "Nu pot crea vederea calendar. VerificaЧi setЦrile pentru ORBit si OAF"
 
-#: calendar/gui/calendar-model.c:364 calendar/gui/calendar-model.c:899
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "Public"
 
-#: calendar/gui/calendar-model.c:367 calendar/gui/calendar-model.c:901
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:370 calendar/gui/calendar-model.c:903
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "ConfidenЧial"
 
-#: calendar/gui/calendar-model.c:373 calendar/gui/event-editor.c:1594
-#: calendar/gui/event-editor.c:1621
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Necunoscut"
 
-#: calendar/gui/calendar-model.c:461
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:461
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:662
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Ridicat"
 
-#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
-#: calendar/gui/calendar-model.c:1573
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:661
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:660
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "ScЦzut"
 
-#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1123
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Transparent"
 
-#: calendar/gui/calendar-model.c:544 calendar/gui/calendar-model.c:1125
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Opac"
 
-#: calendar/gui/calendar-model.c:639 calendar/gui/calendar-model.c:1177
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Nepornit"
 
-#: calendar/gui/calendar-model.c:642 calendar/gui/calendar-model.c:1179
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "нn derulare"
 
-#: calendar/gui/calendar-model.c:645 calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "Complet"
 
-#: calendar/gui/calendar-model.c:648 calendar/gui/calendar-model.c:1183
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
+#: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Anulat"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:795 e-util/e-time-utils.c:277
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:798 e-util/e-time-utils.c:286
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:803
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1562,7 +2058,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:883
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
@@ -1570,17 +2066,21 @@ msgstr ""
 "'Neclasificat'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:897 calendar/gui/calendar-model.c:1121
-#: calendar/gui/calendar-model.c:1175 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:971
-#: mail/mail-accounts.c:116 mail/mail-config.glade.h:37
-#: shell/e-shell-view.c:1124 widgets/misc/e-cell-date-edit.c:234
-#: widgets/misc/e-dateedit.c:432 widgets/misc/e-dateedit.c:1341
-#: widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:971
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1590,137 +2090,292 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1011
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Valorile procentuale pot fi Нntre 0 ╨i 100, inclusiv"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "Prioritatea poate fi 'Ridicat', 'Normal', 'ScЦzut', 'Nedefinit'."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1065
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Nedefinit"
 
-#: calendar/gui/calendar-model.c:1106
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 "Nivelul de transparenЧЦ poate fi 'Transparent', 'Opac', sau 'Inexistent'."
 
-#: calendar/gui/calendar-model.c:1575
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1577
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Alocat"
 
-#: calendar/gui/calendar-model.c:1583
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Da"
 
-#: calendar/gui/calendar-model.c:1583
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Nu"
 
-#: calendar/gui/calendar-summary.c:196
-msgid "%A, %e %B %Y"
-msgstr "%A, %e %B %Y"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "Vizualizare Card"
 
-#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "_SЦptЦmБna de lucru"
 
-#: calendar/gui/calendar-summary.c:437
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Eroare la НncЦrcarea calendarului</b>"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "Definire vizualizare"
 
-#: calendar/gui/calendar-summary.c:449
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Eroare la НncЦrcarea calendarului:</b>MetodЦ nesuportatЦ"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "Luna"
 
-#: calendar/gui/calendar-summary.c:616
-msgid "Display"
-msgstr "Afi╨eaza"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "URI afi╨at de calendar"
 
-#: calendar/gui/calendar-summary.c:621
-msgid "Show appointments"
-msgstr "AratЦ НntБlnirile"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "AlarmЦ audio"
 
-#: calendar/gui/calendar-summary.c:629
-msgid "Show tasks"
-msgstr "AratЦ task-uri"
+#: calendar/gui/dialogs/alarm-options.c:363
+msgid "Message Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Incarc calendar"
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "OpЧiuni afi╨are"
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "URI afi╨at de calendar"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "Aminte╨te de НntБlnire la "
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
 msgstr ""
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Ok"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr "Serviciu notificare alarme"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "Stocare mesaje"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Scoate un sunet"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:52
-msgid "Could not initialize GNOME"
-msgstr "Nu pot iniЧializa GNOME"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "RuleazЦ un program"
 
-#: calendar/gui/alarm-notify/notify-main.c:77
-msgid "Could not create the alarm notify service factory"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Alarma Нn %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "zile"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Notificare depre НntБlnire in %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "Actualizez tot"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
-msgstr "Rezumat indisponibil."
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "ore"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "нnchide"
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "minute"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Editare НntЦlniri"
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr " %d zile"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr ""
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr " o zi"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr " %d sЦptЦmНni"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr " 1 sЦptЦmНnЦ"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr " %d ore"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr " 1 orЦ"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr " %d minute"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr " 1 minut"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr " %d secunde"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr " 1 secundЦ"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr "Scoate un sunet"
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "Afi╨eazЦ toate antetele mesajului"
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an email"
+msgstr "Trimite un email"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr "RuleazЦ un program"
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr "Нnainte de Нnceperea НntНlnirii"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr "dupЦ Нncepera НntНlnirii"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr "Нnainte de sfНr╨itul НntНlnirii"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr "dupЦ sfНr╨itul НntНlnirii"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "Baza"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "Data & Ora"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "Memorator"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Rezumat:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_OpЧiuni"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "dupЦ"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "Нnainte"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "ziua"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr "sfБr╨it НntБlnire"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr "ora"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+msgid "minute(s)"
+msgstr "minut(e)"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
+msgstr "Нnceput НntБlnire"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
@@ -1751,36 +2406,37 @@ msgid "60 minutes"
 msgstr "60 minute"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Oprire alarmЦ dupa"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "AlarmЦ audio"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "Beep cНnd apare fereastra alarmei"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Calendar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "PreferinЧe calendar"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Culori"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+msgid "Compress weekends in month view"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+#, fuzzy
+msgid "Date Navigator"
 msgstr "OpЧiuni pentru navigatorul datei"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1788,584 +2444,1082 @@ msgid "Defaults"
 msgstr "Implicit"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "OpЧiuni afi╨are"
+#: mail/mail-config.glade.h:30
+msgid "Display"
+msgstr "Afi╨eaza"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
-msgstr "Data scadentЦ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Validez moЧЦire pentru"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Sfir╨it zi:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Prima zi a sЦptЦminii:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "Vin"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Vineri"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "IlumineazЦ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "De terminat astЦzi"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "De terminat astЦzi"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Neteminate НncЦ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Neterminate НncЦ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Luni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Termen depЦ╨it"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#, fuzzy
+msgid "Overdue tasks"
 msgstr "Termen depЦ╨it"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
-msgstr "Alege o culoare"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "Prioritate"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Aminte╨te-mi toate НntБlnirile"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Memorator"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "SБm"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:484
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "SБmbЦtЦ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "AratЦ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "AratЦ termenul de final al НntБlnirilor"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "AratЦ numЦrul de sЦptЦmБni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "нnceput zi:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "Dum"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:485
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "DuminicЦ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "Panou sarcini"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "Sarcini"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "De terminat astЦzi"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "Joi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Joi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Timp rЦmas"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Time"
+msgstr "Titlu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "DistribuЧia de timp:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Format timp:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr "DistribuЧia de timp:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "Mar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "MarЧi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Alarme vizuale"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "Mie"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Miercuri"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
-msgstr "SЦptЦmНnЦ lucrЦtoare"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
+msgstr "_SЦptЦmБna de lucru"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "minute Нnainte de a avea loc."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
-msgid "seconds."
-msgstr "secunde"
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "SunteЧi sigur cЦ doriЧi sЦ ╨tergeЧi acest cont?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "SunteЧi sigur cЦ doriЧН sЦ ╨tergeЧi task-ul `%s'?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "SunteЧi sigur cЦ doriЧi sЦ ╨tergeЧi intrarea din jurnal `%s'?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "Complet"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "Complet"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#, fuzzy
+msgid "Due "
+msgstr "Data scadentЦ"
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "Editare НntБlnire"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "нntБlnire - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "Task - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Intrare jurnal - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Nu existЦ rezumat"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "SuprascrieЧi fi╨ierul?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Fi╨ier al cЦrui nume existЦ deja.\n"
+"нl suprascrieЧi?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "SalveazЦ ca..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "SunteЧi sigur cЦ doriЧi sЦ ╨tergeЧi НntЦlnirea `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:73
+#: calendar/gui/dialogs/delete-comp.c:87
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "SunteЧi sigur cЦ doriЧi sЦ ╨tergeЧi НntЦlnirea"
 
-#: calendar/gui/dialogs/delete-comp.c:79
+#: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "SunteЧi sigur cЦ doriЧН sЦ ╨tergeЧi task-ul `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:82
+#: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "SunteЧi sigur cЦ doriЧН sЦ ╨tergeЧi acest task?"
 
-#: calendar/gui/dialogs/delete-comp.c:88
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "SunteЧi sigur cЦ doriЧi sЦ ╨tergeЧi intrarea din jurnal `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "SunteЧi sigur cЦ doriЧi sЦ ╨tergeЧi aceastЦ intrare din jurnal?"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "DoriЧi sЦ salvaЧi modificЦrile?"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "SunteЧi sigur cЦ doriЧi sЦ ╨tergeЧi НntЦlnirea `%s'?"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% Comp_let:"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "SunteЧi sigur cЦ doriЧН sЦ ╨tergeЧi task-ul `%s'?"
+
+#: calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "SunteЧi sigur cЦ doriЧi sЦ ╨tergeЧi intrarea din jurnal `%s'?"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Selectez un fi╨ier"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "SecЧiuni"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr "DistribuЧia de timp:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
+msgstr "нntБlnire"
+
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
+msgstr "Reaminte╨te"
+
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
+msgstr "Revenire"
+
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "Anulare НntБlnire"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "Eveniment zilnic"
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Clasificare"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Date & Time"
 msgstr "Data & Ora"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Data completatЦ:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Pri_vate"
 msgstr "Pri_vat"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "Progres"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "Pu_blic"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Data de Нnceput:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "Rezu_mat:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Task"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
 msgid "_Confidential"
 msgstr "_ConfidenЧial"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "_Contacte..."
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "Ora de _sfНr╨it"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "_Data scadentЦ:"
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "_Ora de Нnceput"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "_Prioritate:"
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "_Stare"
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Nume grup:"
 
-#: calendar/gui/dialogs/task-editor.c:689
-msgid "Edit Task"
-msgstr "Editare task"
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Sursa hirtie"
 
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:381
-msgid "No summary"
-msgstr "Nu existЦ rezumat"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:387
-#, c-format
-msgid "Appointment - %s"
-msgstr "нntБlnire - %s"
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr "Scaun"
 
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:390
-#, c-format
-msgid "Task - %s"
-msgstr "Task - %s"
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr "Participant necesar"
 
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:393
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Intrare jurnal - %s"
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr "Participant opЧional"
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
-msgstr "Categorii"
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr "Neparticipant"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Completion Date"
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "MutЦ acЧiunea"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr " AcceptЦ "
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr " RefuzЦ "
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "TentativЦ"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "╙terse"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "нn derulare"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Telefon ma╨inЦ"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Participant necesar"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Participant opЧional"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Neparticipant"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "Trimis"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "╙terge..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
+msgstr "Participare"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
 msgstr "Data terminare"
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "End Date"
-msgstr "Data sfНr╨it"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "╙terse"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Start Date"
-msgstr "Data Нnceput"
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "╙terse"
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
-msgstr "PoziЧie geograficЦ"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "Manager"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "Decembrie"
 
-#: calendar/gui/e-calendar-table.c:164
-msgid "Percent complete"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr "Rol"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Stare"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Tip"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizer:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Organizer:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "_InvitЦ pe alЧii..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Organizer:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "AceastЦ НntНlnire conЧine reveniri pe care Evolution nu le poate edita"
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Summary"
-msgstr "Rezumat"
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "ziua"
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
-msgstr "TransparenЧЦ"
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
-msgstr "URL"
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
-msgstr "Alarme"
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:170
-msgid "Click here to add a task"
-msgstr "Click aici sЦ adЦugaЧi un task"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
+msgstr "Revenire personalЦ"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Fiecare"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "ExcepЧii"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
+msgstr "Nici o revenire"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
+msgstr "Previzualizare"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
+msgstr "RegulЦ revenire"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
+msgstr "Revenire simplЦ"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "ModificЦ"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "pentru"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "Нntotdeauna"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "luna"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr "pНnЦ la"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "sЦptЦmНna"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
+msgstr "anul"
+
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr "DoriЧi sЦ salvaЧi modificЦrile?"
+
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "Data completatЦ:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "╙terse"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "╙terse"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "(FЦrЦ nume)"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "Task"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% Comp_let:"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
+msgstr "Progres"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "Data de Нnceput:"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
+msgstr "_Data scadentЦ:"
+
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
+msgstr "_Prioritate:"
+
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
+msgstr "_Stare"
+
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "Marcare completЦ"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+#, fuzzy
+msgid "_Open"
+msgstr "Deschide"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
-msgstr "Marcare task completЦ"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "Taie"
+
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_CopiazЦ"
 
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit this task..."
-msgstr "Editez acest task..."
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "_Lipe╨te"
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "Editare task"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "Marcare completЦ"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "╙terg acest task"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
+msgstr "Marcare completЦ"
+
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "╙tergere task"
 
-#: calendar/gui/e-day-view-time-item.c:520
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "Click aici sЦ adЦugaЧi un task"
+
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% Comp_let:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Alarme"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Categorii"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "Complet"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "Data terminare"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "Data scadentЦ"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Data sfНr╨it"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "PoziЧie geograficЦ"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Prioritate"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Data Нnceput"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "Rezumat"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "Sarcini"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "TransparenЧЦ"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-day-view-time-item.c:519
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i diviziuni minute"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1290
-#: calendar/gui/e-week-view-main-item.c:324
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1304
-#: calendar/gui/e-week-view-main-item.c:333
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1317
-#: calendar/gui/e-week-view-main-item.c:347
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
+#: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:572 calendar/gui/e-week-view.c:304
-#: calendar/gui/print.c:617
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:575 calendar/gui/e-week-view.c:307
-#: calendar/gui/print.c:616
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3036 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "нntБlnire nouЦ"
 
-#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3244
-msgid "New All Day Event"
-msgstr ""
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
+msgstr "_Eveniment nou"
 
-#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3249
-msgid "Go to Today"
-msgstr "Mergi la ziua"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "Mergi la _ziua"
 
-#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3251
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "Mergi la data..."
 
-#: calendar/gui/e-day-view.c:3052 calendar/gui/e-week-view.c:3257
-#: mail/folder-browser.c:562 ui/evolution-calendar.xml.h:19
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Deschide"
-
-#: calendar/gui/e-day-view.c:3054 calendar/gui/e-week-view.c:3259
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "╙terge aceastЦ НntБlnire"
 
-#: calendar/gui/e-day-view.c:3056 calendar/gui/e-week-view.c:3261
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Programare НntБlniri"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
+msgstr "SalveazЦ fi╨ierul curent"
 
-#: calendar/gui/e-day-view.c:3065 calendar/gui/e-week-view.c:3274
-msgid "Make this Occurrence Movable"
-msgstr ""
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
+msgstr "╙terge toate apariЧiile"
+
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
+msgstr "╙terge toate apariЧiile"
 
-#: calendar/gui/e-day-view.c:3067 calendar/gui/e-week-view.c:3276
-msgid "Delete this Occurrence"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3069
-msgid "Delete all Occurrences"
+#: calendar/gui/e-itip-control.c:697
+#, fuzzy
+msgid "This is a meeting request."
+msgstr "_Aceasta este adresa de expediere"
+
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
-msgid "Component successfully updated."
-msgstr "ComponentЦ actualizatЦ cu succes."
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
-msgstr "A fost o eroare la НncЦrcarea calendarului."
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
-msgstr "Nu pot deschide fi╨ierul calendar!\n"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+#, fuzzy
+msgid "The message is not understandable."
+msgstr "Mesajul nu este disponibil Нn mod curent"
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
-msgstr "Nu pot НncЦrca fi╨ierul calendar!\n"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
-msgstr "Nu pot citi fi╨ierul calendar!\n"
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
-msgstr "Acesta e un rЦspuns de la cineva care n-a fost invitat!"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:499
-msgid "I couldn't update your calendar store."
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
-msgstr "Nu pot ╨terge compenentele calendarului!\n"
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Component successfully deleted."
-msgstr "ComponentЦ ╨tearsЦ cu succes."
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-msgid "I don't recognize this type of calendar component."
-msgstr "Nu recunosc acest tip de componentЦ a calendarului."
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
-msgstr "AdaugЦ Нn calendar"
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
-msgid " Accept "
-msgstr " AcceptЦ "
+#: calendar/gui/e-itip-control.c:834
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "Folderul pare a fi deteriorat irecuperabil."
 
-#: calendar/gui/e-itip-control.c:815
-msgid " Decline "
-msgstr " RefuzЦ "
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Tentative "
-msgstr " IntenЧie "
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
-msgstr " ActualizeazЦ calendar"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
-msgstr "Anulare НntБlnire"
+#: calendar/gui/e-itip-control.c:1015
+#, fuzzy
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "Nu pot deschide fi╨ierul calendar!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -2380,26 +3534,22 @@ msgstr "--la--"
 msgid "Calendar Message"
 msgstr "Mesaj calendar"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:613
+#: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Data:"
 
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "Incarc calendar"
+
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Incarc calendarul..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizer:"
-
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Mesaj server:"
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Rezumat:"
-
 #: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "datЦ sfНr╨it"
@@ -2408,102 +3558,21 @@ msgstr "datЦ sfНr╨it"
 msgid "date-start"
 msgstr "datЦ sfНr╨it"
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "Participare"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "Adrese participare"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "ParticipЦri"
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"Anulare\n"
-"нntБlnire"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr "Scaun"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "InvitaЧii НntБlnire"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr "Neparticipant"
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "Participant opЧional"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "Organizator:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"PublicЦ\n"
-"Eveniment"
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-meeting-dialog.glade.h:18
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"Cerere\n"
-"нntБlnire"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Required Participant"
-msgstr "Participant necesar"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid "Role"
-msgstr "Rol"
-
-#: calendar/gui/e-meeting-dialog.glade.h:22
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"Program\n"
-"Ora"
-
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:30
-#: mail/message-list.c:1050
-msgid "Status"
-msgstr "Stare"
-
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "Tot"
 
-#: calendar/gui/e-tasks.c:155
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "Categorie:"
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nu pot incЦrca task-uri Нn `%s'"
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoda necesarЦ pentru a НncЦrca `%s' nesuportatЦ"
@@ -2511,290 +3580,22 @@ msgstr "Metoda necesarЦ pentru a НncЦrca `%s' nesuportatЦ"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:341
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/e-week-view.c:3242 calendar/gui/e-week-view.c:3265
-msgid "New Appointment..."
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
 msgstr "НntБlnire nouЦ..."
 
-#: calendar/gui/e-week-view.c:3278
-msgid "Delete All Occurrences"
-msgstr "╙terge toate apariЧiile"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Eveniment zilnic"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "нntБlnire"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Revenire personalЦ"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Fiecare"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "ExcepЧii"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "ModificЦ"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Nici o revenire"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1581
-msgid "Play a sound"
-msgstr "Scoate un sunet"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Previzualizare"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Revenire"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "RegulЦ revenire"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Reaminte╨te"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1590
-msgid "Run a program"
-msgstr "RuleazЦ un program"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1587
-msgid "Send an email"
-msgstr "Trimite un email"
-
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "SetЦri..."
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1584
-msgid "Show a dialog"
-msgstr "AratЦ un dialog"
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Revenire simplЦ"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "Ora de _sfНr╨it"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "_Ora de Нnceput"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "_Data Нnceput:"
-
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:33
-msgid "after"
-msgstr "dupЦ"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:34
-msgid "before"
-msgstr "Нnainte"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "ziua"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "sfБr╨it НntБlnire"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "pentru"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "Нntotdeauna"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "ora"
-
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
-msgid "minute(s)"
-msgstr "minut(e)"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "month(s)"
-msgstr "luna"
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "start of appointment"
-msgstr "Нnceput НntБlnire"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "until"
-msgstr "pНnЦ la"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "week(s)"
-msgstr "sЦptЦmНna"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "year(s)"
-msgstr "anul"
-
-#: calendar/gui/event-editor.c:375
-msgid "Edit Appointment"
-msgstr "Editare НntБlnire"
-
-#: calendar/gui/event-editor.c:453
-msgid "on"
-msgstr ""
-
-#: calendar/gui/event-editor.c:478 filter/filter-datespec.c:65
-msgid "day"
-msgstr "ziua"
-
-#: calendar/gui/event-editor.c:605
-msgid "on the"
-msgstr ""
-
-#: calendar/gui/event-editor.c:612
-msgid "th"
-msgstr ""
-
-#: calendar/gui/event-editor.c:758
-msgid "occurrences"
-msgstr ""
-
-#: calendar/gui/event-editor.c:875
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "AceastЦ НntНlnire conЧine reveniri pe care Evolution nu le poate edita"
-
-#: calendar/gui/event-editor.c:1536
-#, c-format
-msgid " %d days"
-msgstr " %d zile"
-
-#: calendar/gui/event-editor.c:1538
-msgid " 1 day"
-msgstr " o zi"
-
-#: calendar/gui/event-editor.c:1541
-#, c-format
-msgid " %d weeks"
-msgstr " %d sЦptЦmНni"
-
-#: calendar/gui/event-editor.c:1543
-msgid " 1 week"
-msgstr " 1 sЦptЦmНnЦ"
-
-#: calendar/gui/event-editor.c:1546
-#, c-format
-msgid " %d hours"
-msgstr " %d ore"
-
-#: calendar/gui/event-editor.c:1548
-msgid " 1 hour"
-msgstr " 1 orЦ"
-
-#: calendar/gui/event-editor.c:1551
-#, c-format
-msgid " %d minutes"
-msgstr " %d minute"
-
-#: calendar/gui/event-editor.c:1553
-msgid " 1 minute"
-msgstr " 1 minut"
-
-#: calendar/gui/event-editor.c:1556
-#, c-format
-msgid " %d seconds"
-msgstr " %d secunde"
-
-#: calendar/gui/event-editor.c:1558
-msgid " 1 second"
-msgstr " 1 secundЦ"
-
-#: calendar/gui/event-editor.c:1605
-msgid " before start of appointment"
-msgstr "Нnainte de Нnceperea НntНlnirii"
-
-#: calendar/gui/event-editor.c:1607
-msgid " after start of appointment"
-msgstr "dupЦ Нncepera НntНlnirii"
-
-#: calendar/gui/event-editor.c:1615
-msgid " before end of appointment"
-msgstr "Нnainte de sfНr╨itul НntНlnirii"
-
-#: calendar/gui/event-editor.c:1617
-msgid " after end of appointment"
-msgstr "dupЦ sfНr╨itul НntНlnirii"
-
-#: calendar/gui/event-editor.c:3117 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "MostrЦ de control Bonobo care afi╨eaza un calendar."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution calendar iTip/iMip vizualizator"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "ComponentЦ Evolution pentru manipularea calendarului."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr "Procesator pentru componenta Centralizator a calendarului"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "Procesator pentru componenta calendarului Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr "Procesator pentru controlul calendar iTip"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr "Procesator pentru mostra controlului calendar"
-
-#: calendar/gui/gnome-cal.c:700
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nu pot deschide folderul Нn `%s'"
 
-#: calendar/gui/gnome-cal.c:711
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoda cerutЦ pentru deshiderea `%s' nu e suportatЦ"
@@ -2820,236 +3621,256 @@ msgid "Go To Date"
 msgstr "Mergi la data"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Mergi la ziua de azi"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Ianuarie"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "Iulie"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "Iunie"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "Martie"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "Mai"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "Noiembrie"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "Octombrie"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Septembrie"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Mergi la ziua de azi"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Du"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "Mi"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Jo"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Vi"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "SБ"
 
-#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Sarcini"
 
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "Ziua curentЦ (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1104
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "SЦptЦmБna curentЦ (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Luna curentЦ (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Anul curent (%Y)"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "TipЦre╨te calendar"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1403
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:30
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Previzualizare tipЦrire"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "TipЦre╨te acest articol"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "SeteazЦ tipЦrire"
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "De afi╨at URI pentru folderul sarcini"
 
@@ -3057,8 +3878,9 @@ msgstr "De afi╨at URI pentru folderul sarcini"
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
-msgstr "Evolution a preluat sarcinile care au fost in folderul calendar"
-"╨i le-a transferat Нntr-un nou folder de sarcini."
+msgstr ""
+"Evolution a preluat sarcinile care au fost in folderul calendar╨i le-a "
+"transferat Нntr-un nou folder de sarcini."
 
 #: calendar/gui/tasks-migrate.c:109
 msgid ""
@@ -3066,85 +3888,132 @@ msgid ""
 "migrate them to the new tasks folder.\n"
 "Some of the tasks could not be migrated, so this process may be attempted "
 "again in the future."
-msgstr "Evolution a Нncercat sЦ preia sarcinile care au fost Нn folderul calendar"
-"╨i le-a transferat Нntr-un nou folder de sarcini."
-"CБteva sarcini nu pot fi transferate, a╨a cЦ acest proces se poate"  
-"relua Нn viitor"  
+msgstr ""
+"Evolution a Нncercat sЦ preia sarcinile care au fost Нn folderul calendar╨i "
+"le-a transferat Нntr-un nou folder de sarcini.CБteva sarcini nu pot fi "
+"transferate, a╨a cЦ acest proces se poaterelua Нn viitor"
 
 #: calendar/gui/tasks-migrate.c:121
 #, c-format
 msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
-msgstr "Nu pot deschide `%s'; nici un articol din folderul calendar nu va fi transferat"
-"Нn folderul de sarcini"
+msgstr ""
+"Nu pot deschide `%s'; nici un articol din folderul calendar nu va fi "
+"transferatНn folderul de sarcini"
 
 #: calendar/gui/tasks-migrate.c:134
 #, c-format
 msgid ""
 "The method required to load `%s' is not supported; no items from the "
 "calendar folder will be migrated to the tasks folder."
-msgstr "Metoda cerutЦ pentru a НncЦrca `%s' nu e suportatЦ; nici un articol din"
-"folderul calendar nu va fi transferat Нn folderul de sarcini"
+msgstr ""
+"Metoda cerutЦ pentru a НncЦrca `%s' nu e suportatЦ; nici un articol "
+"dinfolderul calendar nu va fi transferat Нn folderul de sarcini"
 
 #: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
 msgid "SMTWTFS"
 msgstr "DLMMJVS"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-cipher-context.c:171
+#, fuzzy
+msgid "Signing is not supported by this cipher"
+msgstr "Tipul specificat nu e suportat Нn acestЦ stocare"
+
+#: camel/camel-cipher-context.c:211
+#, fuzzy
+msgid "Clearsigning is not supported by this cipher"
+msgstr "Tipul specificat nu e suportat Нn acestЦ stocare"
+
+#: camel/camel-cipher-context.c:251
+#, fuzzy
+msgid "Verifying is not supported by this cipher"
+msgstr "Tipul specificat nu e suportat Нn acestЦ stocare"
+
+#: camel/camel-cipher-context.c:294
+#, fuzzy
+msgid "Encryption is not supported by this cipher"
+msgstr "Tipul specificat nu e suportat Нn acestЦ stocare"
+
+#: camel/camel-cipher-context.c:336
+#, fuzzy
+msgid "Decryption is not supported by this cipher"
+msgstr "Tipul specificat nu e suportat Нn acestЦ stocare"
+
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr "Pentru aceastЦ operaЧie trebuie sЦ lucraЧi online"
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "Sincronizare foldere"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr "Nu pot deschide folderul"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr "Nu pot procesa folderul"
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "Primesc mesaj &d (%d%%)"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
-#, c-format
-msgid "Failed message %d"
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, fuzzy, c-format
+msgid "Failed on message %d"
 msgstr "E╨uare mesaj %d"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "Nu pot deschide mesajul"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "Sincronizare folder"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-msgid "Complete"
-msgstr "Complet"
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Primesc mesajul %d din %d"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "E╨uare la mesajul %d din %d"
 
-#: camel/camel-filter-driver.c:865
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Eroare parsare filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:870
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Eroare executare filtru: %s: %s"
 
-#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Eroare executare filtru cЦutare: %s: %s"
@@ -3154,7 +4023,8 @@ msgstr "Eroare executare filtru cЦutare: %s: %s"
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
-msgstr "Nu pot parsa expresia de cЦutare: %s:\n"
+msgstr ""
+"Nu pot parsa expresia de cЦutare: %s:\n"
 "%s"
 
 #: camel/camel-folder-search.c:338
@@ -3162,7 +4032,8 @@ msgstr "Nu pot parsa expresia de cЦutare: %s:\n"
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
-msgstr "Eroare executare expresia cЦutare: %s:\n"
+msgstr ""
+"Eroare executare expresia cЦutare: %s:\n"
 "%s"
 
 #: camel/camel-folder-search.c:485 camel/camel-folder-search.c:513
@@ -3178,311 +4049,432 @@ msgstr "ExecutЦ interogare Нn header necunoscut: %s"
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Tip invalid Нn conЧinutul mesajului, preferabil ╨ir"
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Nu pot crea conducta: %s"
+
+#: camel/camel-lock-client.c:123
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "Nu pot bifurca: %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Nu pot crea fi╨ier de blocare pentru %s: %s"
 
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Timp expirat la Нncercarea de blocare a fi╨ierului %s. нncercaЧi mai tБrziu."
+msgstr ""
+"Timp expirat la Нncercarea de blocare a fi╨ierului %s. нncercaЧi mai tБrziu."
 
-#: camel/camel-lock.c:199
+#: camel/camel-lock.c:201
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "E╨uare la blocare prin folosirea fcntl(2): %s"
 
-#: camel/camel-lock.c:253
+#: camel/camel-lock.c:255
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "E╨uare la blocare prin folosirea flock(2): %s"
 
-#: camel/camel-movemail.c:99
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Nu pot verifica fi╨ierul cu mesaje %s: %s"
 
-#: camel/camel-movemail.c:146
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Nu pot deschide fi╨ierul cu mesaje %s: %s"
 
-#: camel/camel-movemail.c:156
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Nu pot deschide fi╨ierul temporar de mesaje %s: %s"
 
-#: camel/camel-movemail.c:197
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Nu pot testa fi╨ierul de blocare pentru %s: %s"
-
-#: camel/camel-movemail.c:243
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Eroare la citirea fi╨ierului cu mesaje: %s"
-
-#: camel/camel-movemail.c:254
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Eroare la scrierea fi╨ierului cu mesaje temporar: %s"
-
-#: camel/camel-movemail.c:272
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "E╨uare la stocarea mesajului Нn fi╨ierul temporar %s: %s"
 
-#: camel/camel-movemail.c:304
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Nu pot crea conducta: %s"
 
-#: camel/camel-movemail.c:316
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Nu pot bifurca: %s"
 
-#: camel/camel-movemail.c:354
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "E╨uare program de mutare mesaje: %s"
 
-#: camel/camel-movemail.c:355
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Eroare necunoscutЦ)"
 
-#: camel/camel-movemail.c:585
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Eroare la citirea fi╨ierului cu mesaje: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Eroare la scrierea fi╨ierului cu mesaje temporar: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Eroare la copierea fi╨ierului cu mesaje temporar: %s"
 
-#: camel/camel-provider.c:128
+#: camel/camel-pgp-context.c:193
+#, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr "VЦ rog introduceЧi %s fraza de trecere pentru %s"
+
+#: camel/camel-pgp-context.c:196
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr "VЦ rog introduceЧi fraza de trecere %s"
+
+#: camel/camel-pgp-context.c:518
+msgid "No plaintext to sign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
+msgid "No password provided."
+msgstr "Nici o parolЦ datЦ."
+
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "Nu pot crea conducta la PGP/GPG: %s"
+
+#: camel/camel-pgp-context.c:693
+msgid "No plaintext to clearsign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:886
+msgid "No plaintext to verify."
+msgstr ""
+
+#: camel/camel-pgp-context.c:903
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Nu pot crea fi╨ier temp: %s"
+
+#: camel/camel-pgp-context.c:1063
+#, fuzzy
+msgid "No plaintext to encrypt."
+msgstr "Clic pe icon pentru decriptare."
+
+#: camel/camel-pgp-context.c:1089
+msgid "No recipients specified"
+msgstr "Nici un destinatar specificat"
+
+#: camel/camel-pgp-context.c:1280
+msgid "No ciphertext to decrypt."
+msgstr ""
+
+#: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Nu pot НncЦrca %s: Modulul de НncЦrcare nu e suportat Нn acest sistem"
 
-#: camel/camel-provider.c:137
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nu pot НncЦrca %s: %s"
 
-#: camel/camel-provider.c:145
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nu pot НncЦrca %s: Nu existЦ cod de iniЧializare Нn modul"
 
-#: camel/camel-remote-store.c:184
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s server %s"
 
-#: camel/camel-remote-store.c:188
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s service pentru %s Нn %s"
 
-#: camel/camel-remote-store.c:237
+#: camel/camel-remote-store.c:252
 msgid "Connection cancelled"
 msgstr "Conexiune anulatЦ"
 
-#: camel/camel-remote-store.c:240
-#: camel/providers/smtp/camel-smtp-transport.c:258
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nu mЦ pot conecta la %s (port %d): %s"
 
-#: camel/camel-remote-store.c:241
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr "(gazdЦ necunoscutЦ)"
 
-#: camel/camel-remote-store.c:322 camel/camel-remote-store.c:384
-#: camel/camel-remote-store.c:455
-#: camel/providers/imap/camel-imap-command.c:263
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "OperaЧie anulatЦ"
 
-#: camel/camel-remote-store.c:461
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "Server deconectat nea╨teptat"
 
-#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
+#: camel/camel-sasl-anonymous.c:33
+msgid "Anonymous"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:35
+#, fuzzy
+msgid "This option will connect to the server using an anonymous login."
+msgstr "AceastЦ opЧiune vЦ va conecta la server folosind o parolЦ simplЦ."
+
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
 msgstr "E╨uare la autentificare."
 
-#: camel/camel-sasl-anonymous.c:106
+#: camel/camel-sasl-anonymous.c:119
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
 "%s"
-msgstr "UrmЦ lЦsatЦ de adresa de email invalidЦ:\n"
+msgstr ""
+"UrmЦ lЦsatЦ de adresa de email invalidЦ:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:118
+#: camel/camel-sasl-anonymous.c:131
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-sasl-anonymous.c:130
+#: camel/camel-sasl-anonymous.c:143
 #, c-format
 msgid ""
 "Invalid trace information:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-sasl-cram-md5.c:32
+#: camel/camel-sasl-cram-md5.c:35
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: camel/camel-sasl-cram-md5.c:34
+#: camel/camel-sasl-cram-md5.c:37
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
-msgstr "AceastЦ opЧiune vЦ va conecta la server folosind o parolЦ CRAM-MD5, dacЦ"
-"serverul suportЦ."
+msgstr ""
+"AceastЦ opЧiune vЦ va conecta la server folosind o parolЦ CRAM-MD5, "
+"dacЦserverul suportЦ."
 
-#: camel/camel-sasl-digest-md5.c:39
+#: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:41
+#: camel/camel-sasl-digest-md5.c:45
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
-msgstr "AceastЦ opЧiune vЦ va conecta la server folosind o parolЦ DIGEST-MD5, dacЦ"
-"serverul suportЦ."
+msgstr ""
+"AceastЦ opЧiune vЦ va conecta la server folosind o parolЦ DIGEST-MD5, "
+"dacЦserverul suportЦ."
 
-#: camel/camel-sasl-digest-md5.c:799
+#: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:808
+#: camel/camel-sasl-digest-md5.c:819
 msgid "Server challenge invalid\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:814
+#: camel/camel-sasl-digest-md5.c:825
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:836
+#: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
 msgstr "RЦspunsul serverului nu conЧine datele de autorizare\n"
 
-#: camel/camel-sasl-digest-md5.c:854
+#: camel/camel-sasl-digest-md5.c:865
 msgid "Server response contained incomplete authorization data\n"
 msgstr "RЦspunsul serverului conЧine date de autorizare incomplete\n"
 
-#: camel/camel-sasl-digest-md5.c:864
+#: camel/camel-sasl-digest-md5.c:875
 msgid "Server response does not match\n"
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:38
+#: camel/camel-sasl-kerberos4.c:40
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-kerberos4.c:42
 msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "AcestЦ opЧiune vЦ va conecta la server folosind autentificare Kerberos 4"
+msgstr ""
+"AcestЦ opЧiune vЦ va conecta la server folosind autentificare Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:158
+#: camel/camel-sasl-kerberos4.c:161
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
-msgstr "Nu pot lua tichetul Kerberos:\n"
+msgstr ""
+"Nu pot lua tichetul Kerberos:\n"
 "%s"
 
-#: camel/camel-sasl-kerberos4.c:215
-#: camel/providers/imap/camel-imap-store.c:420
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "RЦspuns de la server de autentificare e╨uatЦ."
 
-#: camel/camel-sasl-plain.c:31
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
+msgstr ""
+
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
 msgstr "AceastЦ opЧiune vЦ va conecta la server folosind o parolЦ simplЦ."
 
-#: camel/camel-search-private.c:109
+#: camel/camel-sasl-login.c:127
+#, fuzzy
+msgid "Unknown authentication state."
+msgstr "E╨uare la autentificare."
+
+#: camel/camel-search-private.c:111
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Compilarea expresiei regulate e╨uatЦ: %s: %s"
 
-#: camel/camel-service.c:139
+#: camel/camel-service.c:154
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' necesitЦ o componentЦ username"
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:162
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' necesitЦ o componentЦ host"
 
-#: camel/camel-service.c:155
+#: camel/camel-service.c:170
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' necesitЦ o componentЦ de cale"
 
-#: camel/camel-service.c:484
+#: camel/camel-service.c:548
 #, c-format
-msgid "No such host %s."
-msgstr "Nu existЦ host-ul %s."
+msgid "Resolving: %s"
+msgstr ""
 
-#: camel/camel-service.c:487
+#: camel/camel-service.c:575
 #, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "Incapabil temporar sЦ caut hostname %s."
+msgid "Failure in name lookup: %s"
+msgstr ""
 
-#: camel/camel-session.c:54
+#: camel/camel-service.c:600
+#, c-format
+msgid "Host lookup failed: %s: host not found"
+msgstr ""
+
+#: camel/camel-service.c:602
+#, c-format
+msgid "Host lookup failed: %s: unknown reason"
+msgstr ""
+
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
 msgstr "Pentru citire mail ca o interogare a altui set de foldere"
 
-#: camel/camel-session.c:271 camel/camel-session.c:361
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Nici un provider valid pentru protocolul `%s'"
 
-#: camel/camel-session.c:459
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
-msgstr "Nu pot crea directorul %s:\n"
+msgstr ""
+"Nu pot crea directorul %s:\n"
 "%s"
 
-#. Fill in the new fields
-#: camel/camel-store.c:379 mail/mail-ops.c:1001 mail/mail-ops.c:1008
-#: mail/mail-ops.c:1026 mail/mail-ops.c:1027
-msgid "Trash"
-msgstr "Gunoi"
+#: camel/camel-smime-context.c:173
+#, fuzzy, c-format
+msgid "Please enter your password for %s"
+msgstr "VЦ rog introduceЧi %s fraza de trecere pentru %s"
+
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "Acest fi╨ier nu existЦ."
 
-#: camel/camel-tcp-stream-ssl.c:346
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "Acest fi╨ier nu existЦ."
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, fuzzy, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "Esuare la trimiterea numelui utilizator la server"
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
+#, fuzzy
+msgid "Failed to decode message."
+msgstr "E╨uare mesaj %d"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
-"EMail: %s\n"
-"Nume: %s\n"
-"Unitate: %s\n"
-"OrganizaЧie: %s\n"
-"Localitate: %s\n"
-"Stat: %s\n"
-"чara: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:362
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3495,19 +4487,38 @@ msgstr ""
 "\n"
 "%s\n"
 "\n"
-"DoriЧi sЦ acceptaЧi oricum?" 
+"DoriЧi sЦ acceptaЧi oricum?"
 
-#: camel/camel-url.c:286
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
+"EMail: %s\n"
+"Nume: %s\n"
+"Unitate: %s\n"
+"OrganizaЧie: %s\n"
+"Localitate: %s\n"
+"Stat: %s\n"
+"чara: %s"
+
+#: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Nu pot parsa URL `%s'"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nu existЦ mesajul %s Нn %s"
 
-#: camel/camel-vee-folder.c:545
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "Nu existЦ mesajul: %s"
@@ -3516,120 +4527,137 @@ msgstr "Nu existЦ mesajul: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Nu poЧi copia mesaje din acest folder"
 
-#: camel/providers/imap/camel-imap-command.c:208
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "RЦspuns nea╨teptat de la serverul IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:216
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Comanda IMAP e╨uatЦ: %s"
 
-#: camel/providers/imap/camel-imap-command.c:217 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Eroare necunoscutЦ"
-
-#: camel/providers/imap/camel-imap-command.c:271
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "RЦspunsul serverului terminat prea repede."
 
-#: camel/providers/imap/camel-imap-command.c:455
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "RЦspunsul serverului IMAP nu conЧine informaЧia %s"
 
-#: camel/providers/imap/camel-imap-command.c:489
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "RЦspunsul serverului IMAP nea╨teptat OK: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:171
+#: camel/providers/imap/camel-imap-folder.c:192
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr "Nu pot crea directorul %s: %s"
+
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nu pot НncЦrca rezumatul pentru %s"
 
-#: camel/providers/imap/camel-imap-folder.c:350
-msgid "Scanning IMAP folder"
-msgstr "Scanez folderul IMAP"
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
+msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:985
-#: camel/providers/imap/camel-imap-folder.c:1189
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "Salvez mesaje"
+
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "Mesajul nu este disponibil Нn mod curent"
 
-#: camel/providers/imap/camel-imap-folder.c:1015
-#: camel/providers/imap/camel-imap-folder.c:1223
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Salvez mesaje"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "Nu pot gЦsi corpul mesajului Нn rЦspunsul FETCH."
 
-#: camel/providers/imap/camel-imap-message-cache.c:128
+#: camel/providers/imap/camel-imap-message-cache.c:155
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Nu pot deschide directorul cache: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:40 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "Verific mailurile noi"
 
-#: camel/providers/imap/camel-imap-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:45
 msgid "Check for new messages in all folders"
 msgstr "Verific mesajele noi Нn toate folderele"
 
-#: camel/providers/imap/camel-imap-provider.c:45 shell/e-shell-view.c:479
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Foldere"
 
-#: camel/providers/imap/camel-imap-provider.c:47
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Show only subscribed folders"
 msgstr "AratЦ numai foldere subscrise"
 
-#: camel/providers/imap/camel-imap-provider.c:49
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Override server-supplied folder namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:51
+#: camel/providers/imap/camel-imap-provider.c:54
 msgid "Namespace"
 msgstr "Nume spaЧiu"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "AplicЦ filtrele pe mesajele noi din INBOX pe acest server"
 
-#: camel/providers/imap/camel-imap-provider.c:60
+#: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAPv4"
 msgstr "IMAPv4"
 
-#: camel/providers/imap/camel-imap-provider.c:62
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Pentru citirea ╨i stocarea mesajelor pe servere IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:79
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "AceastЦ opЧiune vЦ va conecta la serverul IMAP folosind o parolЦ Нn clar "
+msgstr ""
+"AceastЦ opЧiune vЦ va conecta la serverul IMAP folosind o parolЦ Нn clar "
 
-#: camel/providers/imap/camel-imap-store.c:443
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Serverul IMAP %s nu suportЦ tipul cerut de autentificare %s"
 
-#: camel/providers/imap/camel-imap-store.c:453
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Tip de autentificare nesuportat %s"
 
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVЦ rog intoduceЧi parola IMAP pentru %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:493
-#: camel/providers/smtp/camel-smtp-transport.c:389
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "Nu aЧi introdus o parolЦ."
 
-#: camel/providers/imap/camel-imap-store.c:521
-#: camel/providers/smtp/camel-smtp-transport.c:397
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3640,93 +4668,108 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:882
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Nu pot crea directorul %s: %s"
+msgid "No such folder %s"
+msgstr "Nu existЦ folderul %s"
 
-#: camel/providers/imap/camel-imap-store.c:1385
-msgid "You must be working online to complete this operation"
-msgstr "Pentru aceastЦ operaЧie trebuie sЦ lucraЧi online"
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:36
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "Director cu mail-uri Нn format MH"
 
-#: camel/providers/local/camel-local-provider.c:37
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr "Pentru stocarea mail-urilor Нntr-un director de tip MH"
 
-#: camel/providers/local/camel-local-provider.c:46
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr "Fi╨ier cЦsuЧЦ po╨talЦ Нn format standard Unix"
 
-#: camel/providers/local/camel-local-provider.c:47
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr "Pentru stocarea mail-urilor locale Нn format standard mbox"
 
-#: camel/providers/local/camel-local-provider.c:56
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr "Fi╨ier Нn format qmail maildir"
 
-#: camel/providers/local/camel-local-provider.c:57
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr "Pentru stocarea mail-urilor locale Нn directoare qmail maildir"
 
-#: camel/providers/local/camel-local-store.c:128
+#: camel/providers/local/camel-local-provider.c:70
+#, fuzzy
+msgid "Unix mbox spool-format mail files"
+msgstr "Fi╨ier Нn format qmail maildir"
+
+#: camel/providers/local/camel-local-provider.c:71
+#, fuzzy
+msgid "For storing local mail in standard Unix spool directories"
+msgstr "Pentru stocarea mail-urilor locale Нn directoare qmail maildir"
+
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Stocare root %s nu e o cale absolutЦ"
 
-#: camel/providers/local/camel-local-store.c:135
+#: camel/providers/local/camel-local-store.c:134
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Stocare root %s nu e director obi╨nuit"
 
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:159
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Nu pot gЦsi folderul: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:173
 msgid "Local stores do not have an inbox"
 msgstr "StocЦrile locale nu au un inbox"
 
-#: camel/providers/local/camel-local-store.c:184
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fi╨ier mail-uri locale %s"
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nu pot redenumi folderul %s Нn %s: %s"
 
-#: camel/providers/local/camel-local-store.c:282
+#: camel/providers/local/camel-local-store.c:279
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nu pot ╨terge directorul sumar al fi╨ierelor `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nu pot ╨terge directorul index al fi╨ierelor `%s': %s"
 
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
+msgid "Unable to add message to summary: unknown reason"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nu pot adЦuga mesajul la folderul maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3735,19 +4778,20 @@ msgstr ""
 "Nu pot lua mesajul: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "Nu existЦ mesaj"
 
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr "ConЧinut invalid al mesajului"
 
-#: camel/providers/local/camel-maildir-store.c:94
-#: camel/providers/local/camel-mh-store.c:88
+#: camel/providers/local/camel-maildir-store.c:103
+#: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -3756,15 +4800,15 @@ msgstr ""
 "Nu pot deschide folderul `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:98
-#: camel/providers/local/camel-mbox-store.c:99
-#: camel/providers/local/camel-mh-store.c:95
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Folderul `%s' nu existЦ."
 
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:101
+#: camel/providers/local/camel-maildir-store.c:114
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -3773,35 +4817,58 @@ msgstr ""
 "Nu pot crea folderul `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:120
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' nu e un director de tip maildir."
 
-#: camel/providers/local/camel-maildir-store.c:149
-#: camel/providers/local/camel-maildir-store.c:186
-#: camel/providers/local/camel-mh-store.c:125
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
+#: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nu pot ╨terge folderul `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:150
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "nu e director maildir"
 
-#: camel/providers/local/camel-mbox-folder.c:201
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"Nu pot crea folderul `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
+#, fuzzy, c-format
+msgid "Cannot open maildir directory path: %s: %s"
+msgstr "Nu pot deschide cЦsuЧa po╨talЦ: %s: %s\n"
+
+#: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
+#, fuzzy, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "Nu pot gЦsi folderul: %s: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Nu pot deschide cЦsuЧa po╨talЦ: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:257
+#: camel/providers/local/camel-mbox-folder.c:259
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nu pot adЦuga mesajul la fi╨ierul mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3810,15 +4877,17 @@ msgstr ""
 "Nu pot lua mesajul: %s din folderul %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Folderul pare a fi deteriorat irecuperabil."
 
-#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "ConstrucЧia mesajului e╨uatЦ: CЦsuЧa po╨talЦ coruptЦ?"
 
-#: camel/providers/local/camel-mbox-store.c:92
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -3827,7 +4896,7 @@ msgstr ""
 "Nu pot deschide fi╨ierul `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -3836,14 +4905,14 @@ msgstr ""
 "Nu pot crea fi╨ierul `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/local/camel-mbox-store.c:144
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' nu e un fi╨ier obi╨nuit."
 
-#: camel/providers/local/camel-mbox-store.c:136
-#: camel/providers/local/camel-mbox-store.c:159
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -3852,162 +4921,239 @@ msgstr ""
 "Nu pot ╨terge folderul `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:151
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Folderul `%s' nu e gol. Ne╨ters."
 
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:244
+#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "Rezumare folder"
 
-#: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "Nu pot deschide folderul: %s: rezumare de la poziЧia %ld: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:292
+#: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Eroare fatalЦ la parserul de mail la poziЧia %ld Нn folderul %s"
 
-#: camel/providers/local/camel-mbox-summary.c:367
+#: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Nu pot rezuma folderul: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699 mail/mail-ops.c:1387
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Sincronizare folder"
 
-#: camel/providers/local/camel-mbox-summary.c:503
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:507
+#: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Nu pot deschide folderul pentru rezumare: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:520
+#: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nu pot deschide cЦsuЧa po╨talЦ temporarЦ: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:545
-#: camel/providers/local/camel-mbox-summary.c:553
-#: camel/providers/local/camel-mbox-summary.c:742
-#: camel/providers/local/camel-mbox-summary.c:750
+#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:557
+#: camel/providers/local/camel-mbox-summary.c:746
+#: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Rezumatul ╨i folderul defecte, chiar dupЦ o sincronizare"
 
-#: camel/providers/local/camel-mbox-summary.c:596
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Eroare la scrierea Нn cЦsuЧa po╨talЦ temporarЦ: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:613
+#: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "E╨uare la scrierea Нn cЦsuЧa po╨talЦ: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
-#: camel/providers/local/camel-mbox-summary.c:800
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nu pot Нnchide folderul sursЦ %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:640
+#: camel/providers/local/camel-mbox-summary.c:644
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nu pot Нnchide folderul temporar: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:655
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nu pot redenumi folderul: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Eroare necunoscutЦ: %s"
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nu pot adЦuga mesajul la folderul mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:108
+#: camel/providers/local/camel-mh-store.c:110
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' nu e director"
 
-#: camel/providers/nntp/camel-nntp-auth.c:41
+#: camel/providers/local/camel-mh-summary.c:218
+#, fuzzy, c-format
+msgid "Cannot open MH directory path: %s: %s"
+msgstr "Nu pot deschide cЦsuЧa po╨talЦ: %s: %s\n"
+
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "Nu pot adЦuga mesajul la fi╨ierul mbox: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "`%s' nu e un fi╨ier obi╨nuit."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "Folderul `%s' nu existЦ."
+
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy
+msgid "Spool stores do not have an inbox"
+msgstr "StocЦrile locale nu au un inbox"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Fi╨ier mail-uri locale %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "Nu pot deschide fi╨ierul temporar de mesaje %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "Nu pot Нnchide folderul sursЦ %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "IntroduceЧi vЦ rog parola NNTP pentru %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:62
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "Nume utilizator rejectat de server"
 
-#: camel/providers/nntp/camel-nntp-auth.c:68
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "Esuare la trimiterea numelui utilizator la server"
 
-#: camel/providers/nntp/camel-nntp-auth.c:77
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "Nume utilizator/parolЦ rejectat de server"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "Mesajul %s negЦsit."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "Nu pot obЧine lista grup de la server."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Incapabil sЦ Нncarc fi╨ierul listЦ de grup pentru %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Incapabil sЦ salvez fi╨ierul listЦ de grup pentru: %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:38
+#: camel/providers/nntp/camel-nntp-provider.c:42
 msgid "USENET news"
 msgstr "USENET news"
 
-#: camel/providers/nntp/camel-nntp-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:44
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr "Acesta e un provider pentru citirea din ╨i postarea Нn grupuri de news USENET."
+msgstr ""
+"Acesta e un provider pentru citirea din ╨i postarea Нn grupuri de news "
+"USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:226
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Nu pot deschide directorul pentru serverul de news: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:288
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:295
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
-"AceastЦ optiune vЦ va autentifica la serverul NNTP folosind o "
-"parolЦ Нn clar "
+"AceastЦ optiune vЦ va autentifica la serverul NNTP folosind o parolЦ Нn clar "
 
-#: camel/providers/nntp/camel-nntp-store.c:327
-#: camel/providers/nntp/camel-nntp-store.c:490
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Incapabil sЦ deschid sau sЦ creez fi╨Нerul .newsrc pentru %s: %s"
@@ -4045,73 +5191,73 @@ msgstr "Nu pot aduce mesajul: %s"
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nu pot recupera mesajul de la serverul POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-provider.c:34
+#: camel/providers/pop3/camel-pop3-provider.c:37
 msgid "Message storage"
 msgstr "Stocare mesaje"
 
-#: camel/providers/pop3/camel-pop3-provider.c:36
+#: camel/providers/pop3/camel-pop3-provider.c:39
 msgid "Leave messages on server"
 msgstr "LasЦ mesajele pe server"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
+#: camel/providers/pop3/camel-pop3-provider.c:41
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "╙tergere dupЦ %s zi(le)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:45 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:47
+#: camel/providers/pop3/camel-pop3-provider.c:50
 msgid ""
 "For connecting to POP servers. The POP protocol can also be used to retrieve "
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 "Pentru conectare la servere POP. Protocolul POP poate fi deasemenea folosit "
-"pentru aducerea mailurior de la anumiЧi provideri de web mail ╨i sisteme de email proprietare."
+"pentru aducerea mailurior de la anumiЧi provideri de web mail ╨i sisteme de "
+"email proprietare."
 
-#: camel/providers/pop3/camel-pop3-provider.c:66
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
-"AceastЦ opЧiune vЦ va conecta la serverul POP folosind o parolЦ Нn clar. Aceasta "
-"este singura opЧiune suportatЦ de majoritatea serverelor POP."
+"AceastЦ opЧiune vЦ va conecta la serverul POP folosind o parolЦ Нn clar. "
+"Aceasta este singura opЧiune suportatЦ de majoritatea serverelor POP."
 
-#: camel/providers/pop3/camel-pop3-provider.c:76
+#: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr "AceastЦ opЧiune vЦ va conecta la serverul POP "
 
-#: camel/providers/pop3/camel-pop3-provider.c:88
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr ""
-"Conectare la server POP folosind Kerberos 4 la autentificare."
+msgstr "Conectare la server POP folosind Kerberos 4 la autentificare."
 
-#: camel/providers/pop3/camel-pop3-store.c:204
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Autentificare nereu╨itЦ la serverul KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, fuzzy, c-format
 msgid "Could not connect to server: %s"
 msgstr "Nu mЦ pot conecta la serverul: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:324
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Nu mЦ pot conecta la serverul POP Нn %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:363
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sVЦ rog introduceЧi parola POP3 pentru %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4120,12 +5266,12 @@ msgstr ""
 "Conectare la serverul POP e╨uatЦ.\n"
 "Eroare la trimiterea numelui utilizatorului: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:385
-#: camel/providers/pop3/camel-pop3-store.c:422
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "(Unknown)"
 msgstr "(Necunoscut)"
 
-#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4133,7 +5279,7 @@ msgstr ""
 "Conectare la serverul POP e╨uatЦ.\n"
 "Mecanismul de autentificare solicitat este nesuportat."
 
-#: camel/providers/pop3/camel-pop3-store.c:420
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4142,433 +5288,485 @@ msgstr ""
 "Conectare e╨uatЦ la serverul POP.\n"
 "Eroare la trimiterea parolei: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:488
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Nu existЦ folderul `%s'."
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:57
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: camel/providers/sendmail/camel-sendmail-provider.c:39
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
-msgstr "Pentru livrarea mailului prin trecerea lui la programul \"sendmail\" Нn "
+msgstr ""
+"Pentru livrarea mailului prin trecerea lui la programul \"sendmail\" Нn "
 "sistemul local."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#: camel/providers/sendmail/camel-sendmail-transport.c:107
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Nu pot crea legЦtura cЦtre sendmail: %s: mailul nu este trimis"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#: camel/providers/sendmail/camel-sendmail-transport.c:124
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Nu pot face fork la sendmail: %s: mailul nu este trimis"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#: camel/providers/sendmail/camel-sendmail-transport.c:150
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Nu pot trimite mesajul: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#: camel/providers/sendmail/camel-sendmail-transport.c:163
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail oprit cu mesajul %s: mailul nu este trimis."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#: camel/providers/sendmail/camel-sendmail-transport.c:170
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Nu pot executa %s: mailul nu este trimis."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#: camel/providers/sendmail/camel-sendmail-transport.c:175
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail oprit cu starea %d: mailul nu este trimis."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:192
+#: camel/providers/sendmail/camel-sendmail-transport.c:194
 msgid "Could not find 'From' address in message"
 msgstr "Nu gЦsesc adresa 'De la' Нn mesaj"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:245
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:249
 msgid "Mail delivery via the sendmail program"
 msgstr "Mail trimis prin intermediul programului sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:35 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37
+#: camel/providers/smtp/camel-smtp-provider.c:40
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
-msgstr "Pentru trimiterea mailului prin conectare la un hub de mailuri distant folosind SMTP.\n"
+msgstr ""
+"Pentru trimiterea mailului prin conectare la un hub de mailuri distant "
+"folosind SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "Eroare de sintaxЦ, comandЦ nerecunoscutЦ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "Eroare de sintaxЦ la parametri sau argumente"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Comanda neimplementatЦ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "Parametru al comenzii neimplementat"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr "Starea sistemului, sau rЦspuns de ajutor al sistemului"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "Mesaj de ajutor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Service terminat"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr "Service-ul Нnchide canalul de transmisie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr "Service-ul invalid, canal de transmisie Нnchis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr "AcЧiunea cerutЦ de mail terminatЦ Нn regulЦ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr "Utilizatorul nu e local: Нnaintez la <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "AcЧiunea cerutЦ de mail neefectuatЦ: cЦsuЧa po╨talЦ indisponibilЦ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "AcЧiunea cerutЦ neefectuatЦ: cЦsuЧa po╨talЦ indisponibilЦ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr "AcЧiunea cerutЦ anulatЦ: eroare la procesare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr "Utilizatorul nu este local; НncercaЧi vЦ rog <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
-msgstr "AcЧiunea cerutЦ refuzatЦ: posibilitatea de stocare a sistemului insuficientЦ"
+msgstr ""
+"AcЧiunea cerutЦ refuzatЦ: posibilitatea de stocare a sistemului insuficientЦ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "AcЧiunea cerutЦ anulatЦ: depЦ╨e╨te posibilitЦЧile de stocare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "AcЧiunea cerutЦ anulatЦ: numele cЦsuЧei de mail nu este permis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "нncepeЧi introducerea mailului; terminaЧi cu <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "TranzacЧie e╨uatЦ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr "E nevoie de o tranziЧie a parolei"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "Mecanismul de autenticare este prea slab"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Mecanismul de autentificare cerut necesitЦ criptare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "E╨uare temporarЦ a autentificЦrii"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "NecesitЦ autentificare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "RЦspuns de eroare: %s: probabil nu e fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:374
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s"
+msgstr "Serverul IMAP %s nu suportЦ tipul cerut de autentificare %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sIntroduceЧi vЦ rog parola SMTP pentru %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/smtp/camel-smtp-transport.c:420
+#, fuzzy, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"Autentificare la serverul IMAP e╨uatЦ.\n"
+"%s\n"
+"\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "Server SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:511
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP mail livrat prin %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr "Nu pot trimite mesajul: adresa expeditorului nedefinitЦ."
 
-#: camel/providers/smtp/camel-smtp-transport.c:543
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr "Nu pot trimite mesajul: adresa expeditorului invalidЦ."
 
-#: camel/providers/smtp/camel-smtp-transport.c:557
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "Trimit mesaj"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "Nu pot trimite mesajul: destinatar nedefinit."
 
-#: camel/providers/smtp/camel-smtp-transport.c:651
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Comanda HELO a expirat: %s: nefatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:670
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "RЦspuns de eroare la comanda HELO: %s: nefatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:705
-#: camel/providers/smtp/camel-smtp-transport.c:717
+#: camel/providers/smtp/camel-smtp-transport.c:744
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Autentificare"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Comanda AUTH a expirat: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:775
+#: camel/providers/smtp/camel-smtp-transport.c:782
+#, fuzzy
+msgid "AUTH request failed."
+msgstr "Comanda AUTH a expirat: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr "RЦspuns de la server: autentificare e╨uatЦ.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:800
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Comanda MAIL FROM a expirat: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:819
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "RЦspuns de eroare la comanda MAIL FROM: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:844
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Comanda RCPT TO a expirat: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:863
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "RЦspuns de eroare la comanda RCPT TO: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Comanda DATA a expirat: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:913
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "RЦspuns de eroare la comanda DATA: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:928
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "DATA - timp expirat: terminarea mesajului: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:965
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
-msgstr "DATA rЦspuns de eroare: terminarea mesajului: %s: mesajul nu a fost trimis"
+msgstr ""
+"DATA rЦspuns de eroare: terminarea mesajului: %s: mesajul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET timp expirat: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1008
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET rЦspuns de eroare: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1031
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Comanda QUIT a expirat: %s: nefatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT rЦspuns de eroare: %s: nefatal"
 
-#: composer/e-msg-composer-attachment-bar.c:87
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:96
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:100
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:116
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "ata╨"
 
-#: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Ata╨eazЦ un fisier"
-
-#: composer/e-msg-composer-attachment-bar.c:461
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "Scoate articolele selectate din lista de ata╨uri"
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "AdaugЦ ata╨..."
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "Ata╨ezЦ un fi╨ier la mesaj"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1050
-msgid "Attachment"
-msgstr "Ata╨"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "ProprietЦЧile ata╨ului"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Nume fi╨ier:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "Ata╨ inline"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "Tip MIME:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Timite ca:"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
+msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "Click aici pentru agenda"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:709
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "De la:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:711
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "RЦspuns la:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:633
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Subiect:"
 
-#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:713
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "La:"
 
-#: composer/e-msg-composer-hdrs.c:377
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "IntroduceЧi destinatarul mesajului"
 
-#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:715
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:381
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "IntroduceЧi adresele care vor primi o copie a mesajului"
 
-#: composer/e-msg-composer-hdrs.c:384
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:385
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
-"IntroduceЧi adresele care vor primi o copie a mesajului fЦrЦ sЦ aparЦ Нn"
-"lista destinatarilor mesajului"
+"IntroduceЧi adresele care vor primi o copie a mesajului fЦrЦ sЦ aparЦ "
+"Нnlista destinatarilor mesajului"
 
-#: composer/e-msg-composer.c:519
-#, c-format
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Ata╨eazЦ un fisier"
+
+#: composer/e-msg-composer.c:670
+#, fuzzy, c-format
 msgid ""
-"Could not open signature file %s:\n"
+"Could not open file %s:\n"
 "%s"
 msgstr ""
-"Nu pot deschde fi╨ierul semnЦturЦ %s:\n"
+"Nu pot deschide fi╨ierul `%s':\n"
 "%s"
 
-#: composer/e-msg-composer.c:707
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr "Eroare la НncЦrcarea fi╨ierului: %s"
+
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "SalveazЦ ca..."
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "Avertisment"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Eroare la salvarea fi╨ierului: %s"
 
-#: composer/e-msg-composer.c:738
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Eroare la НncЦrcarea fi╨ierului: %s"
 
-#: composer/e-msg-composer.c:810
+#: composer/e-msg-composer.c:997
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -4576,59 +5774,82 @@ msgstr ""
 "Nu pot descide folderul cu ciorne pentru acest cont.\n"
 "DoriЧi sЦ folosiЧi folderul cu ciorne implicit?"
 
-#: composer/e-msg-composer.c:868 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
-msgstr "Evolution"
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Eroare la salvarea fi╨ierului: %s"
+
+#: composer/e-msg-composer.c:1055
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "Nu pot recupera mesajul de la serverul POP %s: %s"
+
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"Nu pot crea fi╨ierul de ie╨ire: %s\n"
+" %s"
 
-#: composer/e-msg-composer.c:874
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"Nu pot crea fi╨ierul de ie╨ire: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"Eroare Нn timpul salvЦrii mesajului la: %s:\n"
+" %s"
+
+#: composer/e-msg-composer.c:1173
+#, fuzzy
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+"Evolution a gЦsit fi╨iere de mail Pine.\n"
+"DoriЧi sЦ le importaЧi Нn Evolution?"
+
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr "DoriЧi sЦ salvaЧi modificЦrile?"
 
-#: composer/e-msg-composer.c:899
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Deschid fi╨ier"
 
-#: composer/e-msg-composer.c:1025
-msgid "That file does not exist."
-msgstr "Acest fi╨ier nu existЦ."
-
-#: composer/e-msg-composer.c:1035
-msgid "That is not a regular file."
-msgstr "Acesta nu este un fi╨ier normal."
-
-#: composer/e-msg-composer.c:1045
-msgid "That file exists but is not readable."
-msgstr "Acest fi╨ier existЦ dar nu se poate citi."
-
-#: composer/e-msg-composer.c:1055
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Acest fi╨ier pare accesibil dar open(2) a e╨uat."
-
-#: composer/e-msg-composer.c:1077
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"Fi╨ierul este foarte mare (mai mare de 100k).\n"
-"SunteЧi sigur cЦ vreЧi sЦ-l inseraЧi?"
-
-#: composer/e-msg-composer.c:1098
-msgid "An error occurred while reading the file."
-msgstr "A apЦrut o eroare Нn timpul citirii fi╨ierului."
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "InsereazЦ fi╨ier text..."
 
-#: composer/e-msg-composer.c:1399 composer/e-msg-composer.c:1731
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Compune un mesaj"
 
-#: composer/e-msg-composer.c:1820
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "Nu pot crea fereastra de compunere."
 
-#: composer/evolution-composer.c:352
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -4636,7 +5857,7 @@ msgstr ""
 "Nu pot crea fereastra de compunere pentru cЦ n-aЧi configurat НncЦ\n"
 "nici o identitate Нn componenЧa mailului."
 
-#: composer/evolution-composer.c:367
+#: composer/evolution-composer.c:374
 msgid "Cannot initialize Evolution's composer."
 msgstr "Nu pot iniЧializa compozitorul Evolution."
 
@@ -4653,302 +5874,122 @@ msgid "calendar information"
 msgstr "informaЧie calendar"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:474
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr ""
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
-msgid "%I:%M:%S %p%n"
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+msgid "%I:%M:%S %p"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:93 e-util/e-time-utils.c:204
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:96 e-util/e-time-utils.c:207
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%a %m/%d/%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %m/%d/%Y"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:268
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:470
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2500
+#: e-util/e-time-utils.c:298
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:273
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:282
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:311 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:314
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:319 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:322
-msgid "%I:%M:%S %p"
-msgstr ""
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Componenta Evolution pentru rezumatul activitЦЧilor."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Procesator pentru componenta rezumat al activitЦЧilor."
-
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Nu pot iniЧializa componenta Evolution pentru rezumatul activitЦЧilor."
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"PuteЧi alege o altЦ paginЦ HTML pentru fundalul rezumatului activitЦЧilor.\n"
-"\n"
-"Pentru cel implicit lЦsaЧi-l gol"
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "Deschide %s cu aplicaЧia implicitЦ GNOME"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Deschide %s cu navigatorul web implicit GNOME"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Trimite un email la %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "SchimbЦ vederea cu %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Rulez %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "нnchid %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "MutЦ %s la stБnga"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "MutЦ %s la dreapta"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "MutЦ %s Нn rБndul precedent"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "MutЦ %s Нn rБndul urmЦtor"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "Configurez %s"
-
-#: executive-summary/component/e-summary.c:918
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Nu pot deschide fi╨ierul HTML: \n"
-"%s"
-
-#: executive-summary/component/e-summary.c:932
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Eroarea la citirea datelor:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:950
-msgid "File does not have a place for the services.\n"
-msgstr "Fi╨ierul nu are un loc pentru servicii.\n"
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "AparenЧЦ"
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "Fundal:"
-
-#: executive-summary/component/main.c:60
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"Componenta rezumat al activitЦЧilor nu poate iniЧializa Bonobo.\n"
-"DacЦ a fost un mesaj de avertisment despre RootPOA, probabil aЧi\n"
-"compilat Bonobo cu GOAD in loc de OAF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "Procesator pentru rezumatul RDF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "Rezumat RDF"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "Procesator pentru componenta de test bonobo."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "Procesator pentru componenta de test."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Service bonobo de test"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Service de test"
-
-#: executive-summary/test-service/rdf-summary.c:509
-#: executive-summary/test-service/rdf-summary.c:546
-#: executive-summary/test-service/rdf-summary.c:591
-#: widgets/misc/e-messagebox.c:155
-msgid "Error"
-msgstr "Eroare"
-
-#: executive-summary/test-service/rdf-summary.c:765
-msgid "Update automatically"
-msgstr "Actualizare automatЦ"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update now"
-msgstr "Actualizez acum"
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update every "
-msgstr "Actualizez tot"
-
-#: executive-summary/test-service/rdf-summary.c:793
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "minute"
-
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "an"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "ani"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "lunЦ"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "luni"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "sЦptЦmБnЦ"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "sЦptЦmБni"
 
-#: filter/filter-datespec.c:65
-msgid "days"
-msgstr "zile"
-
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "orЦ"
 
-#: filter/filter-datespec.c:66
-msgid "hours"
-msgstr "ore"
-
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "minut"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "secundЦ"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "secunde"
 
-#: filter/filter-datespec.c:183
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Oops. Ai uitat sЦ alegi o datЦ."
 
-#: filter/filter-datespec.c:185
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Oops. Ai ales o datЦ invalidЦ."
 
-#: filter/filter-datespec.c:260
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -4957,7 +5998,7 @@ msgstr ""
 "Data mesajului va fi comparatЦ indiferent dacЦ\n"
 "filtrul ruleazЦ sau vfolder este deschis."
 
-#: filter/filter-datespec.c:283
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -4965,7 +6006,7 @@ msgstr ""
 "Data mesajului va fi comparatЦ indiferent\n"
 "de ora specificatЦ aici."
 
-#: filter/filter-datespec.c:323
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -4976,50 +6017,53 @@ msgstr ""
 "\"sЦptЦmБna trecutЦ\", de exemplu."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:358
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "ora curentЦ"
 
-#: filter/filter-datespec.c:358
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "ora specificatЦ"
 
-#: filter/filter-datespec.c:359
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "o orЦ relativЦ la ora curentЦ"
 
 #. The label
-#: filter/filter-datespec.c:417
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Compara faЧЦ de"
 
-#: filter/filter-datespec.c:534 filter/filter-datespec.c:694
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "acum"
 
-#: filter/filter-datespec.c:691
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<click aici pentru a specifica o datЦ>"
 
-#: filter/filter-editor.c:126 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:6
 msgid "Filter Rules"
 msgstr "Reguli filtre"
 
 #. and now for the action area
-#: filter/filter-filter.c:423
+#: filter/filter-filter.c:452
 msgid "Then"
 msgstr "Atunci"
 
-#: filter/filter-filter.c:436
+#: filter/filter-filter.c:466
 msgid "Add action"
 msgstr "AdaugЦ acЧiune"
 
-#: filter/filter-filter.c:442
-#, fuzzy
-msgid "Remove action"
-msgstr "MutЦ acЧiunea"
-
-#: filter/filter-folder.c:143
+#: filter/filter-folder.c:147
 msgid ""
 "Oops, you forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -5027,20 +6071,20 @@ msgstr ""
 "Oops, aЧi uitat sЦ alegeЧi un folder.\n"
 "VЦ rog mergeЧi Нnapoi ╨i precizaЧi un folder sЦ livrez mailul."
 
-#: filter/filter-folder.c:221 filter/vfolder-rule.c:279
-#: mail/mail-account-gui.c:680
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Alege folderul"
 
-#: filter/filter-folder.c:246
+#: filter/filter-folder.c:250
 msgid "Enter folder URI"
 msgstr "Introdu folder URI"
 
-#: filter/filter-folder.c:292
+#: filter/filter-folder.c:296
 msgid "<click here to select a folder>"
 msgstr "<clic aici sЦ alegeЧi un folder>"
 
-#: filter/filter-input.c:188
+#: filter/filter-input.c:193
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -5049,50 +6093,57 @@ msgstr ""
 "Eroare Нn expresia regulatЦ '%s':\n"
 "%s"
 
-#: filter/filter-part.c:466
+#: filter/filter-part.c:488
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:599
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr "Nume regulЦ:"
 
-#: filter/filter-rule.c:603
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr "FЦrЦ titlu"
 
-#: filter/filter-rule.c:619
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "DacЦ"
 
-#: filter/filter-rule.c:636
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "ExecutЦ acЧiunile"
 
-#: filter/filter-rule.c:640
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "dacЦ toate criteriile sunt Нndeplinite"
 
-#: filter/filter-rule.c:645
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "dacЦ oricare criteriu e Нndeplinit"
 
-#: filter/filter-rule.c:656
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "AdaugЦ criteriu"
 
-#: filter/filter-rule.c:662
-msgid "Remove criterion"
-msgstr "Scoate criteriu"
-
-#: filter/filter-rule.c:752
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "intrЦ"
 
-#: filter/filter-rule.c:752
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "iese"
 
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "AdaugЦ"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Editez"
+
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "EditeazЦ filtre"
@@ -5109,7 +6160,7 @@ msgstr "IntrЦ"
 msgid "Outgoing"
 msgstr "Iese"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Foldere virtuale"
 
@@ -5133,370 +6184,517 @@ msgstr "cu toate folderele locale ╨i distante active"
 msgid "with all local folders"
 msgstr "cu toate folderele locale"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
+#: filter/libfilter-i18n.h:3
+#, fuzzy
+msgid "Assign Color"
 msgstr "Atribuie culoare"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Atribuie punctaj"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Ata╨uri"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "conЧine"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "CopiazЦ Нn folder"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Date recepЧionate"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Date trimise"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "╙terse"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "nu conЧine"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "nu se terminЦ cu"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "nu existЦ"
+
+#: filter/libfilter-i18n.h:16
+msgid "does not sound like"
+msgstr "nu sunЦ ca"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
+msgstr "nu Нncepe cu"
+
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr "Nu existЦ"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "CiornЦ"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:20
+msgid "ends with"
+msgstr "se terminЦ cu"
+
+#: filter/libfilter-i18n.h:21
 msgid "Exist"
 msgstr "ExistЦ"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:22
+msgid "exists"
+msgstr "existЦ"
+
+#: filter/libfilter-i18n.h:23
 msgid "Expression"
 msgstr "Expresie"
 
-#: filter/libfilter-i18n.h:14
-msgid "Forward to Address"
-msgstr "нnainteazЦ la adresa"
-
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:24
 msgid "Important"
 msgstr "Important"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
+msgid "is"
+msgstr "este"
+
+#: filter/libfilter-i18n.h:26
+msgid "is greater than"
+msgstr "e mai mare decБt"
+
+#: filter/libfilter-i18n.h:27
+msgid "is less than"
+msgstr "e mai mic decБt"
+
+#: filter/libfilter-i18n.h:28
+msgid "is not"
+msgstr "nu este"
+
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Lista de mail"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Corp mesaj"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Antet mesaj"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Mesajul a fost recepЧionat"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Mesajul a fost trimis"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "MutЦ in folder"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:35
+msgid "on or after"
+msgstr "Нn sau dupЦ"
+
+#: filter/libfilter-i18n.h:36
+msgid "on or before"
+msgstr "Нn sau Нnainte"
+
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Cite╨te"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Destinatari"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Potrivire regex"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "RЦspuns la"
 
-#: filter/libfilter-i18n.h:26 filter/score-rule.c:193 filter/score-rule.c:195
-#: mail/message-list.c:1050
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Punctaj"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Expeditor"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "SeteazЦ starea"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "MЦrime"
+
+#: filter/libfilter-i18n.h:45
+msgid "sounds like"
+msgstr "sunЦ ca"
+
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "Source Account"
+msgstr "Cont"
+
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr "Antet specific"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:48
+msgid "starts with"
+msgstr "Нncepe cu"
+
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Opresc procesarea"
 
-#: filter/libfilter-i18n.h:32 mail/message-list.c:1051
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Subiect"
 
-#: filter/libfilter-i18n.h:35
-msgid "contains"
-msgstr "conЧine"
+#: filter/libfilter-i18n.h:52
+msgid "was after"
+msgstr "a fost dupЦ"
 
-#: filter/libfilter-i18n.h:36
-msgid "does not contain"
-msgstr "nu conЧine"
+#: filter/libfilter-i18n.h:53
+msgid "was before"
+msgstr "a fost Нnainte"
 
-#: filter/libfilter-i18n.h:37
-msgid "does not end with"
-msgstr "nu se terminЦ cu"
+#: filter/rule-editor.c:147
+msgid "Rules"
+msgstr "Reguli"
 
-#: filter/libfilter-i18n.h:38
-msgid "does not exist"
-msgstr "nu existЦ"
+#: filter/rule-editor.c:240
+msgid "Add Rule"
+msgstr "AdaugЦ reguli"
 
-#: filter/libfilter-i18n.h:39
-msgid "does not sound like"
-msgstr "nu sunЦ ca"
+#: filter/rule-editor.c:299
+#, fuzzy
+msgid "Edit Rule"
+msgstr "Editez reguli"
 
-#: filter/libfilter-i18n.h:40
-msgid "does not start with"
-msgstr "nu Нncepe cu"
+#: filter/score-editor.c:130
+msgid "Score Rules"
+msgstr "Reguli de punctaj"
 
-#: filter/libfilter-i18n.h:41
-msgid "ends with"
-msgstr "se terminЦ cu"
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
 
-#: filter/libfilter-i18n.h:42
-msgid "exists"
-msgstr "existЦ"
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
+msgstr "Import"
 
-#: filter/libfilter-i18n.h:43
-msgid "is greater than"
-msgstr "e mai mare decБt"
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "Mail"
+msgstr "Email"
 
-#: filter/libfilter-i18n.h:44
-msgid "is less than"
-msgstr "e mai mic decБt"
+#: importers/elm-importer.c:498
+#, fuzzy
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution a gЦsit fi╨iere de mail Elm.\n"
+"DoriЧi sЦ le importaЧi Нn Evolution?"
 
-#: filter/libfilter-i18n.h:45
-msgid "is not"
-msgstr "nu este"
+#: importers/elm-importer.c:527
+#, fuzzy
+msgid "Elm mail"
+msgstr "Mail Elm"
 
-#: filter/libfilter-i18n.h:46
-msgid "is"
-msgstr "este"
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "AdЦugare agendЦ"
 
-#: filter/libfilter-i18n.h:47
-msgid "on or after"
-msgstr "Нn sau dupЦ"
+#: importers/evolution-gnomecard-importer.c:253
+#, fuzzy
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution a gЦsit fi╨iere de mail Netscape.\n"
+"DoriЧi sЦ le importaЧi Нn Evolution?"
 
-#: filter/libfilter-i18n.h:48
-msgid "on or before"
-msgstr "Нn sau Нnainte"
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "SetЦri..."
 
-#: filter/libfilter-i18n.h:49
-msgid "sounds like"
-msgstr "sunЦ ca"
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution a gЦsit fi╨iere de mail Netscape.\n"
+"DoriЧi sЦ le importaЧi Нn Evolution?"
 
-#: filter/libfilter-i18n.h:50
-msgid "starts with"
-msgstr "Нncepe cu"
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution a gЦsit fi╨iere de mail Pine.\n"
+"DoriЧi sЦ le importaЧi Нn Evolution?"
 
-#: filter/libfilter-i18n.h:51
-msgid "was after"
-msgstr "a fost dupЦ"
+#: importers/pine-importer.c:691
+#, fuzzy
+msgid "Pine mail"
+msgstr "Mail Pine"
 
-#: filter/libfilter-i18n.h:52
-msgid "was before"
-msgstr "a fost Нnainte"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "ComponentЦ Evolution pentru manipularea mailului."
 
-#: filter/rule-editor.c:142
-msgid "Rules"
-msgstr "Reguli"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr "Compozitorul de mailuiri Evolution."
 
-#: filter/rule-editor.c:235
-msgid "Add Rule"
-msgstr "AdaugЦ reguli"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr "Componenta Evolution pentru rezumatul activitЦЧilor."
 
-#: filter/rule-editor.c:293
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr "Componenta Evolution pentru afi╨area mailului."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr "Componenta Evolution pentru procesarea mailului."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr "Procesator pentru compozitorul Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr "Procesator pentru componenta de mail Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr "Procesator pentru componenta rezumat mail."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 #, fuzzy
-msgid "Edit Rule"
-msgstr "Editez reguli"
+msgid "Mail configuration interface"
+msgstr "Configurare mail"
 
-#: filter/score-editor.c:126
-msgid "Score Rules"
-msgstr "Reguli de punctaj"
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "_ProprietЦЧi..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "ModificЦ proprietЦЧile fi╨ierului"
 
-#: mail/component-factory.c:332
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nu pot iniЧializa componenta mail Evolution."
 
-#: mail/component-factory.c:445
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-factory.c:208
+#: mail/folder-browser-ui.c:254
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "ProprietЦЧi pentru \"%s\""
 
-#: mail/folder-browser-factory.c:210 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
+#: mail/folder-browser-ui.c:256
 msgid "Properties"
 msgstr "ProprietЦЧi"
 
-#: mail/folder-browser.c:221
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Nu pot crea directorul temporar: %s"
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "Stochez cЦutarea ca vFolder"
 
-#: mail/folder-browser.c:529
-msgid "VFolder on Subject"
-msgstr "VFolder Нn subiect"
+#: mail/folder-browser.c:1238
+msgid "VFolder on _Subject"
+msgstr "VFolder pe _subiect"
 
-#: mail/folder-browser.c:532
-msgid "VFolder on Sender"
-msgstr "VFolder Нn expeditor"
+#: mail/folder-browser.c:1241
+msgid "VFolder on Se_nder"
+msgstr "VFolder pe expeditor"
 
-#: mail/folder-browser.c:535
-msgid "VFolder on Recipients"
-msgstr "VFolder Нn destinatari"
+#: mail/folder-browser.c:1244
+msgid "VFolder on _Recipients"
+msgstr "Vfolder pe destinatari"
 
-#: mail/folder-browser.c:538 mail/folder-browser.c:729
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1247
+#, fuzzy
+msgid "VFolder on Mailing _List"
 msgstr "VFolder Нn lista de mail"
 
-#: mail/folder-browser.c:544
-msgid "Filter on Subject"
+#: mail/folder-browser.c:1253
+#, fuzzy
+msgid "Filter on Sub_ject"
 msgstr "Filtru pe subiect"
 
-#: mail/folder-browser.c:547
-msgid "Filter on Sender"
+#: mail/folder-browser.c:1256
+#, fuzzy
+msgid "Filter on Sen_der"
 msgstr "Filtru pe expeditor"
 
-#: mail/folder-browser.c:550
-msgid "Filter on Recipients"
+#: mail/folder-browser.c:1259
+#, fuzzy
+msgid "Filter on Re_cipients"
 msgstr "Filtru pe destinatari"
 
-#: mail/folder-browser.c:553 mail/folder-browser.c:728
-msgid "Filter on Mailing List"
+#: mail/folder-browser.c:1262
+#, fuzzy
+msgid "Filter on _Mailing List"
 msgstr "Filtru pe lista de mail"
 
-#: mail/folder-browser.c:564
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Retrimite"
 
-#: mail/folder-browser.c:566
-msgid "Save As..."
-msgstr "SalveazЦ ca..."
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
+msgid "_Save As..."
+msgstr "_SalveazЦ ca..."
 
-#: mail/folder-browser.c:568 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:29 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "TipЦre╨te"
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
+msgid "_Print"
+msgstr "Ti_pЦre╨te"
 
-#: mail/folder-browser.c:573
-msgid "Reply to Sender"
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
+#, fuzzy
+msgid "_Reply to Sender"
 msgstr "RЦspuns la expeditor"
 
-#: mail/folder-browser.c:575 mail/mail-view.c:141 ui/evolution-mail.xml.h:36
-msgid "Reply to All"
-msgstr "RЦspuns la toЧi" 
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "RЦspuns la toЧi"
 
-#: mail/folder-browser.c:577 mail/mail-view.c:144 ui/evolution-mail.xml.h:14
-msgid "Forward"
-msgstr "нnaintare"
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
+msgid "Reply to _All"
+msgstr "RЦspuns la toЧi"
 
-#: mail/folder-browser.c:579
-msgid "Forward inline"
-msgstr ""
+#: mail/folder-browser.c:1288
+msgid "_Forward"
+msgstr "_нnainteazЦ"
 
-#: mail/folder-browser.c:582
-msgid "Mark as Read"
-msgstr "Marchez ca citit"
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
+msgid "Mar_k as Read"
+msgstr "MarcheazЦ ca citit"
+
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
+msgid "Mark as U_nread"
+msgstr "MarcheazЦ ca _necitit"
+
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "Important"
 
-#: mail/folder-browser.c:584
-msgid "Mark as Unread"
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
 msgstr "Marchez ca necitit"
 
-#: mail/folder-browser.c:589
-msgid "Move to Folder..."
-msgstr "Mut Нn folderul..."
+#: mail/folder-browser.c:1302
+msgid "_Move to Folder..."
+msgstr "MutЦ Нn folder..."
 
-#: mail/folder-browser.c:591
-msgid "Copy to Folder..."
-msgstr "Copiez Нn folderul..."
+#: mail/folder-browser.c:1304
+msgid "_Copy to Folder..."
+msgstr "_CopiazЦ Нn folderul..."
 
-#: mail/folder-browser.c:595
-msgid "Undelete"
-msgstr "Recuperare"
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
+msgid "_Undelete"
+msgstr "Rec_uperare"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:605
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "AdЦugare agendЦ"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "AplicЦ filtre"
 
-#: mail/folder-browser.c:609
-msgid "Create Rule From Message"
+#: mail/folder-browser.c:1322
+#, fuzzy
+msgid "Create Ru_le From Message"
 msgstr "Creez regulЦ din mesaj"
 
-#: mail/folder-browser.c:731
+#: mail/folder-browser.c:1479
+msgid "Filter on Mailing List"
+msgstr "Filtru pe lista de mail"
+
+#: mail/folder-browser.c:1480
+msgid "VFolder on Mailing List"
+msgstr "VFolder Нn lista de mail"
+
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtru pe lista de mail (%s)"
 
-#: mail/folder-browser.c:732
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VFolder pe lista de mail (%s)"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "ComponentЦ Evolution pentru manipularea mailului."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Compozitorul de mailuiri Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Componenta Evolution pentru rezumatul activitЦЧilor."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Componenta Evolution pentru afi╨area mailului."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Componenta Evolution pentru procesarea mailului."
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import mbox into Evolution"
+msgstr "Procesator pentru importul mbox Нn Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Procesator pentru compozitorul Evolution."
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports mbox files into Evolution"
+msgstr "Import fi╨ierele mbox Нn Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Procesator pentru componenta de mail Evolution."
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgstr "Procesator pentru importul mailurilor Outlook Express 4 Нn Evolution"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "Procesator pentru componenta rezumat mail."
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports Outlook Express 4 files into Evolution"
+msgstr "Import fi╨ierele Outlook Express 4 Нn Evolution"
 
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
@@ -5532,65 +6730,94 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-accounts.c:117
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+msgid "You have not filled in all of the required information."
+msgstr "Nu aЧi completat toatЦ informЧia ce vi s-a cerut."
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Editor de conturi Evolution"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
+msgid "Evolution Account Editor"
+msgstr "Editor de conturi Evolution"
+
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "Fi╨ier semnЦturЦ:"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr "DoriЧi sЦ salvaЧi modificЦrile?"
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr " (implicit)"
 
-#: mail/mail-accounts.c:157
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "InvalideazЦ"
 
-#: mail/mail-accounts.c:159 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "ValideazЦ"
 
-#: mail/mail-accounts.c:240 mail/mail-accounts.c:244
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "SunteЧi sigur cЦ doriЧi sЦ ╨tergeЧi acest cont?"
 
-#: mail/mail-accounts.c:369 mail/mail-accounts.c:373
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Recuperare"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "FЦ contul acesta contul meu implicit"
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr "SunteЧi sigur cЦ doriЧi sЦ ╨tergeЧi acest cont nou?"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:487
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Manager de conturi Evolution"
 
-#: mail/mail-account-editor.c:98
-msgid "You have not filled in all of the required information."
-msgstr "Nu aЧi completat toatЦ informЧia ce vi s-a cerut."
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:166
-msgid "Evolution Account Editor"
-msgstr "Editor de conturi Evolution"
-
-#: mail/mail-autofilter.c:71
+#: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Mail la %s"
 
-#: mail/mail-autofilter.c:214
+#: mail/mail-autofilter.c:213
 #, c-format
 msgid "Subject is %s"
 msgstr "Subiectul este %s"
 
-#: mail/mail-autofilter.c:230
+#: mail/mail-autofilter.c:229
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail de la %s"
 
-#: mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:285
 #, c-format
 msgid "%s mailing list"
 msgstr "%s lista de mail"
 
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
 msgid "Add Filter Rule"
 msgstr "AdaugЦ regulЦ de filtrare"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5602,7 +6829,7 @@ msgstr ""
 "trimite, primi sau compune mailuri.\n"
 "DoriЧi sЦ faceЧi configurarea acum?"
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5610,7 +6837,7 @@ msgstr ""
 "Trebuie sЦ configuraЧi o identitate\n"
 "Нnainte de a putea compune mailuri."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5618,11 +6845,11 @@ msgstr ""
 "Trebuie sЦ configuraЧi transportul mailurilor\n"
 "Нnainte pentru a putea sЦ trimiteЧi mail. "
 
-#: mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr "Nu aЧi setat o metodЦ de transport a mailului"
 
-#: mail/mail-callbacks.c:235
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5630,32 +6857,46 @@ msgstr ""
 "Acest mesaj nu are subiect.\n"
 "Chiar trimiteЧi?"
 
-#: mail/mail-callbacks.c:308
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr "Trebuie sЦ specificaЧi un destinatar pentru a trimite acest mesaj."
 
-#: mail/mail-callbacks.c:351
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
-msgstr "Trebuie sЦ configuraЧi un cont Нnainte pentru a putea sЦ trimiteЧi acest mail"
+msgstr ""
+"Trebuie sЦ configuraЧi un cont Нnainte pentru a putea sЦ trimiteЧi acest mail"
 
-#: mail/mail-callbacks.c:588
-#, c-format
-msgid "On %s, %s wrote:\n"
+#: mail/mail-callbacks.c:653
+#, fuzzy, c-format
+msgid "On %s, %s wrote:"
 msgstr "нn %s %s a scris:\n"
 
-#: mail/mail-callbacks.c:770
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Mesaj Нnaintat:\n"
 
-#: mail/mail-callbacks.c:873
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "MutЦ mesaj(e) Нn"
 
-#: mail/mail-callbacks.c:875
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "CopiazЦ mesaje(le) Нn"
 
-#: mail/mail-callbacks.c:1086
+#: mail/mail-callbacks.c:1374
+#, fuzzy, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr "SunteЧi sigur cЦ doriЧН sЦ ╨tergeЧi task-ul `%s'?"
+
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5663,7 +6904,7 @@ msgstr ""
 "PuteЧi numai sЦ editaЧi mesajele\n"
 "salvate Нn folderul Ciorne"
 
-#: mail/mail-callbacks.c:1117
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -5671,44 +6912,101 @@ msgstr ""
 "PuteЧi numai sЦ retrimiteЧi mesajele\n"
 "din folderul Trimise"
 
-#: mail/mail-callbacks.c:1150 mail/mail-display.c:86
-msgid "Overwrite file?"
-msgstr "SuprascrieЧi fi╨ierul?"
+#: mail/mail-callbacks.c:1442
+#, fuzzy, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "SunteЧi sigur cЦ doriЧН sЦ ╨tergeЧi task-ul `%s'?"
 
-#: mail/mail-callbacks.c:1154 mail/mail-display.c:90
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr "" 
-"Fi╨ier al cЦrui nume existЦ deja.\n"
-"нl suprascrieЧi?"
+#: mail/mail-callbacks.c:1463
+#, fuzzy
+msgid "No Message Selected"
+msgstr "Mesajul a fost recepЧionat"
 
-#: mail/mail-callbacks.c:1198
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Salvez mesajul ca..."
 
-#: mail/mail-callbacks.c:1200
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Salvez mesaje ca..."
 
-#: mail/mail-callbacks.c:1314
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 "Eroare la Нncarcarea informaЧiei de filtrare:\n"
-"%s" 
+"%s"
+
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "_Filtre..."
 
-#: mail/mail-callbacks.c:1363
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Tiparire mesaj"
 
-#: mail/mail-callbacks.c:1410
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "TipЦrirea mesajului nereu╨itЦ"
 
-#: mail/mail-config.c:1012 mail/mail-config.c:1015
+#: mail/mail-callbacks.c:1966
+#, fuzzy, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr "SunteЧi sigur cЦ doriЧi sЦ ╨tergeЧi acest cont nou?"
+
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"VЦ rog introduceЧi numele ╨i adresa de email mai jos. CБmpurile "
+"\"opЧional\"de mai jos nu e necesar sЦ le completaЧi decБt dacЦ doriЧi sЦ "
+"includeЧi aceastЦ informaЧie Нn emailul pe care-l trimiteЧi"
+
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+"VЦ rog introduceЧi mai jos informaЧii despre serverul de mail de "
+"intrare.DacЦ nu ╨tiЧi ce fel de server folosiЧi, contactaЧi "
+"administratoruldumneavoastrЦ de sistem sau furnizorul de serviciu Internet."
+
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+"VЦ rog introduceЧi mai jos informaЧii despre protocolul de mail de "
+"ie╨ire.DacЦ nu ╨tiЧi ce protocol folosiЧi, contactaЧi "
+"administratoruldumneavostrЦ de sistem sau furnizorul de serviciu Internet."
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+"Aproape aЧi terminat procesul de configurare a mailului. "
+"Identitatea,serverul de mail de intrare ╨i metoda de transport a a mailului "
+"ce le-aЧiindicat vor fi grupate НmpreunЦ pentru a face un cont de mail "
+"Evolution. VЦrog introduceЧi mai jos un nume pentru acest cont. Acest nume "
+"va fifolosit doar pentru afi╨are."
+
+#. set window title
+#: mail/mail-config-druid.c:466
+msgid "Evolution Account Wizard"
+msgstr "Asistentul de conturi Evolution"
+
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 msgid "Connecting to server..."
 msgstr "Conectare la server..."
 
@@ -5721,34 +7019,63 @@ msgid " color"
 msgstr " culoare"
 
 #: mail/mail-config.glade.h:3
+msgid "(SSL is not supported in this build of evolution)"
+msgstr ""
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Cont"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "InformaЧie cont"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "Management cont"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Conturi"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Ata╨"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Autentificare"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Tip de autentificare: "
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "Verific automat dacЦ sunt mailuri noi la fiecare"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "Compunere"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -5765,163 +7092,280 @@ msgstr ""
 "\n"
 "Clic \"Terminare\" pentru a salva setЦrile"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "Im_plicit"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Gata"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Ciorne"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Folder ciorne:"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "Editez"
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "Adresa email:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "ValideazЦ"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Nume complet:"
 
-#: mail/mail-config.glade.h:27
-msgid "Highlight citations with "
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
+msgstr ""
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "Fi╨ier semnЦturЦ:"
+
+#: mail/mail-config.glade.h:43
+#, fuzzy
+msgid "Highlight citations with"
 msgstr "IlumineazЦ citatele cu "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Identitate"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Inline"
+msgstr "_Inline"
+
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "Configurare mail"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Format mailbox"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "FЦ contul acesta contul meu implicit"
 
-#: mail/mail-config.glade.h:34
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "MarcheazЦ mesajele ca \"Citit\" dupЦ:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "LDAP Server"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "NoutЦЧi"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "InformaЧie opЧionalЦ"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "OrganizaЧie:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "Cale binarЦ PGP:"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "Alege o culoare"
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "Nu pot trimite mesajul: destinatar nedefinit."
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr "Maildir Qmail "
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "Cotat"
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "Primesc email"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "Primire mail"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "OpЧiuni primire"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "InformaЧie cerutЦ"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
+
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Security"
+msgstr "_Securitate"
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "Selectez PGP binar"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "Trimit implicit mail Нn format HTML."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "Trimit email"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "Trimitere mail"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "Trimis"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr "Trimitere ╨i mesaje ciornЦ"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "Folder mesaje trimise:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Configurare server"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Tip server:"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Serverul necesitЦ autentificare"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Fi╨ier semnЦturЦ:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "Surse"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Nici o informaЧie"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Surse"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "Foldere speciale"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr "Mbox Unix standard"
 
-#: mail/mail-config.glade.h:68
-msgid "Type"
-msgstr "Tip"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "Folose╨te conectare securizatЦ (SSL)"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Nume utilizator:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -5931,207 +7375,241 @@ msgstr ""
 "\n"
 "Clic \"UrmЦtorul\" pentru a Нncepe"
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
-msgid "_Edit"
-msgstr "_Editare"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
+msgstr ""
 
-#: mail/mail-config-druid.c:94
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
 msgstr ""
-"VЦ rog introduceЧi numele ╨i adresa de email mai jos. CБmpurile \"opЧional\""
-"de mai jos nu e necesar sЦ le completaЧi decБt dacЦ doriЧi sЦ includeЧi "
-"aceastЦ informaЧie Нn emailul pe care-l trimiteЧi"
 
-#: mail/mail-config-druid.c:96
-msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what kind of server you use, contact your system administrator or "
-"Internet Service Provider."
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr "secunde"
+
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "Nu mЦ pot conecta la serverul POP Нn %s."
+
+#: mail/mail-crypto.c:86
+#, fuzzy
+msgid "Could not create a PGP verification context."
+msgstr "Nu mЦ pot conecta la serverul POP Нn %s."
+
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr "Nu pot crea fereastra de compunere."
+
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
 msgstr ""
-"VЦ rog introduceЧi mai jos informaЧii despre serverul de mail de intrare."
-"DacЦ nu ╨tiЧi ce fel de server folosiЧi, contactaЧi administratorul" 
-"dumneavoastrЦ de sistem sau furnizorul de serviciu Internet."
+"Nu pot crea directorul %s:\n"
+"%s"
 
-#: mail/mail-config-druid.c:100
-msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know which protocol you use, contact your system administrator or "
-"Internet Service Provider."
+#: mail/mail-crypto.c:177
+msgid "Could not create a S/MIME signature context."
 msgstr ""
-"VЦ rog introduceЧi mai jos informaЧii despre protocolul de mail de ie╨ire."
-"DacЦ nu ╨tiЧi ce protocol folosiЧi, contactaЧi administratorul"
-"dumneavostrЦ de sistem sau furnizorul de serviciu Internet."
 
-#: mail/mail-config-druid.c:102
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
 msgstr ""
-"Aproape aЧi terminat procesul de configurare a mailului. Identitatea,"
-"serverul de mail de intrare ╨i metoda de transport a a mailului ce le-aЧi"
-"indicat vor fi grupate НmpreunЦ pentru a face un cont de mail Evolution. VЦ"
-"rog introduceЧi mai jos un nume pentru acest cont. Acest nume va fi"
-"folosit doar pentru afi╨are."
 
-#. set window title
-#: mail/mail-config-druid.c:439
-msgid "Evolution Account Wizard"
-msgstr "Asistentul de conturi Evolution"
+#: mail/mail-crypto.c:240
+msgid "Could not create a S/MIME encryption context."
+msgstr ""
 
-#: mail/mail-display.c:192
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "Nu pot crea fereastra de compunere."
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr "Nu pot crea fereastra de compunere."
+
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Salvez ata╨"
 
-#: mail/mail-display.c:232
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Nu pot crea directorul temporar: %s"
-
-#: mail/mail-display.c:293
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Salvez pe disc..."
 
-#: mail/mail-display.c:295
-#, c-format
-msgid "Open in %s..."
-msgstr "Deschid Нn %s..."
-
-#: mail/mail-display.c:297
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "Vedere inline"
 
-#: mail/mail-display.c:332
-msgid "External Viewer"
-msgstr "Vedere externЦ"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "Deschid Нn %s..."
 
-#: mail/mail-display.c:355
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vedere inline (via %s)"
 
-#: mail/mail-display.c:359
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Ascund"
 
-#: mail/mail-display.c:1080
-msgid "Open link in browser (FIXME)"
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "Vedere externЦ"
+
+#: mail/mail-display.c:1048
+msgid "Loading message content"
+msgstr "нncЦrcare conЧinut mesaj"
+
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
 msgstr "Deschid link Нn browser (FIXME)"
 
-#: mail/mail-display.c:1082
-msgid "Save as (FIXME)"
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "CopiazЦ locaЧia (FIXME)"
+
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
 msgstr "SalveazЦ ca (FIXME)"
 
-#: mail/mail-display.c:1084
-msgid "Copy location (FIXME)"
-msgstr "CopiazЦ locaЧia (FIXME)"
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "SalveazЦ ca..."
+
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr " %d secunde"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
 
-#: mail/mail-format.c:512
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s ata╨"
 
-#: mail/mail-format.c:554
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nu pot parsa mesajul MIME. Afi╨ez ca sursЦ."
 
-#: mail/mail-format.c:736
-msgid "Loading message content"
-msgstr "нncЦrcare conЧinut mesaj"
+#: mail/mail-format.c:746
+msgid "Date"
+msgstr "Data"
+
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "Adresa email:"
 
-#: mail/mail-format.c:1033
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr "De la"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "RЦspuns la:"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "La"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Cc:"
+
+#: mail/mail-format.c:1291
+#, fuzzy
+msgid "No GPG/PGP program configured."
+msgstr "Nu e disponibil nici un program GPG/PGP."
+
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "Mesaj criptat neafi╨at"
 
-#: mail/mail-format.c:1039
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Mesaj criptat"
 
-#: mail/mail-format.c:1040
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Clic pe icon pentru decriptare."
 
-#: mail/mail-format.c:1109 mail/mail-format.c:1496
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Acest mesaj este semnat digital ╨i este autentic."
 
-#: mail/mail-format.c:1117 mail/mail-format.c:1504
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Acest mesaj este semnat digital dar nu se poate dovedi cЦ e autentic."
 
-#: mail/mail-format.c:1717
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Indicator cЦtre site-ul FTP (%s)"
 
-#: mail/mail-format.c:1729
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Indicator cЦtre fi╨ierul local (%s) valid pe site-ul \"%s\""
 
-#: mail/mail-format.c:1733
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Indicator cЦtre fi╨ierul local (%s)"
 
-#: mail/mail-format.c:1767
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Indicator cЦtre site-ul FTP (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Indicator cЦtre o datЦ externЦ necunoscutЦ (\"%s\" type)"
 
-#: mail/mail-format.c:1772
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr "Parte a corpului mesajului externЦ deformatЦ."
 
-#: mail/mail-local.c:336
-#, c-format
-msgid "No such folder %s"
-msgstr "Nu existЦ folderul %s"
-
-#: mail/mail-local.c:508
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "Deschid '%s'"
 
-#: mail/mail-local.c:786
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Schimb folderul \"%s\" Нn formatul \"%s\""
 
-#: mail/mail-local.c:790
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "SchimbЦ folderul \"%s\" Нn formatul \"%s\""
-
-#: mail/mail-local.c:814
-msgid "Reconfiguring folder"
-msgstr "Reconfigurez folderul"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:843
-msgid "Closing current folder"
-msgstr "нnchid folderul curent"
-
-#: mail/mail-local.c:875
-msgid "Renaming old folder and opening"
-msgstr "Redenumesc vechiul folder ╨i schimb"
-
-#: mail/mail-local.c:893
-msgid "Creating new folder"
-msgstr "Creez folder nou"
-
-#: mail/mail-local.c:907
-msgid "Copying messages"
-msgstr "Copiez mesaj"
-
-#: mail/mail-local.c:924
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6140,7 +7618,7 @@ msgstr ""
 "Nu pot salva informaЧia meta a folderului; probabil cЦ nu veЧi mai putea\n"
 "deschide acest folder: %s"
 
-#: mail/mail-local.c:963
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6148,7 +7626,17 @@ msgstr ""
 "DacЦ nu o sЦ puteЧi deschide aceastЦ cЦsuЧЦ po╨talЦ, atunci\n"
 "probabil va trebui sЦ o reparaЧi manual."
 
-#: mail/mail-mt.c:181
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "Nu poЧi copia mesaje din acest folder"
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "Configurez %s"
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6157,99 +7645,114 @@ msgstr ""
 "Eroare Нn timpul '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:183
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
-msgstr "Eroare Нn timpul operaЧiei:\n"
+msgstr ""
+"Eroare Нn timpul operaЧiei:\n"
 "%s"
 
-#: mail/mail-mt.c:506 mail/mail-mt.c:535 mail/mail-mt.c:882
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Lucrez"
 
-#: mail/mail-mt.c:670 mail/session.c:91
-msgid "Do you accept?"
-msgstr "AcceptaЧi?"
-
-#: mail/mail-mt.c:864
-msgid "Evolution progress"
-msgstr "Evolution progres"
-
-#: mail/mail-ops.c:593
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Trimit \"%s\""
 
-#: mail/mail-ops.c:597
-msgid "Sending message"
-msgstr "Trimit mesaj"
+#: mail/mail-ops.c:698
+#, fuzzy, c-format
+msgid "Sending message %d of %d"
+msgstr "Primesc mesajul %d din %d"
+
+#: mail/mail-ops.c:717
+#, fuzzy, c-format
+msgid "Failed on message %d of %d"
+msgstr "E╨uare la mesajul %d din %d"
 
-#: mail/mail-ops.c:819
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
+msgid "Complete."
+msgstr "Terminat"
+
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Salvez mesaj Нn folder"
 
-#: mail/mail-ops.c:892
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mut mesaje Нn %s"
 
-#: mail/mail-ops.c:892
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiez mesaje Нn %s"
 
-#: mail/mail-ops.c:908
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Mut"
 
-#: mail/mail-ops.c:911
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Copiez"
 
-#: mail/mail-ops.c:986
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scanez foldere Нn \"%s\""
 
-#: mail/mail-ops.c:1144
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "Gunoi"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "Mesaje Нnaintate"
 
-#: mail/mail-ops.c:1185 mail/mail-ops.c:1323
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "Deschid folder %s"
 
-#: mail/mail-ops.c:1252
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr "Deschid rezerva %s"
 
-#: mail/mail-ops.c:1439
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "Deschid folder %s"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "Reconfigurez folderul"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "Distru folder"
 
-#: mail/mail-ops.c:1488
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recuperez mesaj %s"
 
-#: mail/mail-ops.c:1555
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Recuperez mesaje"
 
-#: mail/mail-ops.c:1565
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Recuperez mesajul numЦrul %s din %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1639
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Salvez mesaje"
 
-#: mail/mail-ops.c:1718
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6258,12 +7761,7 @@ msgstr ""
 "Nu pot crea fi╨ierul de ie╨ire: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1731
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Salvez mesajul %d din %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1745
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6272,11 +7770,11 @@ msgstr ""
 "Eroare Нn timpul salvЦrii mesajului la: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1819
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "Salvez ata╨"
 
-#: mail/mail-ops.c:1834
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6285,238 +7783,196 @@ msgstr ""
 "Nu pot crea fi╨ierul de ie╨ire: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1862
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nu pot scrie data: %s"
 
-#: mail/mail-search-dialogue.c:107
-msgid "_Search"
-msgstr "_CautЦ"
+#: mail/mail-ops.c:2101
+#, c-format
+msgid "Disconnecting from %s"
+msgstr ""
+
+#: mail/mail-search.c:138
+#, fuzzy
+msgid "(Untitled Message)"
+msgstr "(FЦrЦ titlu)"
 
-#: mail/mail-send-recv.c:136
-msgid "Cancelling ..."
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Mesaje multiple"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "Mesaj"
+
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "Trimit mesaj"
+
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-search.c:315
+#, fuzzy
+msgid "Search Forward"
+msgstr "нnaintare"
+
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
+msgstr "GЦse╨te"
+
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "Cale:"
+
+#: mail/mail-send-recv.c:141
+#, fuzzy
+msgid "Cancelling..."
 msgstr "RenunЧ..."
 
-#: mail/mail-send-recv.c:231
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "Trimite & Prime╨te mail"
 
-#: mail/mail-send-recv.c:234
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "Primesc"
 
-#: mail/mail-send-recv.c:283
-msgid "Updating ..."
+#: mail/mail-send-recv.c:302
+#, fuzzy
+msgid "Updating..."
 msgstr "Actualizez..."
 
-#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
-msgid "Waiting ..."
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#, fuzzy
+msgid "Waiting..."
 msgstr "A╨tept..."
 
-#: mail/mail-send-recv.c:304
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "Trimit"
 
-#: mail/mail-send-recv.c:469
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "Anulat."
 
-#: mail/mail-send-recv.c:473
-msgid "Complete."
-msgstr "Terminat"
-
-#: mail/mail-summary.c:111
-msgid "Incomplete message written on pipe!"
-msgstr "Mesaj scris incomplet Нn conductЦ!"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
+msgstr ""
 
-#: mail/mail-tools.c:138
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Nu pot crea temporar mbox `%s': %s"
 
-#: mail/mail-tools.c:185
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (mesaj Нnaintat)"
-
-#: mail/mail-tools.c:195
-msgid "Fwd: (no subject)"
-msgstr "нnainte: (no subject)"
-
-#: mail/mail-tools.c:212
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mesaj Нnaintat - %s"
 
-#: mail/mail-tools.c:214
-msgid "Forwarded message (no subject)"
-msgstr "Mesaj Нnaintat (no subject)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Mesaje Нnaintate"
 
-#: mail/mail-tools.c:411
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Mesaj Нnaintat-----<br><b>De la:</b> %s<br><b>La:</b> "
-"%s<br><b>Subiect:</b> %s<br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Mesaje Нnaintate"
 
-#: mail/mail-vfolder.c:248
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "VFoldere"
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "VFolder Nou"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:35
-msgid "Reply"
-msgstr "RЦspuns"
-
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:39
-msgid "Reply to the sender of this message"
-msgstr "RЦspuns la expeditorul acestui mesaj"
-
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:38
-msgid "Reply to all recipients of this message"
-msgstr "RЦspuns la toЧi destinatarii acestui mesaj"
-
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:16
-msgid "Forward this message"
-msgstr "нnaintez acest mesaj"
-
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:32
-msgid "Print the selected message"
-msgstr "TipЦresc mesajul selectat"
-
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
-msgid "Delete this message"
-msgstr "╙terg acest mesaj"
-
-#: mail/message-list.c:650
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "NevЦzut"
 
-#: mail/message-list.c:651
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "VЦzut"
 
-#: mail/message-list.c:652
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "RЦspuns"
 
-#: mail/message-list.c:653
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "Mesaje nevЦzute multiple"
 
-#: mail/message-list.c:654
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "Mesaje multiple"
 
-#: mail/message-list.c:658
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "Mai scЦzutЦ"
 
-#: mail/message-list.c:659
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "ScЦzutЦ"
 
-#: mail/message-list.c:663
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "Mare"
 
-#: mail/message-list.c:664
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "Mai mare"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:921
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "AstЦzi %l:%M %p"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "Ieri %l:%M %p"
 
-#: mail/message-list.c:942
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:952
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1050
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Salvez mesaje"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Marcat"
 
-#: mail/message-list.c:1051
-msgid "From"
-msgstr "De la"
-
-#: mail/message-list.c:1051
-msgid "Date"
-msgstr "Data"
-
-#: mail/message-list.c:1051
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Primit"
 
-#: mail/message-list.c:1052
-msgid "To"
-msgstr "La"
-
-#: mail/message-list.c:1052
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "MЦrime"
 
-#: mail/openpgp-utils.c:92
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "VЦ rog introduceЧi %s fraza de trecere pentru %s"
-
-#: mail/openpgp-utils.c:95
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "VЦ rog introduceЧi fraza de trecere %s"
-
-#: mail/openpgp-utils.c:455 mail/openpgp-utils.c:562 mail/openpgp-utils.c:763
-#: mail/openpgp-utils.c:917 mail/openpgp-utils.c:1076
-#, fuzzy
-msgid "No GPG/PGP program available."
-msgstr "Nu e disponibil nici un program GPG/PGP."
-
-#: mail/openpgp-utils.c:462 mail/openpgp-utils.c:571 mail/openpgp-utils.c:770
-#: mail/openpgp-utils.c:924
-msgid "No password provided."
-msgstr "Nici o parolЦ datЦ."
-
-#: mail/openpgp-utils.c:470 mail/openpgp-utils.c:578 mail/openpgp-utils.c:776
-#: mail/openpgp-utils.c:932 mail/openpgp-utils.c:1082
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Nu pot crea conducta la PGP/GPG: %s"
-
-#: mail/openpgp-utils.c:592
-msgid "No recipients specified"
-msgstr "Nici un destinatar specificat"
-
-#: mail/openpgp-utils.c:1093
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Nu pot crea fi╨ier temp: %s"
-
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Folder"
 
@@ -6544,209 +8000,1449 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Desubscriu de la folderul \"%s\""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "Administrare subscrieri"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr "Componenta Evolution pentru rezumatul activitЦЧilor."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr "Procesator pentru componenta rezumat al activitЦЧilor."
+
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Nu pot iniЧializa componenta Evolution pentru rezumatul activitЦЧilor."
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
 #, fuzzy
-msgid "Factory to import mbox into Evolution"
-msgstr "Procesator pentru importul mbox Нn Evolution"
+msgid "Appointments"
+msgstr "нntБlnire"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+#: my-evolution/e-summary-calendar.c:177
 #, fuzzy
-msgid "Imports mbox files into Evolution"
-msgstr "Import fi╨ierele mbox Нn Evolution"
+msgid "No appointments"
+msgstr "AratЦ НntБlnirile"
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+#: my-evolution/e-summary-calendar.c:226
 #, fuzzy
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr "Procesator pentru importul mailurilor Outlook Express 4 Нn Evolution"
+msgid "%l:%M%p"
+msgstr "%I:%M%p"
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+#: my-evolution/e-summary-calendar.c:228
 #, fuzzy
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr "Import fi╨ierele Outlook Express 4 Нn Evolution"
+msgid "%a %l:%M%p"
+msgstr "%a %l:%M %p"
 
-#: mail/importers/elm-importer.c:416
-msgid ""
-"Evolution has found Elm mail files.\n"
-"Would you like to import them into Evolution?"
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Nu existЦ rezumat"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
 msgstr ""
-"Evolution a gЦsit fi╨iere de mail Elm.\n"
-"DoriЧi sЦ le importaЧi Нn Evolution?"
 
-#: mail/importers/elm-importer.c:426
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
 #, fuzzy
-msgid "Elm mail"
-msgstr "Mail Elm"
+msgid "My Evolution Settings"
+msgstr "Instalare Evolution"
 
-#: mail/importers/netscape-importer.c:441
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
+msgstr "A fost o eroare la НncЦrcarea calendarului."
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Eroare la НncЦrcarea calendarului</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "AratЦ task-uri"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
 msgstr ""
-"Evolution a gЦsit fi╨iere de mail Netscape.\n"
-"DoriЧi sЦ le importaЧi Нn Evolution?"
 
-#: mail/importers/pine-importer.c:381
-msgid ""
-"Evolution has found Pine mail files.\n"
-"Would you like to import them into Evolution?"
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
-"Evolution a gЦsit fi╨iere de mail Pine.\n"
-"DoriЧi sЦ le importaЧi Нn Evolution?"
 
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "SecЧiuni"
+
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A, %e %B %Y"
 
-#: mail/importers/pine-importer.c:391
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 #, fuzzy
-msgid "Pine mail"
-msgstr "Mail Pine"
+msgid "Print My Evolution"
+msgstr "Evolution"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Nume folder:"
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "TipЦrirea mesajului nereu╨itЦ"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
-msgstr "Tip folder:"
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): nu pot iniЧializa Bonobo"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
-msgstr "PrecizaЧi unde sЦ fie creat folderul:"
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "╙terge"
 
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:167
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
 msgstr ""
-"Import %s\n"
-"Import neterminat.\n"
-"A╨teptaЧi 5 secunde sЦ Нncerc din nou."
 
-#: shell/importer/importer.c:187 shell/importer/importer.c:218
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
 msgstr ""
-"Import %s\n"
-"Import articol %d." 
 
-#: shell/importer/importer.c:326
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
+#: my-evolution/metar.c:47
+msgid "Few clouds"
 msgstr ""
-"Nu se reu╨e╨te importul\n"
-"%s"
 
-#: shell/importer/importer.c:336
-msgid "Importing"
-msgstr "Import"
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
 
-#: shell/importer/importer.c:344
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
 msgstr ""
-"Import %s.\n"
-"Start %s"
 
-#: shell/importer/importer.c:357
-#, c-format
-msgid "Error starting %s"
-msgstr "Eroare start %s"
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "Variable"
+msgstr "InvalideazЦ"
 
-#: shell/importer/importer.c:372
-#, c-format
-msgid "Error loading %s"
-msgstr "Eroare la НncЦrcarea %s"
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "NotЦ"
 
-#: shell/importer/importer.c:387
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
 msgstr ""
-"Import %s\n"
-"Import item 1."
 
-#: shell/importer/importer.c:458
-msgid "Automatic"
-msgstr "Automat"
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "No_tiЧe"
 
-#: shell/importer/importer.c:508
-msgid "Filename:"
-msgstr "Nume fi╨ier:"
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:513
-msgid "Select a file"
-msgstr "Selectez un fi╨ier"
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "ExistЦ"
 
-#: shell/importer/importer.c:523
-msgid "File type:"
-msgstr "Tip fi╨ier:"
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:604
-msgid "Import"
-msgstr "Import"
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "Surse"
 
-#: shell/importer/importer.c:639
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "lunЦ"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "Mai scЦzutЦ"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Test"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "Mai scЦzutЦ"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "AratЦ"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "Radio"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Drifting rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "GЦse╨te din nou"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "acum"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Moderate snow"
+msgstr "Actualizez acum"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Drifting snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "Email"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "AratЦ un dialog"
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "Email principal"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "Primire mail"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Shallow small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Showers of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+msgid "Unknown precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "Eroare necunoscutЦ"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "InvitaЧii НntБlnire"
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "D-ra."
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "Portret"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Drifting mist"
+msgstr "Lista de mail"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "нnchide aceastЦ fereastrЦ"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "Punctaj"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "AratЦ task-uri"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "нnchide aceastЦ fereastrЦ"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "Trimit"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "Cap"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "zile"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "August"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Raging tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Thunderous tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "RЦspuns"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Foldere"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "ToЧi participanЧii"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Afi╨eazЦ folderele НncepБnd cu:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "OpЧiuni afi╨are"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "Afi╨eaza"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "Vineri"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "Miercuri"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "lunЦ"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr " 1 sЦptЦmНnЦ"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr ""
+"Program\n"
+"Ora"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "AratЦ task-uri"
+
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "cu toate foldere distante active"
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "AratЦ task-uri"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "Sarcini"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
 msgstr ""
-"AlegeЧi fi╨ierul ce doriЧi sЦ-l importaЧi Нn Evolution ╨i selectaЧi ce tip " 
-"de fi╨ier este din listЦ.\n"
 "\n"
-"PuteЧi selecta \"Automat\" dacЦ nu ╨tiЧi tipul ╨i Evolution va Нncerca sЦ-l "
-"determine automat."
+"  Unitate:"
 
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "DaЧi clic pe \"Import\" pentru  Нncepe importul Нn Evolution. "
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Alte"
 
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
-msgstr "Utilitate de import Evolution"
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "╙terge selecЧia"
 
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
-msgstr "Utilitar de import Evolution"
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "Aprilie"
 
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
 msgstr ""
-"Bine aЧi venit la utilitatea de import Evolution.\n"
-"Cu acest asistent veЧi fi ghidat prin procesul de\n"
-"import al fi╨ierelor extene Нn Evolution."
 
-#: shell/importer/intelligent.c:109
-msgid "Import files"
-msgstr "Import fi╨iere"
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "Shell Evolution."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "Detalii"
 
-#: shell/importer/intelligent.c:122
-msgid "Don't ask me again"
-msgstr "Nu mЦ Нntreba din nou"
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "Anulare НntБlnire"
 
-#: shell/e-setup.c:114 shell/e-setup.c:187
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Foldere speciale"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Instalare Evolution"
 
-#: shell/e-setup.c:118
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6754,27 +9450,25 @@ msgstr ""
 "AcestЦ versiune de Evolution are nevoie sЦ instaleze fi╨iere Нn plus\n"
 "Нn directorul dumneavoastrЦ personal"
 
-#: shell/e-setup.c:119
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr "VЦ rog sЦ daЧi clic pe \"OK\" pentru a instala fi╨ierele, sau \"RenunЧЦ\" pentru ie╨ire"
+msgstr ""
+"VЦ rog sЦ daЧi clic pe \"OK\" pentru a instala fi╨ierele, sau \"RenunЧЦ\" "
+"pentru ie╨ire"
 
-#: shell/e-setup.c:159
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "Nu pot actualiza fi╨ierele corect"
 
-#: shell/e-setup.c:162 shell/e-setup.c:230
-msgid "Evolution files successfully installed."
-msgstr "Fi╨ierele Evolution au fost instalate cu succes."
-
-#: shell/e-setup.c:191
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Pare a fi prima datЦ cБnd rulaЧi Evolution."
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "VЦ rog sЦ daЧi clic pe \"OK\" pentru a instala fi╨ierle Evolution"
 
-#: shell/e-setup.c:211
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6785,16 +9479,14 @@ msgstr ""
 "%s\n"
 "Eroare: %s"
 
-#: shell/e-setup.c:226
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"Nu pot copia fi╨ierele Нn\n"
+"An error occurred in copying files into\n"
 "`%s'."
+msgstr "A apЦrut o eroare Нn timpul citirii fi╨ierului."
 
-#: shell/e-setup.c:251
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6805,7 +9497,16 @@ msgstr ""
 "VЦ rog sЦ-l mutaЧi pentru a permite instalarea\n"
 "fi╨ierelor utilizator Evolution."
 
-#: shell/e-setup.c:263
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6816,7 +9517,58 @@ msgstr ""
 "VЦ rog sЦ-l mutaЧi pentru a permite instalarea\n"
 "fi╨ierelor utilizator Evolution."
 
-#: shell/e-shell-folder-creation-dialog.c:96
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "Nu pot gЦsi folderul: %s: %s"
+
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"Nu pot copia fi╨ierele Нn\n"
+"`%s'."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
+#, c-format
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "CopiazЦ Нn folder"
+
+#: shell/e-shell-folder-commands.c:313
+#, c-format
+msgid "Specify a folder to move folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "MutЦ in folder"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "╙tergere dupЦ %s zi(le)"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "SunteЧi sigur cЦ doriЧН sЦ ╨tergeЧi task-ul `%s'?"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "Deschid folder %s"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -6825,15 +9577,15 @@ msgstr ""
 "Nu pot crea folderul precizat:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:153
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "Numele folderului specificat este invalid."
 
-#: shell/e-shell-folder-creation-dialog.c:260
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Creare folder nou"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -6841,27 +9593,133 @@ msgstr ""
 "Tipul fi╨ierului selectat nu e valid pentru\n"
 "operaЧia cerutЦ."
 
-#: shell/e-shell-folder-selection-dialog.c:321
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Nou..."
 
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(FЦrЦ titlu)"
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"AlegeЧi fi╨ierul ce doriЧi sЦ-l importaЧi Нn Evolution ╨i selectaЧi ce tip "
+"de fi╨ier este din listЦ.\n"
+"\n"
+"PuteЧi selecta \"Automat\" dacЦ nu ╨tiЧi tipul ╨i Evolution va Нncerca sЦ-l "
+"determine automat."
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+"Import %s\n"
+"Import neterminat.\n"
+"A╨teptaЧi 5 secunde sЦ Нncerc din nou."
+
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"Import %s\n"
+"Import articol %d."
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"Nu se reu╨e╨te importul\n"
+"%s"
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr "Import"
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"Import %s.\n"
+"Start %s"
+
+#: shell/e-shell-importer.c:383
+#, c-format
+msgid "Error starting %s"
+msgstr "Eroare start %s"
+
+#: shell/e-shell-importer.c:402
+#, c-format
+msgid "Error loading %s"
+msgstr "Eroare la НncЦrcarea %s"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"Import %s\n"
+"Import item 1."
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr "Automat"
+
+#: shell/e-shell-importer.c:538
+msgid "Filename:"
+msgstr "Nume fi╨ier:"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "Selectez un fi╨ier"
+
+#: shell/e-shell-importer.c:553
+msgid "File type:"
+msgstr "Tip fi╨ier:"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "Alege folderul"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy nu a fost gЦsit Нn $PATH."
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy nu poate fi rulat."
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -6871,30 +9729,71 @@ msgstr ""
 "pentru mail, calendar ╨i managementul contactelor\n"
 "Нn mediul desktop GNOME"
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Mergi la folder..."
 
-#: shell/e-shell-view.c:143
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "CreazЦ un grup nou de scurtЦturi"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
+msgstr "LucreazЦ offline"
+
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
+msgstr "LucreazЦ offline"
+
+#: shell/e-shell-view.c:175
 msgid "(No folder displayed)"
 msgstr "(Nici un folder afi╨at)"
 
-#: shell/e-shell-view.c:1129
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1411
 #, c-format
 msgid "%s - Evolution %s"
 msgstr "%s - Evolution - %s"
 
-#: shell/e-shell-view.c:1131
+#: shell/e-shell-view.c:1413
 #, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell.c:372
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nu pot seta stocarea localЦ -- %s"
 
-#: shell/e-shell.c:1242
+#: shell/e-shell.c:1311
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6903,15 +9802,15 @@ msgstr ""
 "Ooops! Vizualizarea pentru `%s' a murit nea╨teptat. :-(\n"
 "Aceasta НnseamnЦ cЦ probabil componenta %s a crЦpat."
 
-#: shell/e-shortcuts-view.c:123
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "CreazЦ grup nou de scurtЦturi"
 
-#: shell/e-shortcuts-view.c:126
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Nume grup:"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -6920,148 +9819,271 @@ msgstr ""
 "Chiar doriЧi sЦ НnlЦturaЧi grupul\n"
 "`%s' din bara de scurtЦturi?"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "Nu НnlЦtura"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "нnlЦturЦ acest grup de scurtЦturi"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "нnlЦturЦ acest grup de scurtЦturi"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "Icoane _mici"
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "AratЦ scurtЦturile ca icoane mici"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "Icoane m_ari"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "AratЦ scurtЦturile ca icoane mari"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "Grup _Nou..."
 
-#: shell/e-shortcuts-view.c:281
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "CreazЦ un grup nou de scurtЦturi"
 
-#: shell/e-shortcuts-view.c:283
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "нnlЦturЦ acest grup..."
 
-#: shell/e-shortcuts-view.c:284
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "нnlЦturЦ acest grup de scurtЦturi"
 
-#: shell/e-shortcuts-view.c:289
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "нnlЦturЦ acest grup..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "нnlЦturЦ acest grup de scurtЦturi"
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "_Ascunde bara de scurtЦturi"
 
-#: shell/e-shortcuts-view.c:290
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Ascunde bara de scurtЦturi"
 
-#: shell/e-shortcuts-view.c:374
-msgid "Activate"
-msgstr "ActiveazЦ"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "нnlЦturЦ acest grup de scurtЦturi"
 
-#: shell/e-shortcuts-view.c:374
-msgid "Activate this shortcut"
-msgstr "ActiveazЦ aceastЦ scurtЦturЦ"
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "нnlЦturЦ acest grup de scurtЦturi"
 
-#: shell/e-shortcuts-view.c:377
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Deschide"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "Nume regulЦ:"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "нnlЦturЦ acest grup de scurtЦturi"
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "нnlЦturЦ aceastЦ aceastЦ scurtЦturЦ din bara de scurtЦturi"
 
-#: shell/e-shortcuts.c:379
+#: shell/e-shortcuts.c:585
 msgid "Error saving shortcuts."
 msgstr "Eroare la salvare scurtЦturi."
 
-#: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:44
-msgid "_View"
-msgstr "_Vizualizare"
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "_ScurtЦturЦ"
 
-#: shell/e-storage-set-view.c:649
-msgid "View the selected folder"
-msgstr "VizualizeazЦ folderul selectat"
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "_Contact"
 
-#: shell/e-storage.c:178
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(FЦrЦ nume)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "FЦrЦ eroare"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Eroare genericЦ"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "ExistЦ deja un folder cu acela╨i nume"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "Tipul de folder specificat nu e valid"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "Eroare I/O"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "SpaЧiu insuficient pentru a crea folderul"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "Folderul specificat nu a fost gЦsit"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "FuncЧie neimplementatЦ Нn aceastЦ stocare"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "Acces interzis"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "OperaЧie nesuportatЦ"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "Tipul specificat nu e suportat Нn acestЦ stocare"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "Shell Evolution."
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
 
-#: shell/main.c:75
-#, no-c-format
+#: shell/e-task-widget.c:173
+#, fuzzy
+msgid "%s (%d%% complete)"
+msgstr "% Comp_let:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "Orice cБmp conЧine"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "GazdЦ:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Nume folder:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder type:"
+msgstr "Tip folder:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Specify where to create the folder:"
+msgstr "PrecizaЧi unde sЦ fie creat folderul:"
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr "DaЧi clic pe \"Import\" pentru  Нncepe importul Нn Evolution. "
+
+#: shell/importer/import.glade.h:2
+msgid "Evolution Import Utility"
+msgstr "Utilitate de import Evolution"
+
+#: shell/importer/import.glade.h:3
+msgid "Evolution Importer Utility"
+msgstr "Utilitar de import Evolution"
+
+#: shell/importer/import.glade.h:6
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+"Bine aЧi venit la utilitatea de import Evolution.\n"
+"Cu acest asistent veЧi fi ghidat prin procesul de\n"
+"import al fi╨ierelor extene Нn Evolution."
+
+#: shell/importer/intelligent.c:191
+#, fuzzy
+msgid "Importers"
+msgstr "Import"
+
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "Nu НnlЦtura"
+
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr "Nu mЦ Нntreba din nou"
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, fuzzy, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
-msgstr "Salut. MulЧumesc pentru timpul acordat pentru descЦrcarea acestui\n"
+msgstr ""
+"Salut. MulЧumesc pentru timpul acordat pentru descЦrcarea acestui\n"
 "PREVIEW RELEASE al suitei Evolution.\n"
 "\n"
 "Evolution nu e НncЦ complet. E pe aproape, dar existЦ locuri unde\n"
@@ -7071,259 +10093,338 @@ msgstr "Salut. MulЧumesc pentru timpul acordat pentru descЦrcarea acestui\n"
 "SperЦm cЦ Evolution vЦ va fi folositor, dar trebuie totu╨i sЦ vЦ avertizЦm\n"
 "cЦ poate: crЦpa, pierde mesaje, lЦsa procese rЦtЦcite in rulare, consuma\n"
 "100% CPU, trimite mesaje de eroare la servere, ╨i Нn general vЦ poate pune\n"
-"Нn situaЧii stБnjenitoare Нn faЧa prietenilor ╨i colegilor. FolosiЧi-l numai\n"
+"Нn situaЧii stБnjenitoare Нn faЧa prietenilor ╨i colegilor. FolosiЧi-l "
+"numai\n"
 "conform instrucЧiunilor.\n"
 "\n"
 "SperЦm sЦ vЦ bucuraЧi de rezultatele eforturilor noastre, ╨i a╨teptЦm\n"
 "cu nerЦbdare contribuЧia dumneavostrЦ!\n"
- 
-#: shell/main.c:100
+
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
-msgstr "VЦ mulЧumim\n"
+msgstr ""
+"VЦ mulЧumim\n"
 "Echipa Evolution\n"
 
-#: shell/main.c:131
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "Nu pot iniЧilaiza shell-ul Evolution."
 
-#: shell/main.c:177
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "InvalideazЦ ecran splash"
 
-#: shell/main.c:178
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr "Trimite ie╨irile de debugg ale tuturor componentelor Нntr-un fi╨ier."
 
-#: shell/main.c:211
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nu pot iniЧializa sistemul de componente Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "CopiazЦ"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
+msgstr "CopiazЦ selecЧia"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "CreazЦ contact nou"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "╙terge un contact"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "CreazЦ contact nou"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "GЦse╨te"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Taie"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "GЦse╨te un contact"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr "Taie selecЧia"
+
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "╙terge un contact"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Contact nou"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:28
-msgid "Previews the message to be printed"
-msgstr "PrevizualizeazЦ mesajul ce va fi tipЦrit"
-
 #: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+#, fuzzy
+msgid "New list"
+msgstr "NoutЦЧi"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Lipe╨te"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "Lipe╨te clipboard-ul"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
+msgstr "PrevizualizeazЦ calendar ce va fi tipЦrit"
+
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "TipЦre╨te contacte"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:48
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "SelecteazЦ tot"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "╙terge un contact"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Stop"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Opre╨te НncЦrcarea"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "VizualizeazЦ tot"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "VizualizeazЦ toate contactele"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "Surse _agendЦ..."
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "_Contact"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "_Contact"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "_TipЦre╨te..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "_CautЦ contacte"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:78
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:43
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
+msgstr "_SelecteazЦ tot"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_Unelte"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 zile"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "ModificЦ preferinЧe"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a new all day Event"
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "CreazЦ un eveniment nou"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "CreazЦ o НntНlnire nouЦ"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "CreazЦ calendar nou"
+msgid "Create a new appointment"
+msgstr "CreazЦ o НntНlnire nouЦ"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "Zi"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Mergi la"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Mergi Нnapoi Нn timp"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Mergi Нnainte Нn timp"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "Mergi la _data"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
-msgstr "Mergi la _ziua"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Mergi la o anumitЦ data"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Mergi la timpul prezent"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "Luna"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr "_Eveniment nou"
-
-#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "UrmЦtorul"
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "Deschide calendar"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "Prev"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "нntБlnire nouЦ"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "PrevizualizeazЦ calendar ce va fi tipЦrit"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "TipЦre╨te calendar"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "TipЦre╨te acest calendar"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "SalveazЦ ca"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "InformaЧie cerutЦ"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "SalveazЦ calendarul ca altceva"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "AratЦ 1 zi"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "AratЦ 1 lunЦ"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "AratЦ 1 sЦptЦmБnЦ"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "AratЦ sЦptЦmБna de lucru"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
-#: widgets/misc/e-dateedit.c:424
-msgid "Today"
-msgstr "AstЦzi"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "_SЦptЦmБna de lucru"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "SЦptЦmБnЦ"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "_нntБlnire"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "SetЦri _mail..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "_Zi"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "_LunЦ"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
-msgid "_New"
-msgstr "_Nou"
+#: ui/evolution-calendar.xml.h:37
+msgid "_Week"
+msgstr "_SЦptЦmБnЦ"
 
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "_Deschide calendar"
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "нnchide"
 
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:75
-#: ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "_SalveazЦ ca..."
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "нnchide aceastЦ НntБlnire"
 
-#: ui/evolution-calendar.xml.h:45
-msgid "_Week"
-msgstr "_SЦptЦmБnЦ"
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "╙terge aceastЦ НntБlnire"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "Bara de unelte principalЦ"
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "PrevizualizeazЦ mesajul ce va fi tipЦrit"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "PrevizualizeazЦ tipЦrire"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "SeteazЦ tipЦrire"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "TipЦre╨te acest articol"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "TipЦre╨te"
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "SalveazЦ ╨i Нnchide"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "SalveazЦ НntБlnirea ╨i Нnchide cЦsuЧa de dialog"
+
+#: ui/evolution-comp-editor.xml.h:17
+#, fuzzy
+msgid "Save this item to disk"
+msgstr "SchimbЦ vederea cu %s"
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr "SetЦri de paginЦ pentru imprimanta curentЦ"
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "_AcЧiuni"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "_Fi╨ier"
 
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "╙terge acest articol"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "╙terge..."
 
@@ -7335,27 +10436,12 @@ msgstr "Ajutor"
 msgid "Print En_velope..."
 msgstr "TipЦre╨te plic..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "TipЦre╨te acest articol"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:33 ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "TipЦre╨te"
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "S_alvezЦ ca..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "SalveazЦ ╨i Нnchide"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "SalveazЦ contact ╨i Нnchide cЦsuЧa de dialog"
@@ -7372,800 +10458,1000 @@ msgstr "Vezi ajutor online"
 msgid "Send _message to contact..."
 msgstr "Trimite _mesaj cЦtre contact..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
-msgid "_File"
-msgstr "_Fi╨ier"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_SalveazЦ"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Despre aceastЦ aplicaЧie"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "╙terge acest articol"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Despre..."
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "SalveazЦ task ╨i Нnchide cЦsuЧa de dialog"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "AcЧiu_ni"
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "Trimite co_ntact la altcineva..."
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "Agenda... (FIXME)"
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "Trimite _mesaj cЦtre contact..."
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "╙terge"
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "Anulare НntБlnire"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "Taie"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+msgid "Cancel the meeting for this item"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "VerificЦ nume (FIXME)"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Forward as i_Calendar"
+msgstr "нnaintez ca v_Calendar (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "╙terge"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "нnaintez acest mesaj"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "╙terge selecЧia"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "нnchide aceastЦ НntБlnire"
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr ""
+"Cerere\n"
+"нntБlnire"
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "CopiazЦ Нn folder... (FIXME)"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr "Progra_mare НntБlniri"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "CopiazЦ"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#, fuzzy
+msgid "Schedule a meeting for this item"
+msgstr "Programare НntБlniri"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "CopiazЦ selecЧia"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "_AcЧiuni"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Taie"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "%s - Evolution - %s"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Taie selecЧia"
+#: ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "Anulat"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "╙terge aceastЦ НntБlnire"
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "SalveazЦ fi╨ierul curent"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "DescarcЦ XML"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "Compunere"
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "DescarcЦ descrierea UI Xml"
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Compune un mesaj nou"
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "Primul articol din folder (FIXME)"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "нnainteazЦ (FIXME)"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "нnaintez ca v_Calendar (FIXME)"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "Mergi la articolul urmЦtor"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr "Gole╨_te gunoiul"
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Mergi la articolul anterior"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "UitЦ _parolele"
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "Task in_comlete (FIXME)"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "ModificЦ proprietЦЧile fi╨ierului"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
+msgstr "Administrare _subscrieri..."
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "UrmЦtorul"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Lipe╨te"
+#: ui/evolution-mail-global.xml.h:13
+msgid "Permanently remove all deleted messages from all folders"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Lipe╨te clipboard-ul"
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send / Receive"
+msgstr "Trimitere / Primire"
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "Anterior"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "Trimit mailurile din coadЦ ╨i descarc mailurile noi"
 
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Anterior"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "PrevizualizeazЦ tipЦrire"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "SeteazЦ tipЦrire..."
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
+msgstr "_Editor folder virtual..."
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "SeteazЦ tipЦrire"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
+msgstr "_Filtre..."
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:236
-msgid "Save"
-msgstr "Salvare"
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr "Mesaj _mail"
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "SalveazЦ НntБlnirea ╨i Нnchide cЦsuЧa de dialog"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "SetЦri _mail..."
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "SalveazЦ fi╨ierul curent"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "Previzualizare"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "Progra_mare НntБlniri"
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
+msgstr "Trimit / Prime_sc"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "ProgrameazЦ ceva ce seamЦnЦ cu o НntБlnire"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "SelecteazЦ tot"
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "Ascunde mesajele selectate"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "SelecteazЦ tot"
+#: ui/evolution-mail-list.xml.h:5
+#, fuzzy
+msgid "Cut selected messages"
+msgstr "TipЦresc mesajul selectat"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "SetЦri de paginЦ pentru imprimanta curentЦ"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "Ascunde mesajele selectate"
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "Ce_rere task (FIXME)"
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "Ascunde mesajele ╨terse"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "_Despre..."
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
+msgstr "Ascunde mesajele citite"
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
-msgid "_Close"
-msgstr "нn_chide"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:28
-msgid "_Contact (FIXME)"
-msgstr "_Contact (FIXME)"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "MarcheazЦ tot ca citit"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "_CopiazЦ"
+#: ui/evolution-mail-list.xml.h:11
+#, fuzzy
+msgid "Mark all visible messages as read"
+msgstr "MarcheazЦ mesajele ca \"Citit\" dupЦ:"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "_Debug"
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "Lipe╨te clipboard-ul"
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
-msgid "_Help"
-msgstr "Ajutor"
+#: ui/evolution-mail-list.xml.h:14
+#, fuzzy
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Nu poЧi copia mesaje din acest folder"
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "Art_icol (FIXME)"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "SelecteazЦ tot"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "Intrare _jurnal (FIXME)"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "Selec_teazЦ fir"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "U_ltimul articol din folder (FIXME)"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "_Mesaj mail (FIXME)"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "_MutЦ Нn folder... (FIXME)"
+#: ui/evolution-mail-list.xml.h:19
+#, fuzzy
+msgid "Select all visible messages"
+msgstr "╙terg acest mesaj"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "_NotЦ (FIXME)"
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "_AratЦ tot"
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "_Lipe╨te"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "Ti_pЦre╨te"
+#: ui/evolution-mail-list.xml.h:22
+msgid "Temporarily hide all messages that have already been read"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:71
-#: ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
-msgstr "_ProprietЦЧi..."
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "TipЦresc mesajul selectat"
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "_SelecteazЦ tot"
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "ListЦ de mesaje НnlЦnЧuite"
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:42
-msgid "_Task (FIXME)"
-msgstr "_Task (FIXME)"
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "Distrug_e"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "Articol necitit (FIXME)"
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "_Folder"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Adaug serviciu"
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_InverseazЦ selecЧia"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "Adaug un serviciu nou la Executive Summary"
+#: ui/evolution-mail-list.xml.h:28
+msgid "_Properties..."
+msgstr "_ProprietЦЧi..."
 
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Creez un mail nou"
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "ListЦ de mesaje НnlЦnЧuite"
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "SetЦri pentru Executive Summary..."
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "Apply filter rules to the selected messages"
+msgstr "TipЦresc mesajul selectat"
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Mail nou"
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "RЦspuns la toЧi destinatarii acestui mesaj"
 
-#: ui/evolution-mail.xml.h:1
-msgid "Compose"
-msgstr "Compunere"
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:2
-msgid "Compose a new message"
-msgstr "Compune un mesaj nou"
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
+msgid "Compose a reply to the sender of the selected message"
+msgstr "RЦspuns la expeditorul acestui mesaj"
 
-#: ui/evolution-mail.xml.h:4
-msgid "Copy message to a new folder"
+#: ui/evolution-mail-message.xml.h:6
+#, fuzzy
+msgid "Copy selected messages to another folder"
 msgstr "CopiazЦ mesajul Нntr-un folder nou"
 
-#: ui/evolution-mail.xml.h:5
+#: ui/evolution-mail-message.xml.h:7
 msgid "Create _Virtual Folder From Message"
 msgstr "Creez folder virtual din mesaj"
 
-#: ui/evolution-mail.xml.h:8
-msgid "Display all of the message headers"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:12
+#, fuzzy
+msgid "Create a virtual folder for these recipients"
+msgstr "Creez folder virtual din mesaj"
+
+#: ui/evolution-mail-message.xml.h:13
+#, fuzzy
+msgid "Create a virtual folder for this mailing list"
+msgstr "Creez folder virtual din mesaj"
+
+#: ui/evolution-mail-message.xml.h:14
+#, fuzzy
+msgid "Create a virtual folder for this sender"
+msgstr "Creez folder virtual din mesaj"
+
+#: ui/evolution-mail-message.xml.h:15
+#, fuzzy
+msgid "Create a virtual folder for this subject"
+msgstr "Creez folder virtual din mesaj"
+
+#: ui/evolution-mail-message.xml.h:17
+#, fuzzy
+msgid "Display the next important message"
+msgstr "RЦspuns la expeditorul acestui mesaj"
+
+#: ui/evolution-mail-message.xml.h:18
+#, fuzzy
+msgid "Display the next message"
 msgstr "Afi╨eazЦ toate antetele mesajului"
 
-#: ui/evolution-mail.xml.h:9
-msgid "Empty _Trash"
-msgstr "Gole╨_te gunoiul"
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
+msgstr "TipЦresc mesajul selectat"
+
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:21
+msgid "Display the previous important message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:10
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:22
+#, fuzzy
+msgid "Display the previous message"
+msgstr "╙terg acest mesaj"
+
+#: ui/evolution-mail-message.xml.h:23
+msgid "Display the previous unread message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
+msgstr "Filtru pe lista de mail"
+
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "Filtru pe expeditor"
 
-#: ui/evolution-mail.xml.h:11
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "Filt_ru pe destinatar"
 
-#: ui/evolution-mail.xml.h:12
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "Filtru pe _subiect"
 
-#: ui/evolution-mail.xml.h:13
-msgid "Forget _Passwords"
-msgstr "UitЦ _parolele"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "нnaintare"
 
-#: ui/evolution-mail.xml.h:15
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "нnainteazЦ ca"
 
-#: ui/evolution-mail.xml.h:17
-msgid "Full _Headers"
-msgstr "Toate antetele"
+#: ui/evolution-mail-message.xml.h:31
+#, fuzzy
+msgid "Forward _Attached"
+msgstr "нnainteazЦ ca"
 
-#: ui/evolution-mail.xml.h:18
-msgid "Hide Deleted Messages"
-msgstr "Ascunde mesajele ╨terse"
+#: ui/evolution-mail-message.xml.h:32
+#, fuzzy
+msgid "Forward _Inline"
+msgstr "нnainteazЦ ca"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Hide S_elected Messages"
-msgstr "Ascunde mesajele selectate"
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Forward _Quoted"
+msgstr "нnainteazЦ ca"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Hide _Deleted Messages"
-msgstr "Ascunde mesajele ╨terse"
+#: ui/evolution-mail-message.xml.h:34
+msgid "Forward the selected message in the body of a new message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:21
-msgid "Hide _Read messages"
-msgstr "Ascunde mesajele citite"
+#: ui/evolution-mail-message.xml.h:35
+msgid "Forward the selected message quoted like a reply"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:22
-msgid "Manage _Subscriptions..."
-msgstr "Administrare _subscrieri..."
+#: ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward the selected message to someone"
+msgstr "TipЦresc mesajul selectat"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Mar_k as Read"
-msgstr "MarcheazЦ ca citit"
+#: ui/evolution-mail-message.xml.h:37
+msgid "Forward the selected message to someone as an attachment"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:24
-msgid "Mark All as R_ead"
-msgstr "MarcheazЦ tot ca citit"
+#: ui/evolution-mail-message.xml.h:39
+#, fuzzy
+msgid "Load _Images"
+msgstr "Mesaje Нnaintate"
 
-#: ui/evolution-mail.xml.h:25
-msgid "Mark as U_nread"
-msgstr "MarcheazЦ ca _necitit"
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "Important"
+
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
+msgstr "Marchez ca necitit"
+
+#: ui/evolution-mail-message.xml.h:44
+#, fuzzy
+msgid "Mark the selected messages as having been read"
+msgstr "TipЦresc mesajul selectat"
+
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "TipЦresc mesajul selectat"
+
+#: ui/evolution-mail-message.xml.h:46
+msgid "Mark the selected messages as not having been read"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "TipЦresc mesajul selectat"
+
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "TipЦresc mesajul selectat"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "MutЦ"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Move message to a new folder"
+#: ui/evolution-mail-message.xml.h:50
+#, fuzzy
+msgid "Move selected messages to another folder"
 msgstr "MutЦ mesajele Нntr-un folder nou"
 
-#: ui/evolution-mail.xml.h:31
-msgid "Print message to the printer"
-msgstr "TipЦre╨te mesaj la imprimantЦ"
-
-#: ui/evolution-mail.xml.h:34
-msgid "Redirect (FIXME: implement me)"
-msgstr "Redirectare (FIXME: de implementat)"
-
-#: ui/evolution-mail.xml.h:37
-msgid "Reply to _All"
-msgstr "RЦspuns la toЧi"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "UrmЦtorul"
 
-#: ui/evolution-mail.xml.h:40
-msgid "S_ource"
-msgstr "Sursa"
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "RЦspuns la expeditorul acestui mesaj"
 
-#: ui/evolution-mail.xml.h:41 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "SelecteazЦ tot"
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Mesaj"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Select _Thread"
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
 msgstr "Selec_teazЦ fir"
 
-#: ui/evolution-mail.xml.h:43
-msgid "Send / Receive"
-msgstr "Trimitere / Primire"
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Mesaje multiple"
 
-#: ui/evolution-mail.xml.h:44
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Open the selected message in a new window"
+msgstr "TipЦresc mesajul selectat"
+
+#: ui/evolution-mail-message.xml.h:57
+msgid "Open the selected message in the composer to re-send it"
 msgstr ""
-"Trimit mailurile din coadЦ\n"
-"    ╨i primesc mailurile noi"
 
-#: ui/evolution-mail.xml.h:46
-msgid "Send queued mail and retrieve new mail"
-msgstr "Trimit mailurile din coadЦ ╨i descarc mailurile noi"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "PrevizualizeazЦ mesajul ce va fi tipЦrit"
 
-#: ui/evolution-mail.xml.h:47
-msgid "Show _All"
-msgstr "_AratЦ tot"
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "Anterior"
 
-#: ui/evolution-mail.xml.h:49
-msgid "Threaded Message list"
-msgstr "ListЦ de mesaje НnlЦnЧuite"
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Tiparire mesaj"
 
-#: ui/evolution-mail.xml.h:50
-msgid "VFolder on Se_nder"
-msgstr "VFolder pe expeditor"
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Tiparire mesaj"
 
-#: ui/evolution-mail.xml.h:51
-msgid "VFolder on _Recipients"
-msgstr "Vfolder pe destinatari"
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Tiparire mesaj"
 
-#: ui/evolution-mail.xml.h:52
-msgid "VFolder on _Subject"
-msgstr "VFolder pe _subiect"
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
+msgid "Print Message..."
+msgstr "Tiparire mesaj"
 
-#: ui/evolution-mail.xml.h:53
-msgid "View Raw Message Source"
-msgstr "Vizualizare sursЦ mesaj"
+#: ui/evolution-mail-message.xml.h:65
+#, fuzzy
+msgid "Print Preview..."
+msgstr "Previzualizare tipЦrire"
 
-#: ui/evolution-mail.xml.h:54
-msgid "Virtual Folder _Editor..."
-msgstr "_Editor folder virtual..."
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "Tiparire mesaj"
 
-#: ui/evolution-mail.xml.h:55
-msgid "_Apply Filters"
-msgstr "_AplicЦ filtrele"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "RЦspuns"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Attachment"
-msgstr "_Ata╨"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "RЦspuns la toЧi"
 
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
-msgid "_Compose"
-msgstr "_Compunere"
+msgid "S_earch Message"
+msgstr "Mesaj server:"
 
-#: ui/evolution-mail.xml.h:58
-msgid "_Copy to Folder..."
-msgstr "_CopiazЦ Нn folderul..."
+#: ui/evolution-mail-message.xml.h:72
+#, fuzzy
+msgid "Save the message as a text file"
+msgstr "Salvez mesajul Нntr-un folder specificat"
 
-#: ui/evolution-mail.xml.h:59
-msgid "_Create Filter From Message"
-msgstr "_CreazЦ filtru din mesaj"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:61
-msgid "_Expunge"
-msgstr "Distrug_e"
+#: ui/evolution-mail-message.xml.h:74
+msgid "Show Email _Source"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:62
-msgid "_Filters..."
-msgstr "_Filtre..."
+#: ui/evolution-mail-message.xml.h:75
+#, fuzzy
+msgid "Show Full _Headers"
+msgstr "Toate antetele"
 
-#: ui/evolution-mail.xml.h:63 ui/evolution.xml.h:31
-msgid "_Folder"
-msgstr "_Folder"
+#: ui/evolution-mail-message.xml.h:76
+#, fuzzy
+msgid "Show message in the normal style"
+msgstr "Ora trebuie sЦ fie Нn formatul: %s"
 
-#: ui/evolution-mail.xml.h:64
-msgid "_Forward"
-msgstr "_нnainteazЦ"
+#: ui/evolution-mail-message.xml.h:77
+#, fuzzy
+msgid "Show message with all email headers"
+msgstr "Verific mesajele noi Нn toate folderele"
 
-#: ui/evolution-mail.xml.h:65
-msgid "_Inline"
-msgstr "_Inline"
+#: ui/evolution-mail-message.xml.h:78
+#, fuzzy
+msgid "Show the raw email source of the message"
+msgstr "Ata╨ezЦ un fi╨ier la mesaj"
 
-#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_InverseazЦ selecЧia"
+#: ui/evolution-mail-message.xml.h:79
+#, fuzzy
+msgid "Un-delete the selected messages"
+msgstr "TipЦresc mesajul selectat"
 
-#: ui/evolution-mail.xml.h:67
-msgid "_Mail Message"
-msgstr "Mesaj _mail"
+#: ui/evolution-mail-message.xml.h:80
+#, fuzzy
+msgid "VFolder on Mailing _List..."
+msgstr "VFolder Нn lista de mail"
 
-#: ui/evolution-mail.xml.h:68
-msgid "_Mail Settings..."
-msgstr "SetЦri _mail..."
+#: ui/evolution-mail-message.xml.h:81
+#, fuzzy
+msgid "VFolder on Se_nder..."
+msgstr "VFolder pe expeditor"
 
-#: ui/evolution-mail.xml.h:69
-msgid "_Move to Folder..."
-msgstr "MutЦ Нn folder..."
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "VFolder on _Recipients..."
+msgstr "Vfolder pe destinatari"
 
-#: ui/evolution-mail.xml.h:70
-msgid "_Open Selected Items"
-msgstr "_Deschide articolele selectate"
+#: ui/evolution-mail-message.xml.h:83
+#, fuzzy
+msgid "VFolder on _Subject..."
+msgstr "VFolder pe _subiect"
 
-#: ui/evolution-mail.xml.h:72
-msgid "_Quoted"
-msgstr "Cotat"
+#: ui/evolution-mail-message.xml.h:84
+msgid "_Apply Filters"
+msgstr "_AplicЦ filtrele"
+
+#: ui/evolution-mail-message.xml.h:85
+#, fuzzy
+msgid "_Copy to Folder"
+msgstr "CopiazЦ Нn folder"
 
-#: ui/evolution-mail.xml.h:73
-msgid "_Reply"
-msgstr "_RЦspuns"
+#: ui/evolution-mail-message.xml.h:86
+msgid "_Create Filter From Message"
+msgstr "_CreazЦ filtru din mesaj"
 
-#: ui/evolution-mail.xml.h:74
-msgid "_Resend Messages"
+#: ui/evolution-mail-message.xml.h:88
+#, fuzzy
+msgid "_Forward Message"
+msgstr "Mesaje Нnaintate"
+
+#: ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Message Display"
+msgstr "Mesaje"
+
+#: ui/evolution-mail-message.xml.h:90
+#, fuzzy
+msgid "_Move to Folder"
+msgstr "MutЦ in folder"
+
+#: ui/evolution-mail-message.xml.h:91
+#, fuzzy
+msgid "_Normal Display"
+msgstr "Afi╨eaza"
+
+#: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Open Message"
 msgstr "_Retrimit mesaje"
 
-#: ui/evolution-mail.xml.h:76
-msgid "_Send / Receive"
-msgstr "Trimit / Prime_sc"
+#: ui/evolution-mail-message.xml.h:93
+#, fuzzy
+msgid "_Re-send Message"
+msgstr "_Retrimit mesaje"
 
-#: ui/evolution-mail.xml.h:77
-msgid "_Threaded"
-msgstr "_нnlЦnЧuite"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "нnchide aceastЦ fereastrЦ"
 
-#: ui/evolution-mail.xml.h:79
-msgid "_Undelete"
-msgstr "Rec_uperare"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr "Personali_zeazЦ bara de unelte..."
+
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "Personalizare"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "PersonalizeazЦ bara de unelte"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "нn_chide"
+
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "_Vizualizare"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Ata╨eazЦ"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "нnchid fi╨ierul curent"
 
 #: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Delete all but signature"
+msgstr "╙terge un contact"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "CripteazЦ acest mesaj cu PGP"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "F_ormat"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "InsereazЦ fi╨ier text..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "InsereazЦ un fi╨ier ca text Нn mesaj"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "InsereazЦ fi╨ier text..."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Deschide fi╨ier"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "Criptare PGP"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "SemnЦturЦ PGP"
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "Salvez ciorna"
+#, fuzzy
+msgid "S/MIME Encrypt"
+msgstr "Criptare PGP"
 
 #: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Salvez Нn _folder... (FIXME)"
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "Salvare"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "SalveazЦ ca"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr "Salvez ciorna"
+
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Salvez Нn folder..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "SalveazЦ fi╨ierul curent"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Salvez fi╨ierul curent cu un nume diferit"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Salvez mesajul Нntr-un folder specificat"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Trimit"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Trimit mai tБrziu"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Trimit mai tБrziu"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Trimit mailul Нn format HTML"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Trimit mesajul mai tБrziu"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Trimit un mesaj nou"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Trimit acest mesaj acum"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "AratЦ / ascunde ata╨urile"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "AratЦ _ata╨urile"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "AratЦ ata╨urile"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "SemnaЧi acest mesaj cu cheia dumneavoastrЦ PGP"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "SemnaЧi acest mesaj cu cheia dumneavoastrЦ PGP"
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr "SelecteazЦ Нn timp ce cБmpul BCC e afi╨at "
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr "SelecteazЦ Нn timp ce cБmpul CC e afi╨at"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "SelecteazЦ Нn timp ce cЦsuЧa De la e afi╨atЦ"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "SelecteazЦ Нn timp ce cБmpul RЦspuns la e afi╨at"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "_Ata╨"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "CБmpul _Bcc"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "CБmpul _Cc"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "_Debug"
+
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Delete all"
+msgstr "_╙tergere"
+
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "CБmpul De la"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_InsereazЦ"
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
-msgstr "_InsereazЦ fi╨ier text... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "Deschide..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "CБmpul _RЦspuns la"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "_Securitate"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "Ajutor"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "AdaugЦ folderul la lista folderelor subscrise"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "F_older"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "ReНmprospЦteazЦ lista"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "ReНmprospЦteazЦ lista folderelor"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "╙terge folderul din lista folderelor subscrise"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Subscrie"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Desubscrie"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "Atribuie task (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "GЦse╨te din nou"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "Cerere de НntБlnire (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Repetare"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "RepetЦ acЧiunea neefectuatЦ"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "нnlocuie╨te"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "нnlocuie╨te un ╨ir"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "RЦspuns la toЧi (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "Trimit_e raportul de stare (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "Sari peste apariЧie (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "SalveazЦ task ╨i Нnchide cЦsuЧa de dialog"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "CautЦ din nou acela╨i ╨ir"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "CautЦ un ╨ir"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Refacere"
+#: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Task"
+msgstr "Task nou"
 
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "RefЦ ultima acЧiune"
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "╙tergere task"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
-msgid "_Appointment (FIXME)"
-msgstr "_нntБlnire (FIXME)"
+#: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Re_fresh Task"
+msgstr "ReНmprospЦteazЦ lista"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "_Marcare completЦ"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "_RЦspuns (FIXME)"
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "Copy selected task"
+msgstr "_Deschide articolele selectate"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "CreazЦ un task nouЦ"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "╙tergere task"
+
+#: ui/evolution-tasks.xml.h:7
+#, fuzzy
+msgid "Delete selected tasks"
+msgstr "╙tergere task"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Task nou"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "Lipe╨te clipboard-ul"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "SalveazЦ task-ul ca altceva"
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "PreferinЧe task..."
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "SetЦri _mail..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_Task"
 
@@ -8173,132 +11459,217 @@ msgstr "_Task"
 msgid "About Evolution..."
 msgstr "Despre Evolution..."
 
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "нnchide aceastЦ fereastrЦ"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
-msgstr "Personali_zeazЦ bara de unelte..."
+#: ui/evolution.xml.h:2
+#, fuzzy
+msgid "Add to _Shortcut Bar"
+msgstr "Bara cu _scurtЦturi"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Personalizare"
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the name of this folder"
+msgstr "SchimbЦ vederea cu %s"
 
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "PersonalizeazЦ bara de unelte"
+#, fuzzy
+msgid "Copy this folder"
+msgstr "CopiazЦ Нn folder"
 
 #: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "Creez folder nou"
+
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "нnlЦturЦ aceastЦ aceastЦ scurtЦturЦ din bara de scurtЦturi"
+
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Creez folder nou"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "╙terge acest articol"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Afi╨eazЦ un folder diferit"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "Ie╨ire"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "Fereastra Evolution"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Ie╨ire din program"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "Ghid de iniЧiere"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "ImportЦ in format de fi╨ier extern"
 
-#: ui/evolution.xml.h:13
-msgid "Main toolbar"
-msgstr "Bara de unelte principalЦ"
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "MutЦ %s la stБnga"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:24
+msgid "Open in New _Window"
+msgstr ""
+
+#: ui/evolution.xml.h:25
+msgid "Open this folder in an other window"
+msgstr ""
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "AratЦ informaЧii despre Evolution"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "RaporteazЦ un bug"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "RaporteazЦ un bug"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "RaporteazЦ un bug folosind Bug Buddy"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:30
+#, fuzzy
+msgid "Toggle"
+msgstr "Rol"
+
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "SelecteazЦ Нn timp ce arЦt bara folder"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "SelecteazЦ Нn timp ce arЦt bara cu scurtЦturi"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "Toggle whether we are working offline."
+msgstr "SelecteazЦ Нn timp ce cЦsuЧa De la e afi╨atЦ"
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "Ghid de utilizare a managerului de contacte"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "Ghid de utilizare a calendarului"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "Ghid de utilizare a programului de mail"
 
-#: ui/evolution.xml.h:23
-msgid "Work Offline"
-msgstr "LucreazЦ offline"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr "VizualizeazЦ folderul selectat"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "Despre Evolution..."
 
-#: ui/evolution.xml.h:25
-msgid "_Actions"
-msgstr "_AcЧiuni"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "_нntБlnire (FIXME)"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "_Contact (FIXME)"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "_CopiazЦ"
+
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "Bara _folder"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "Mer_gi la folderul..."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "_Import fi╨ier..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "_Index"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "Mesaj _mail"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "MutЦ"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Nou"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "Folder _nou"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "Deschide..."
+
+#: ui/evolution.xml.h:59
 msgid "_Shortcut"
 msgstr "_ScurtЦturЦ"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "Bara cu _scurtЦturi"
 
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "_Task (FIXME)"
+
+#: ui/evolution.xml.h:64
+#, fuzzy
+msgid "_Work Offline"
+msgstr "LucreazЦ offline"
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "SetЦri _mail..."
+
 #: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
+#, fuzzy
+msgid "Address Cards"
 msgstr "Carduri adresЦ"
 
 #: views/addressbook/galview.xml.h:2
@@ -8331,157 +11702,243 @@ msgstr "Cu categorie"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:466
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2472
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Tentative"
-msgstr "TentativЦ"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Ocupat"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
 msgid "Out of Office"
 msgstr "AfarЦ din oficiu"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
 msgid "No Information"
 msgstr "Nici o informaЧie"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:406
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
 msgid "_Invite Others..."
 msgstr "_InvitЦ pe alЧii..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:426
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
 msgid "_Options"
 msgstr "_OpЧiuni"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:443
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
 msgid "Show _Only Working Hours"
 msgstr "AratЦ numai _orele de lucru"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:456
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
 msgid "Show _Zoomed Out"
 msgstr "AratЦ mЦrit"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:474
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
 msgid "_Update Free/Busy"
 msgstr "Act_ualizeazЦ liber/ocupat"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:492
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:509
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
 msgid "_Autopick"
 msgstr "_Alege automat"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:523
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:540
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
 msgid "_All People and Resources"
 msgstr "To_ate persoanele ╨i resursele"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:553
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr "Toate _persoanele ╨i o resursЦ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:566
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
 msgid "_Required People"
 msgstr "Necesa_r o persoanЦ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:579
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
 msgid "Required People and _One Resource"
 msgstr "Necesar o persoanЦ ╨i _o resursЦ"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:602
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
 msgid "Meeting _start time:"
 msgstr "Ora de Нnceput a НntБlnirii:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:626
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
 msgid "Meeting _end time:"
 msgstr "Ora de sfБr╨it a НntБlnirii:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:739
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
 msgid "All Attendees"
 msgstr "ToЧi participanЧii"
 
-#: widgets/menus/gal-view-menus.c:175
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "Vizualizarea _curentЦ"
 
-#: widgets/menus/gal-view-menus.c:194
+#: widgets/menus/gal-view-menus.c:259
 msgid "Define Views"
 msgstr "Definire vizualizare"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "LMMJVSD"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Acum"
 
-#: widgets/misc/e-cell-date-edit.c:242
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "AstЦzi"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: widgets/misc/e-cell-date-edit.c:723
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Ora trebuie sЦ fie Нn formatul: %s"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "sЦptЦmБnЦ"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "Gunoi"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "TranzacЧie e╨uatЦ"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "NoutЦЧi"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Eroare necunoscutЦ: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "Alte"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
+#: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:163
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Editor de contacte"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "SalveazЦ cЦutarea"
 
-#: widgets/misc/e-filter-bar.c:234
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "CЦutare avansatЦ"
 
-#: widgets/misc/e-filter-bar.c:314
-msgid "Advanced ..."
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "Afi╨eazЦ tot"
+
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
 msgstr "Avansat..."
 
-#: widgets/misc/e-messagebox.c:141
+#: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "InformaЧie"
 
-#: widgets/misc/e-messagebox.c:148
+#: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Avertisment"
 
-#: widgets/misc/e-messagebox.c:162
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Eroare"
+
+#: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "нntrebare"
 
-#: widgets/misc/e-messagebox.c:169
+#: widgets/misc/e-messagebox.c:180
 msgid "Message"
 msgstr "Mesaj"
 
 #. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
+#: widgets/misc/e-messagebox.c:224
 msgid "Don't show this message again."
 msgstr "Nu arЦta acest mesaj din nou"
 
-#: widgets/misc/e-search-bar.c:140
+#: widgets/misc/e-search-bar.c:155
 msgid "Sear_ch"
 msgstr "_CЦutare"
 
@@ -8505,57 +11962,599 @@ msgstr "init_corba(): nu pot iniЧializa GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nu pot iniЧializa Bonobo"
 
-#~ msgid "Send contact to other"
-#~ msgstr "Trimite contact la altcineva"
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "ModificЦ preferinЧe"
 
-#~ msgid "Send message to contact"
-#~ msgstr "Trimite mesaj la contact"
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "PreferinЧe task..."
 
-#~ msgid "Print Envelope"
-#~ msgstr "TipЦre╨te plic"
+#~ msgid "C_ontacts..."
+#~ msgstr "C_ontacte..."
 
-#~ msgid "File As"
-#~ msgstr "Fi╨ier ca"
+#~ msgid "_Company:"
+#~ msgstr "_Compania:"
 
-#~ msgid "Primary Phone"
-#~ msgstr "Telefon principal"
+#~ msgid "As _Minicards"
+#~ msgstr "Ca Minicard"
 
-#~ msgid "Assistant Phone"
-#~ msgstr "Telefon asistent"
+#~ msgid "As _Table"
+#~ msgstr "Ca tabel"
 
-#~ msgid "Company Phone"
-#~ msgstr "Telefon companie"
+#~ msgid ""
+#~ "We were unable to open this addressbook.  This either\n"
+#~ "means you have entered an incorrect URI, or have tried\n"
+#~ "to access an LDAP server and don't have LDAP support\n"
+#~ "compiled in.  If you've entered a URI, check the URI for\n"
+#~ "correctness and reenter.  If not, you probably have\n"
+#~ "attempted to access an LDAP server.  If you wish to be\n"
+#~ "able to use LDAP, you'll need to download and install\n"
+#~ "OpenLDAP and recompile and install Evolution.\n"
+#~ msgstr ""
+#~ "Nu pot deschide agenda. Aceasta inseamnЦ\n"
+#~ "cЦ aЧi introdus URI incorect sau aЧi Нncercat\n"
+#~ "sЦ accesaЧi un server LDAP ╨i nu aveЧi compilat suport pentru acesta.\n"
+#~ "DacЦ aЧi introdus URI, verificaЧi corectitudinea si reintroduceЧi.\n"
+#~ "DacЦ nu, probabil aЧi Нncercat sЦ accesaЧi un server LDAP.\n"
+#~ "DacЦ doriЧi sЦ folosiЧi LDAP, trebuie sЦ descЦrcaЧi ╨i sЦ\n"
+#~ "instalaЧi OpenLDAP ╨i sЦ recompilaЧi ╨i instalaЧi Evolution.\n"
 
-#~ msgid "Home Phone"
-#~ msgstr "Telefon acasЦ"
+#~ msgid "SASL"
+#~ msgstr "SASL"
 
-#~ msgid "Home Address"
-#~ msgstr "Adresa acasЦ"
+#~ msgid "Find..."
+#~ msgstr "GЦse╨te..."
 
-#~ msgid "Mobile Phone"
-#~ msgstr "Telefon mobil"
+#, fuzzy
+#~ msgid "Click here to add a contact"
+#~ msgstr "* Click aici sЦ adЦugaЧi un contact *"
 
-#~ msgid "Car Phone"
-#~ msgstr "Telefon ma╨inЦ"
+#~ msgid "Open calendar"
+#~ msgstr "Deschide calendar"
 
-#~ msgid "Home Phone 2"
-#~ msgstr "Telefon acasЦ 2"
+#~ msgid "Save calendar"
+#~ msgstr "Salvare calendar"
 
-#~ msgid "Other Phone"
-#~ msgstr "Alt telefon"
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>Eroare la НncЦrcarea calendarului:</b>MetodЦ nesuportatЦ"
 
-#~ msgid "TTY"
-#~ msgstr "TTY"
+#~ msgid "Alarms timeout after"
+#~ msgstr "Oprire alarmЦ dupa"
 
-#~ msgid "Other Address"
-#~ msgstr "AltЦ adresЦ"
+#~ msgid "Colors"
+#~ msgstr "Culori"
 
-#~ msgid "label26"
-#~ msgstr "eticheta26"
+#~ msgid "Enable snoozing for"
+#~ msgstr "Validez moЧЦire pentru"
+
+#~ msgid "Highlight"
+#~ msgstr "IlumineazЦ"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "De terminat astЦzi"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Neteminate НncЦ"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Neterminate НncЦ"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "Termen depЦ╨it"
+
+#~ msgid "TaskPad"
+#~ msgstr "Panou sarcini"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Timp rЦmas"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Alarme vizuale"
+
+#~ msgid "Work week"
+#~ msgstr "SЦptЦmНnЦ lucrЦtoare"
+
+#~ msgid "Edit Task"
+#~ msgstr "Editare task"
+
+#~ msgid "Mark the task complete"
+#~ msgstr "Marcare task completЦ"
+
+#~ msgid "Edit this task..."
+#~ msgstr "Editez acest task..."
+
+#~ msgid "Edit the task"
+#~ msgstr "Editare task"
+
+#~ msgid "Go to Today"
+#~ msgstr "Mergi la ziua"
+
+#~ msgid "Component successfully updated."
+#~ msgstr "ComponentЦ actualizatЦ cu succes."
+
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "Nu pot НncЦrca fi╨ierul calendar!\n"
+
+#~ msgid "I couldn't read your calendar file!\n"
+#~ msgstr "Nu pot citi fi╨ierul calendar!\n"
+
+#~ msgid "This is a reply from someone who was uninvited!"
+#~ msgstr "Acesta e un rЦspuns de la cineva care n-a fost invitat!"
+
+#~ msgid "I couldn't delete the calendar component!\n"
+#~ msgstr "Nu pot ╨terge compenentele calendarului!\n"
+
+#~ msgid "Component successfully deleted."
+#~ msgstr "ComponentЦ ╨tearsЦ cu succes."
+
+#~ msgid "I don't recognize this type of calendar component."
+#~ msgstr "Nu recunosc acest tip de componentЦ a calendarului."
+
+#~ msgid "Add to Calendar"
+#~ msgstr "AdaugЦ Нn calendar"
+
+#~ msgid " Tentative "
+#~ msgstr " IntenЧie "
+
+#~ msgid "Update Calendar"
+#~ msgstr " ActualizeazЦ calendar"
+
+#~ msgid "Attendee address"
+#~ msgstr "Adrese participare"
+
+#~ msgid "Attendees: "
+#~ msgstr "ParticipЦri"
+
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr ""
+#~ "Anulare\n"
+#~ "нntБlnire"
+
+#~ msgid "Organizer: "
+#~ msgstr "Organizator:"
+
+#~ msgid ""
+#~ "Publish\n"
+#~ "Event"
+#~ msgstr ""
+#~ "PublicЦ\n"
+#~ "Eveniment"
+
+#~ msgid "_Starting date:"
+#~ msgstr "_Data Нnceput:"
+
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "Nu pot testa fi╨ierul de blocare pentru %s: %s"
+
+#~ msgid "No such host %s."
+#~ msgstr "Nu existЦ host-ul %s."
+
+#~ msgid "Temporarily unable to look up hostname %s."
+#~ msgstr "Incapabil temporar sЦ caut hostname %s."
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Scanez folderul IMAP"
+
+#~ msgid "Inline attachment"
+#~ msgstr "Ata╨ inline"
+
+#~ msgid "Send as:"
+#~ msgstr "Timite ca:"
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nu pot deschde fi╨ierul semnЦturЦ %s:\n"
+#~ "%s"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "Acesta nu este un fi╨ier normal."
+
+#~ msgid "That file exists but is not readable."
+#~ msgstr "Acest fi╨ier existЦ dar nu se poate citi."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "Acest fi╨ier pare accesibil dar open(2) a e╨uat."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "Fi╨ierul este foarte mare (mai mare de 100k).\n"
+#~ "SunteЧi sigur cЦ vreЧi sЦ-l inseraЧi?"
+
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#~ msgid ""
+#~ "You can select a different HTML page for the background of the Executive "
+#~ "Summary.\n"
+#~ "\n"
+#~ "Just leave it blank for the default"
+#~ msgstr ""
+#~ "PuteЧi alege o altЦ paginЦ HTML pentru fundalul rezumatului activitЦЧilor.\n"
+#~ "\n"
+#~ "Pentru cel implicit lЦsaЧi-l gol"
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "Deschide %s cu aplicaЧia implicitЦ GNOME"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "Deschide %s cu navigatorul web implicit GNOME"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "Trimite un email la %s"
+
+#~ msgid "Run %s"
+#~ msgstr "Rulez %s"
+
+#~ msgid "Close %s"
+#~ msgstr "нnchid %s"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "MutЦ %s la dreapta"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "MutЦ %s Нn rБndul precedent"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "MutЦ %s Нn rБndul urmЦtor"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nu pot deschide fi╨ierul HTML: \n"
+#~ "%s"
+
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "Fi╨ierul nu are un loc pentru servicii.\n"
+
+#~ msgid "Appearance"
+#~ msgstr "AparenЧЦ"
+
+#~ msgid "Background:"
+#~ msgstr "Fundal:"
 
 #~ msgid ""
-#~ "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
-#~ "know."
+#~ "Executive summary component could not initialize Bonobo.\n"
+#~ "If there was a warning message about the RootPOA, it probably means\n"
+#~ "you compiled Bonobo against GOAD instead of OAF."
 #~ msgstr ""
-#~ "Este %s. Ora sistemului Unix este acum %ld. Ne-am gБndit cЦ poate vrei sЦ "
-#~ "stii."
+#~ "Componenta rezumat al activitЦЧilor nu poate iniЧializa Bonobo.\n"
+#~ "DacЦ a fost un mesaj de avertisment despre RootPOA, probabil aЧi\n"
+#~ "compilat Bonobo cu GOAD in loc de OAF."
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "Procesator pentru rezumatul RDF."
+
+#~ msgid "RDF Summary"
+#~ msgstr "Rezumat RDF"
+
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Procesator pentru componenta de test bonobo."
+
+#~ msgid "Factory for the test component."
+#~ msgstr "Procesator pentru componenta de test."
+
+#~ msgid "Test bonobo service"
+#~ msgstr "Service bonobo de test"
+
+#~ msgid "Test service"
+#~ msgstr "Service de test"
+
+#~ msgid "Update automatically"
+#~ msgstr "Actualizare automatЦ"
+
+#~ msgid "Remove criterion"
+#~ msgstr "Scoate criteriu"
+
+#~ msgid "Forward to Address"
+#~ msgstr "нnainteazЦ la adresa"
+
+#~ msgid "VFolder on Subject"
+#~ msgstr "VFolder Нn subiect"
+
+#~ msgid "VFolder on Sender"
+#~ msgstr "VFolder Нn expeditor"
+
+#~ msgid "VFolder on Recipients"
+#~ msgstr "VFolder Нn destinatari"
+
+#~ msgid "Mark as Read"
+#~ msgstr "Marchez ca citit"
+
+#~ msgid "Move to Folder..."
+#~ msgstr "Mut Нn folderul..."
+
+#~ msgid "Copy to Folder..."
+#~ msgstr "Copiez Нn folderul..."
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "SchimbЦ folderul \"%s\" Нn formatul \"%s\""
+
+#~ msgid "Closing current folder"
+#~ msgstr "нnchid folderul curent"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Redenumesc vechiul folder ╨i schimb"
+
+#~ msgid "Copying messages"
+#~ msgstr "Copiez mesaj"
+
+#~ msgid "Do you accept?"
+#~ msgstr "AcceptaЧi?"
+
+#~ msgid "Evolution progress"
+#~ msgstr "Evolution progres"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Recuperez mesajul numЦrul %s din %d (uid \"%s\")"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Salvez mesajul %d din %d (uid \"%s\")"
+
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "Mesaj scris incomplet Нn conductЦ!"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (mesaj Нnaintat)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "нnainte: (no subject)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Mesaj Нnaintat (no subject)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Mesaj Нnaintat-----<br><b>De la:</b> %s<br><b>La:</b> "
+#~ "%s<br><b>Subiect:</b> %s<br>"
+
+#~ msgid "Import files"
+#~ msgstr "Import fi╨iere"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Fi╨ierele Evolution au fost instalate cu succes."
+
+#~ msgid "Activate"
+#~ msgstr "ActiveazЦ"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "ActiveazЦ aceastЦ scurtЦturЦ"
+
+#~ msgid "Find a contact"
+#~ msgstr "GЦse╨te un contact"
+
+#~ msgid "View All"
+#~ msgstr "VizualizeazЦ tot"
+
+#~ msgid "View all contacts"
+#~ msgstr "VizualizeazЦ toate contactele"
+
+#~ msgid "5 Days"
+#~ msgstr "5 zile"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "CreazЦ calendar nou"
+
+#~ msgid "Day"
+#~ msgstr "Zi"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Deschide calendar"
+
+#~ msgid "Prev"
+#~ msgstr "Prev"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "SalveazЦ calendarul ca altceva"
+
+#~ msgid "Week"
+#~ msgstr "SЦptЦmБnЦ"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Deschide calendar"
+
+#~ msgid "About this application"
+#~ msgstr "Despre aceastЦ aplicaЧie"
+
+#~ msgid "About..."
+#~ msgstr "Despre..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "AcЧiu_ni"
+
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "Agenda... (FIXME)"
+
+#~ msgid "C_lear"
+#~ msgstr "╙terge"
+
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "VerificЦ nume (FIXME)"
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "CopiazЦ Нn folder... (FIXME)"
+
+#~ msgid "Dump XML"
+#~ msgstr "DescarcЦ XML"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "DescarcЦ descrierea UI Xml"
+
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "Primul articol din folder (FIXME)"
+
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "нnainteazЦ (FIXME)"
+
+#~ msgid "Go to the next item"
+#~ msgstr "Mergi la articolul urmЦtor"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "Mergi la articolul anterior"
+
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "Task in_comlete (FIXME)"
+
+#~ msgid "N_ext"
+#~ msgstr "UrmЦtorul"
+
+#~ msgid "Pre_vious"
+#~ msgstr "Anterior"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "SeteazЦ tipЦrire..."
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "ProgrameazЦ ceva ce seamЦnЦ cu o НntБlnire"
+
+#~ msgid "Select everything"
+#~ msgstr "SelecteazЦ tot"
+
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "Ce_rere task (FIXME)"
+
+#~ msgid "_About..."
+#~ msgstr "_Despre..."
+
+#~ msgid "_Item (FIXME)"
+#~ msgstr "Art_icol (FIXME)"
+
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "Intrare _jurnal (FIXME)"
+
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "U_ltimul articol din folder (FIXME)"
+
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "_Mesaj mail (FIXME)"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "_MutЦ Нn folder... (FIXME)"
+
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_NotЦ (FIXME)"
+
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "Articol necitit (FIXME)"
+
+#~ msgid "Add Service"
+#~ msgstr "Adaug serviciu"
+
+#~ msgid "Add a new service to the Executive Summary"
+#~ msgstr "Adaug un serviciu nou la Executive Summary"
+
+#~ msgid "Create a new email"
+#~ msgstr "Creez un mail nou"
+
+#~ msgid "Executive Summary Settings..."
+#~ msgstr "SetЦri pentru Executive Summary..."
+
+#~ msgid "New Mail"
+#~ msgstr "Mail nou"
+
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "Ascunde mesajele ╨terse"
+
+#~ msgid "Print message to the printer"
+#~ msgstr "TipЦre╨te mesaj la imprimantЦ"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "Redirectare (FIXME: de implementat)"
+
+#~ msgid "S_ource"
+#~ msgstr "Sursa"
+
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr ""
+#~ "Trimit mailurile din coadЦ\n"
+#~ "    ╨i primesc mailurile noi"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "Vizualizare sursЦ mesaj"
+
+#, fuzzy
+#~ msgid "_Compose"
+#~ msgstr "_Compunere"
+
+#~ msgid "_Reply"
+#~ msgstr "_RЦspuns"
+
+#~ msgid "_Threaded"
+#~ msgstr "_нnlЦnЧuite"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Salvez Нn _folder... (FIXME)"
+
+#~ msgid "Send the message now"
+#~ msgstr "Trimit un mesaj nou"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_InsereazЦ fi╨ier text... (FIXME)"
+
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "Atribuie task (FIXME)"
+
+#~ msgid "Meeting Re_quest (FIXME)"
+#~ msgstr "Cerere de НntБlnire (FIXME)"
+
+#~ msgid "Redo"
+#~ msgstr "Repetare"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "RepetЦ acЧiunea neefectuatЦ"
+
+#~ msgid "Replace"
+#~ msgstr "нnlocuie╨te"
+
+#~ msgid "Replace a string"
+#~ msgstr "нnlocuie╨te un ╨ir"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "RЦspuns la toЧi (FIXME)"
+
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "Trimit_e raportul de stare (FIXME)"
+
+#~ msgid "S_kip Occurrence (FIXME)"
+#~ msgstr "Sari peste apariЧie (FIXME)"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "CautЦ din nou acela╨i ╨ir"
+
+#~ msgid "Search for a string"
+#~ msgstr "CautЦ un ╨ir"
+
+#~ msgid "Undo"
+#~ msgstr "Refacere"
+
+#~ msgid "Undo the last action"
+#~ msgstr "RefЦ ultima acЧiune"
+
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "_Marcare completЦ"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "_RЦspuns (FIXME)"
+
+#~ msgid "Advanced ..."
+#~ msgstr "Avansat..."
+
+#~ msgid "label26"
+#~ msgstr "eticheta26"
diff --git a/po/ru.po b/po/ru.po
index 378b4a4d25..e9a8d9c1e0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: E-volution\n"
-"POT-Creation-Date: 2001-05-08 12:41+0400\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-05-08 13:15+04:00\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -12,11 +12,21 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3278
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import VCard files into Evolution."
+msgstr "Фабрика для импорта файлов GnomeCard в Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports VCard files into Evolution."
+msgstr "Импортирует файлы GnomeCard в Evolution."
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Карточка: "
 
-#: addressbook/backend/ebook/e-card.c:3280
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -24,7 +34,7 @@ msgstr ""
 "\n"
 "Имя: "
 
-#: addressbook/backend/ebook/e-card.c:3281
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -32,7 +42,7 @@ msgstr ""
 "\n"
 "  Префикс:    "
 
-#: addressbook/backend/ebook/e-card.c:3282
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -40,7 +50,7 @@ msgstr ""
 "\n"
 "  Имя: "
 
-#: addressbook/backend/ebook/e-card.c:3283
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -48,7 +58,7 @@ msgstr ""
 "\n"
 "  Добавочный: "
 
-#: addressbook/backend/ebook/e-card.c:3284
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -56,7 +66,7 @@ msgstr ""
 "\n"
 "  Фамилия:    "
 
-#: addressbook/backend/ebook/e-card.c:3285
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -64,7 +74,7 @@ msgstr ""
 "\n"
 "  Суффикс:     "
 
-#: addressbook/backend/ebook/e-card.c:3299
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -72,7 +82,7 @@ msgstr ""
 "\n"
 "Дата рождения: "
 
-#: addressbook/backend/ebook/e-card.c:3310
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -80,7 +90,7 @@ msgstr ""
 "\n"
 "Адрес:"
 
-#: addressbook/backend/ebook/e-card.c:3312
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -88,7 +98,7 @@ msgstr ""
 "\n"
 "Почтовый ящик:  "
 
-#: addressbook/backend/ebook/e-card.c:3313
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -96,7 +106,7 @@ msgstr ""
 "\n"
 "  Расш.:        "
 
-#: addressbook/backend/ebook/e-card.c:3314
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -104,7 +114,7 @@ msgstr ""
 "\n"
 "  Улица:     "
 
-#: addressbook/backend/ebook/e-card.c:3315
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -112,7 +122,7 @@ msgstr ""
 "\n"
 "  Город:      "
 
-#: addressbook/backend/ebook/e-card.c:3316
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -120,7 +130,7 @@ msgstr ""
 "\n"
 "  Область:      "
 
-#: addressbook/backend/ebook/e-card.c:3317
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -128,7 +138,7 @@ msgstr ""
 "\n"
 "  Почтовый код: "
 
-#: addressbook/backend/ebook/e-card.c:3318
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -136,7 +146,7 @@ msgstr ""
 "\n"
 "  Страна:     "
 
-#: addressbook/backend/ebook/e-card.c:3331
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
@@ -144,7 +154,7 @@ msgstr ""
 "\n"
 "Метка для доставки:"
 
-#: addressbook/backend/ebook/e-card.c:3343
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -152,7 +162,7 @@ msgstr ""
 "\n"
 "Телефоны:\n"
 
-#: addressbook/backend/ebook/e-card.c:3346
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -160,7 +170,7 @@ msgstr ""
 "\n"
 "Телефон:"
 
-#: addressbook/backend/ebook/e-card.c:3370
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -168,7 +178,7 @@ msgstr ""
 "\n"
 "Эл.адрес:\n"
 
-#: addressbook/backend/ebook/e-card.c:3373
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -176,7 +186,7 @@ msgstr ""
 "\n"
 "Эл.адрес:"
 
-#: addressbook/backend/ebook/e-card.c:3392
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -184,7 +194,7 @@ msgstr ""
 "\n"
 "Почтовый клиент: "
 
-#: addressbook/backend/ebook/e-card.c:3398
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -192,7 +202,7 @@ msgstr ""
 "\n"
 "Часовой пояс: "
 
-#: addressbook/backend/ebook/e-card.c:3406
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -200,7 +210,7 @@ msgstr ""
 "\n"
 "Геогр.положение: "
 
-#: addressbook/backend/ebook/e-card.c:3410
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -208,7 +218,7 @@ msgstr ""
 "\n"
 "Должность: "
 
-#: addressbook/backend/ebook/e-card.c:3422
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -216,7 +226,7 @@ msgstr ""
 "\n"
 "Орг.:"
 
-#: addressbook/backend/ebook/e-card.c:3423
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -224,7 +234,7 @@ msgstr ""
 "\n"
 "  Имя:  "
 
-#: addressbook/backend/ebook/e-card.c:3424
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -232,7 +242,7 @@ msgstr ""
 "\n"
 "Единица:  "
 
-#: addressbook/backend/ebook/e-card.c:3425
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -240,7 +250,7 @@ msgstr ""
 "\n"
 "Единица2: "
 
-#: addressbook/backend/ebook/e-card.c:3426
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -248,7 +258,7 @@ msgstr ""
 "\n"
 "Единица3: "
 
-#: addressbook/backend/ebook/e-card.c:3427
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -256,7 +266,7 @@ msgstr ""
 "\n"
 "Единица4: "
 
-#: addressbook/backend/ebook/e-card.c:3431
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -264,7 +274,7 @@ msgstr ""
 "\n"
 "Категории: "
 
-#: addressbook/backend/ebook/e-card.c:3432
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -282,7 +292,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3445
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -290,7 +300,7 @@ msgstr ""
 "\n"
 "Уникальная строка: "
 
-#: addressbook/backend/ebook/e-card.c:3448
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -298,36 +308,24 @@ msgstr ""
 "\n"
 "Публичный ключ: "
 
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr "Множество VCards"
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:4045
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard для %s"
 
-#: addressbook/backend/ebook/e-destination.c:232
-msgid "???"
-msgstr "???"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr "Фабрика для импорта файлов GnomeCard в Evolution."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "Импортирует файлы GnomeCard в Evolution."
-
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Не удалось инициализировать Bonobo"
 
@@ -340,14 +338,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook не загружена\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Не удалось запустить сервер wombat"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Не удалось запустить wombat"
 
@@ -356,728 +354,855 @@ msgstr "Не удалось запустить wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Невозможно прочесть блок приложения адресов Пилота"
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Что показывать в миникарточках адресной книги Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Просмотрщик миникарточек адресной книги Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "Компонент Evolution для обработки контактов."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Фабрика для отображателя адреса из адресной книги"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#, fuzzy
+msgid "Factory for the Addressbook's address popup"
+msgstr "Фабрика для отображателя адреса из адресной книги"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr "Фабрика компонента адресной книги Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#, fuzzy
+msgid "Factory for the sample Addressbook control"
+msgstr "Щелкните здесь для адресной книги"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "Сервер LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Файл"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Неизвестный тип адресной книги"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "Нет (анонимный режим)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Пароль"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Неизвестная тип авторизации"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "Основа"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "Один"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "Поддерево"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr "Неизвестный тип области действия"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Запомнить этот пароль"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "Хост:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Порт:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "Поиск области действия:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Идентификация:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Путь:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "Создать путь, если он не существует."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "Правка адресной книги"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "Добавить адресную книгу"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"Выберите вид вашей адресной книги и введите соответствующую информацию о ней."
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Имя:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Описание:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr ""
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
+msgid "Addressbook Sources"
+msgstr "Источники адресных книг"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Удалить"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Имя"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
 msgstr "Добавить"
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "Правка"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "Другие контакты"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "Введите пароль для %s"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Не удалось открыть адресную книгу"
+
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+"Не удалось открыть эту адресную книгу. Это значит,\n"
+"что либо вы ввели неправильный URI, либо LDAP\n"
+"сервер не отвечает"
+
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+"Эта версия Evolution не имеет встроенной поддержки LDAP.\n"
+"Если вы хотите использовать LDAP в Evolution, вы должны\n"
+"перекомпилировать программу из исходных текстов в CVS после\n"
+"установки OpenLDAP полученного по приведённой ниже ссылке.\n"
+
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+"Не удалось открыть эту адресную книгу. Проверьте, что путь существует\n"
+"и что у вас есть необходимые права доступа."
+
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
+msgstr "Любое поле содержит"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "Имя содержит"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "Эл.адрес содержит"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "Имя содержит"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "URI, который будет показывать программа просмотра папок"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "Первый эл.адрес"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "Эл.адрес 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "Эл.адрес 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "Выбрать файл"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Создать новый контакт"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "Правка адресной книги"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "Правка контактной информации"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "Добавить к контактам"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "Эл.адрес:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "Отключить очереди"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Включить очереди (Опасно!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Интерфейс выбора имени в адресной книге Evolution."
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Удалить"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "Удалить все"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "Отправка эл.почты"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Другие контакты"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "Получатели сообщения"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "Выбрать имена"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "Выбрать имена из:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "Категории:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "Поиск"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "Годовщина:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "Рабочий"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "Рабочий факс"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "Контакты..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Категории..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Редактор контактов"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Детали"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Файл как:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Общее"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Новый тип телефона"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "Заметки:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Организация:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Тип телефона"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
-msgstr "Первый эл.адрес"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "Хочет получать почту в HTML"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Адрес web-страницы:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
-msgstr "Добавить"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "Адрес..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "Имя помощника:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "День рождения:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "Рабочий"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "Компания:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "Контакты..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:640 mail/mail-config.glade.h:75
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:98
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "Удалить"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "Отдел"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "Полное имя..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "Домашний"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "Должность:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "Имя менеджера:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "Мобильный"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "Псевдоним:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "Офис:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "Профессия:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "Супруг(а):"
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "Это почтовый адрес"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Удалить контакт?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "Этот контакт принадлежит следующим категориям:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Помощник"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Рабочий"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Рабочий 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Рабочий факс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Обратный отзвон"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Машина"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Компания"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Домашний"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Домашний 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Домашний Факс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Другой"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Другой факс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Пэйджер"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Первый"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Радио"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Телекс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
-msgid "Email 2"
-msgstr "Эл.адрес 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
-msgid "Email 3"
-msgstr "Эл.адрес 3"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Удалить контакт?"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:233
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Быстрое добавление контакта"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:235
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "Правка полного имени"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:276
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Полное имя:"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:282
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "Эл.адрес"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Адрес 2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Канада"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Проверить адрес"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Страна:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Финляндия"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "США"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "Адрес:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "Город:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "Аб.ящик:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "Область/Район (Штат/Провинция):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "Почтовый индекс:"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Проверить полное имя"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Др."
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr "Эскв."
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "мл."
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "Мисс"
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Mr."
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Mrs."
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Ms."
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "Имя:"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "Фамилия:"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "Отчество:"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "Суффикс:"
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "Заголовок:"
 
-#: addressbook/gui/component/addressbook.c:242
-msgid "As _Minicards"
-msgstr "Как миникарточки"
-
-#: addressbook/gui/component/addressbook.c:248
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr "Как таблица"
-
-#: addressbook/gui/component/addressbook.c:408
-#, c-format
-msgid "Enter password for %s"
-msgstr "Введите пароль для %s"
-
-#: addressbook/gui/component/addressbook.c:436
-msgid "Unable to open addressbook"
-msgstr "Не удалось открыть адресную книгу"
-
-#: addressbook/gui/component/addressbook.c:443
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or the LDAP server\n"
-"is down"
-msgstr ""
-"Не удалось открыть эту адресную книгу. Это значит,\n"
-"что либо вы ввели неправильный URI, либо LDAP\n"
-"сервер не отвечает"
-
-#: addressbook/gui/component/addressbook.c:448
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
-msgstr ""
-"Эта версия Evolution не имеет встроенной поддержки LDAP.\n"
-"Если вы хотите использовать LDAP в Evolution, вы должны\n"
-"перекомпилировать программу из исходных текстов в CVS после\n"
-"установки OpenLDAP полученного по приведённой ниже ссылке.\n"
-
-#: addressbook/gui/component/addressbook.c:456
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
-msgstr ""
-"Не удалось открыть эту адресную книгу. Проверьте, что путь существует\n"
-"и что у вас есть необходимые права доступа."
-
-#: addressbook/gui/component/addressbook.c:607 calendar/gui/gnome-cal.c:233
-msgid "Any field contains"
-msgstr "Любое поле содержит"
-
-#: addressbook/gui/component/addressbook.c:608
-msgid "Name contains"
-msgstr "Имя содержит"
-
-#: addressbook/gui/component/addressbook.c:609
-msgid "Email contains"
-msgstr "Эл.адрес содержит"
-
-#: addressbook/gui/component/addressbook.c:752
-msgid "The URI that the Folder Browser will display"
-msgstr "URI, который будет показывать программа просмотра папок"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "Сервер LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Файл"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Неизвестный тип адресной книги"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "Нет (анонимный режим)"
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
-msgid "Password"
-msgstr "Пароль"
-
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:170
-msgid "Unknown auth type"
-msgstr "Неизвестная тип авторизации"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "Base"
-msgstr "Основа"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "One"
-msgstr "Один"
-
-#: addressbook/gui/component/addressbook-config.c:183
-msgid "Subtree"
-msgstr "Поддерево"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Unknown scope type"
-msgstr "Неизвестный тип области действия"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "Имя файла:"
 
-#: addressbook/gui/component/addressbook-config.c:353
-msgid "Bind DN:"
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "Декабрь"
 
-#: addressbook/gui/component/addressbook-config.c:354
-msgid "FIXME Bind DN Help text here"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
-msgstr "Запомнить этот пароль"
-
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
-msgid "Host:"
-msgstr "Хост:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Host help text here."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Port:"
-msgstr "Порт:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
+msgstr "Удалить"
 
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
-msgstr ""
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "Редактор контактов"
 
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
-msgstr ""
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "Редактор контактов"
 
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:435
-msgid "Search Scope:"
-msgstr "Поиск области действия:"
-
-#: addressbook/gui/component/addressbook-config.c:489
-msgid "Authentication:"
-msgstr "Идентификация:"
-
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
-msgid "Path:"
-msgstr "Путь:"
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "FIXME Path Help text here"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:513
-msgid "Create path if it doesn't exist."
-msgstr "Создать путь, если он не существует."
-
-#: addressbook/gui/component/addressbook-config.c:647
-msgid "Edit Addressbook"
-msgstr "Правка адресной книги"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#, fuzzy
+msgid "New Contact:"
+msgstr "Новый контакт"
 
-#: addressbook/gui/component/addressbook-config.c:649
-msgid "Add Addressbook"
-msgstr "Добавить адресную книгу"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#, fuzzy
+msgid "Original Contact:"
+msgstr "Другие контакты"
 
-#: addressbook/gui/component/addressbook-config.c:665
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"Выберите вид вашей адресной книги и введите соответствующую информацию о ней."
-
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
-msgid "Name:"
-msgstr "Имя:"
-
-#: addressbook/gui/component/addressbook-config.c:672
-msgid "FIXME Name help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:674
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Описание:"
-
-#: addressbook/gui/component/addressbook-config.c:675
-msgid "FIXME Description help text here"
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Источники адресных книг"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:19
-#: mail/message-browser.c:203 ui/evolution-addressbook.xml.h:3
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Удалить"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "Правка"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Имя"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
+#, fuzzy
+msgid "Changed Contact:"
 msgstr "Другие контакты"
 
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "Отключить очереди"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "Включить очереди (Опасно!)"
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
-msgstr "Правка контактной информации"
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
-msgid "Add to Contacts"
-msgstr "Добавить к контактам"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Что показывать в миникарточках адресной книги Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Просмотрщик миникарточек адресной книги Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "Компонент Evolution для обработки контактов."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Фабрика для отображателя адреса из адресной книги"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-#, fuzzy
-msgid "Factory for the Addressbook's address popup"
-msgstr "Фабрика для отображателя адреса из адресной книги"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "Фабрика компонента адресной книги Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-#, fuzzy
-msgid "Factory for the sample Addressbook control"
-msgstr "Щелкните здесь для адресной книги"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
-msgstr "Удалить"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
-msgid "Remove All"
-msgstr "Удалить все"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Интерфейс выбора имени в адресной книге Evolution."
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Найти..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Получатели сообщения"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Выбрать имена"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Выбрать имена из:"
-
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:148
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Поиск"
 
@@ -1189,150 +1314,254 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "Сохранить как VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr "Послать контакт другому"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Send message to contact"
 msgstr "Послать сообщение к контакту"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576 mail/message-browser.c:200
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:55 ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Печать"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr "Печать конверта"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Удалить"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "Ошибка при загрузке %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "Источники"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Неизвестная ошибка"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "Работать вне сети"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "Отказ в доступе"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "Файл не найден"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Операция не поддерживается"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "Отменено"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "Ошибка ввода/вывода"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "Ошибка при загрузке %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Ошибка при загрузке %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Ошибка при загрузке %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "Ошибка при загрузке %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr ""
+"Ошибка при чтении данных:\n"
+"%s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* Щелкните здесь для добавления контакта *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr "Файл как"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "Эл.адрес"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "Первый телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr "Телефон помощника"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "Рабочий телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr "Обратный отзвон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "Телефон компании"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "Домашний телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Организация"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "Рабочий адрес"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "Домашний адрес"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "Мобильный телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "Телефон в машине"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "Рабочий телефон 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "Домашний телефон 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "Другие телефоны"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "Другие адреса"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Сайт в Интернет"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "Отдел"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Офис"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "Заголовок"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Профессия"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Управляющий"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Псевдоним"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "Супруг(а)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Заметка"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "Сделано"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "Загрузка календаря..."
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Сохранить в адресной книге"
 
-#: addressbook/gui/widgets/e-minicard-view.c:469
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1375,7 +1604,8 @@ msgid "Dimensions:"
 msgstr "Размеры:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Шрифт..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1435,7 +1665,6 @@ msgid "Margins"
 msgstr "Поля"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "Число столбцов:"
 
@@ -1516,40 +1745,61 @@ msgid "Width:"
 msgstr "Ширина:"
 
 #: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "метка26"
+#, fuzzy
+msgid "_Font..."
+msgstr "Шрифт..."
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Ошибка при подключении к серверу календаря"
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "Невозможно прочесть блок приложения календарь Пилота"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "Невозможно прочесть блок приложения заданий Пилота"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "Напоминать обо всех встречах"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Короткий сон"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr "Компонент Executive Summary программы Evolution."
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Ok"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Просмотрщик iTip/iMip календаря Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr "Компонент Evolution для обработки календаря."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr "Фабрика компонента календаря Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Фабрика компонента календаря Evolution."
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1560,143 +1810,257 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr "Невозможно инициализировать редактор почты Evolution."
 
-#: calendar/gui/alarm-notify/notify-main.c:56
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr "Уведомление о вашей встрече в %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, fuzzy, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr "Уведомление о вашей встрече в %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, fuzzy, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr "Уведомление о вашей встрече в %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "Уведомление о вашей встрече в %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr "Уведомление о вашей встрече в %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, fuzzy, c-format
+msgid "Notification about your task starting on %s"
+msgstr "Уведомление о вашей встрече в %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, fuzzy, c-format
+msgid "Notification about your task ending on %s"
+msgstr "Уведомление о вашей встрече в %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "Показать информацию о программе Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr "Таймер на %A %b %d %Y %H:%M"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Закрыть"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "Короткий сон"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "Время дремания (минут)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "Правка встречи"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "Итог не доступен."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "Напоминать обо всех встречах"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "Короткий сон"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
 "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
 "know."
 msgstr "Это %s. Сейчас %ld. Мы просто подумали, что вы хотите это знать."
 
-#: calendar/gui/alarm-notify/notify-main.c:93 calendar/gui/main.c:52
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
 msgid "Could not initialize GNOME"
 msgstr "Не удалось инициализировать GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:108
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Не удалось инициализировать Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "Не удалось создать временный каталог: %s"
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
-msgstr "Файл не найден"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A, %e %B %Y"
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
-msgstr "Открыть календарь"
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
-msgstr "Сохранить календарь"
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:468
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Не удалось создать окно календаря. Пожалуйста проверьте вашу установку ORBit "
 "и OAF."
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "Общее"
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Личное"
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Конфиденциальное"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1601
-#: calendar/gui/event-editor.c:1628
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Неизвестное"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "С"
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "Ю"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "В"
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "З"
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:694
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Высокий"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
-#: calendar/gui/calendar-model.c:1574
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:693
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Нормальный"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:692
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Низкий"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Прозрачный"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Непрозрачный"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Не начато"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "В процессе"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "Выполнено"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:544
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Отменено"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:802
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1707,7 +2071,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:882
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
@@ -1715,17 +2079,21 @@ msgstr ""
 "или \"Никакой\""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
-#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1198
-#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
-#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Нет"
 
-#: calendar/gui/calendar-model.c:970
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1735,119 +2103,295 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1010
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Значение процента должно быть между 0 и 100, включительно"
 
-#: calendar/gui/calendar-model.c:1051
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "Приоритет должен быть \"Высокий\", \"Нормальный\", \"Низкий\" или "
 "\"Неопределенный\"."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1064
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Неопределенное"
 
-#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 "Прозрачность должна быть \"Прозрачное\", \"Непрозрачное\" или \"Никакое\"."
 
-#: calendar/gui/calendar-model.c:1576
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "Повторение"
 
-#: calendar/gui/calendar-model.c:1578
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Связанное"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Да"
 
-#: calendar/gui/calendar-model.c:1584
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Нет"
 
-#: calendar/gui/calendar-summary.c:198
-msgid "%A, %e %B %Y"
-msgstr "%A, %e %B %Y"
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "Day View"
+msgstr "Просмотр карточек"
 
-#: calendar/gui/calendar-summary.c:207
-msgid "Appointments"
-msgstr "Встречи"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "Рабочая неделя"
 
-#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "Определить окна просмотра"
 
-#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:948
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Задания"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "Месяц"
 
-#: calendar/gui/calendar-summary.c:443
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Ошибка при загрузке календаря</b>"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "URI, который будет показывать календарь"
 
-#: calendar/gui/calendar-summary.c:455
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Ошибка загрузки календаря:<br>Метод не поддерживается"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "Аудио Таймеры"
 
-#: calendar/gui/calendar-summary.c:622
-msgid "Display"
-msgstr "Отобразить"
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "Получатели сообщения"
 
-#: calendar/gui/calendar-summary.c:627
-msgid "Show appointments"
-msgstr "Показать встречи"
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "Отобразить параметры"
 
-#: calendar/gui/calendar-summary.c:635
-msgid "Show tasks"
-msgstr "Показать задания"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:690
-msgid "Things to do"
-msgstr "Задания"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Загрузка календаря"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "URI, который будет показывать календарь"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Таймер на %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "Хранилище сообщений"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
-msgstr "Уведомление о вашей встрече в %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Воспроизвести звук"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
-msgstr "Итог не доступен."
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Закрыть"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "Запустить программу"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Правка встречи"
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Время дремания (минут)"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "дни"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "Обновлять каждые "
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "часы"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "минуты"
+
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr "%d дней"
+
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr " 1 день"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr " %d недель"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr " 1 неделя"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr " %d часов"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr " 1 час"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr " %d минут"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr " 1 минута"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr " %d секунд"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr " 1 секунда"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr "Воспроизвести звук"
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "Показать все заголовки сообщения"
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an email"
+msgstr "Отправить почту"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr "Запустить программу"
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr " до начала встречи"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr " после начала встречи"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr " перед окончанием встречи"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr " после окончания встречи"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "Основа"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "Дата и время"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "Напоминания"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Итог:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "Параметры"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "после"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "до"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+msgid "day(s)"
+msgstr "день"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr "завершение встречи"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "hour(s)"
+msgstr "часы"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+msgid "minute(s)"
+msgstr "минуты"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
+msgstr "начало встречи"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
@@ -1878,36 +2422,38 @@ msgid "60 minutes"
 msgstr "60 минут"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
-msgstr "Задержка таймера на"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Аудио Таймеры"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "Гудок при возникновении окна таймера."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Календарь"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Calendar Preferences"
 msgstr "Настройки календаря"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Color for tasks due today"
+msgstr ""
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Цвета"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+#, fuzzy
+msgid "Compress weekends in month view"
 msgstr "Сжать выходные дни"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+#, fuzzy
+msgid "Date Navigator"
 msgstr "Параметры навигатора дат"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1915,584 +2461,1087 @@ msgid "Defaults"
 msgstr "Исх.значения"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Отобразить параметры"
+#: mail/mail-config.glade.h:30
+msgid "Display"
+msgstr "Отобразить"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
-msgstr "Условленная дата"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr "Разрешить краткий сон для "
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Конец дня:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Первый день недели:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "Пят"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Пятница"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "Подсвеченные дни:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr "Задания установленные на сегодня"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr "Задания установленные на сегодня:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr "Еще не просроченные задания"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr "Еще не просроченные задания:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "Пон"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Понедельник"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
-msgstr "Просроченные задания"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
-msgstr "Просроченные задания:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
-msgstr "Выбрать цвет"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "Приоритет"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#, fuzzy
+msgid "Overdue tasks"
+msgstr "Просроченные задания"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Напоминать обо всех встречах"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Напоминания"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "Суб"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Суббота"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Показать"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "Показать время окончании встречи"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Показать номера недель"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "Начало дня:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "Вск"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Воскресенье"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "Панель заданий"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "Задания"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "Tasks due today"
+msgstr "Задания установленные на сегодня"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "Чтв"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Четверг"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr "Время до условленного"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Time"
+msgstr "Заголовок"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "Разделители времени:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Формат времени:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"Часовой пояс: "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "Втр"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "Видимые таймеры"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "Срд"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Среда"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
 msgstr "Рабочая неделя"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr "минут до назначенного времени."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
-msgid "seconds."
-msgstr "секунд."
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "Вы уверены что хотите удалить этот счет?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "Вы уверены что вы хотите удалить задание \"%s\"?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "Вы уверены что вы хотите удалить журнальную запись \"%s\"?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "Выполнено"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "Выполнено"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+#, fuzzy
+msgid "Due "
+msgstr "Условленная дата"
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "Правка встречи"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "Встреча - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "Задание - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Журнальная запись - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Нет итога"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "Переписать файл?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Файл с таким названием уже существует.\n"
+"Переписать его?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Сохранить как..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Вы уверены что вы хотите удалить встречу \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:73
+#: calendar/gui/dialogs/delete-comp.c:87
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Вы уверены что хотите удалить эту неозаглавленную встречу?"
 
-#: calendar/gui/dialogs/delete-comp.c:79
+#: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Вы уверены что вы хотите удалить задание \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:82
+#: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Вы уверены что хотите удалить это неозаглавленное задание?"
 
-#: calendar/gui/dialogs/delete-comp.c:88
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Вы уверены что вы хотите удалить журнальную запись \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Вы уверены что хотите удалить эту неозаглавленную журнальную запись?"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Хотите сохранить изменения?"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "Вы уверены что вы хотите удалить встречу \"%s\"?"
 
-#: calendar/gui/dialogs/task-editor.c:709
-msgid "Edit Task"
-msgstr "Правка задания"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "Вы уверены что вы хотите удалить задание \"%s\"?"
 
-#: calendar/gui/dialogs/task-editor.c:714 calendar/gui/event-editor.c:382
-#, c-format
-msgid "Appointment - %s"
-msgstr "Встреча - %s"
+#: calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "Вы уверены что вы хотите удалить журнальную запись \"%s\"?"
 
-#: calendar/gui/dialogs/task-editor.c:717 calendar/gui/event-editor.c:385
-#, c-format
-msgid "Task - %s"
-msgstr "Задание - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Выбрать файл"
 
-#: calendar/gui/dialogs/task-editor.c:720 calendar/gui/event-editor.c:388
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Журнальная запись - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Разделы:"
 
-#: calendar/gui/dialogs/task-editor.c:734 calendar/gui/event-editor.c:402
-msgid "No summary"
-msgstr "Нет итога"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Часовой пояс: "
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% Выполнения:"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
+msgstr "Встреча"
+
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
+msgstr "Напоминание"
+
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
+msgstr "Повторение"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "Отменить встречу"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr "Все события дня"
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Классификация"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Date & Time"
 msgstr "Дата и время"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Дата выполнения:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Pri_vate"
 msgstr "Личное"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "Продвижение"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "Общее"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Дата начала:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "Итог:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Задание"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
 msgid "_Confidential"
 msgstr "Конфиденциальное"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "Контакты..."
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "Время окончания:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Due Date:"
-msgstr "Условленная дата:"
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "Время начала:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "Приоритет:"
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "Состояние:"
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Название группы:"
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
-msgstr "Категории"
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Источник бумаги:"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Completion Date"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr "Председатель"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr "Требуемые участники"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr "Дополнительные участники"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Добавить действие"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr " Принять "
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr " Отклонить "
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Экспериментальный"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Удаленное"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "В процессе"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Телефон в машине"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Требуемые участники"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Дополнительные участники"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Дополнительные участники"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "Отправленное"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "Удалить..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
+msgstr "Сопровождение"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
 msgstr "Дата выполненения"
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "End Date"
-msgstr "Дата окончания"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "Удаленное"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Start Date"
-msgstr "Дата начала"
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "Удаленное"
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
-msgstr "Географическое расположение"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "Управляющий"
 
-#: calendar/gui/e-calendar-table.c:164
-msgid "Percent complete"
-msgstr "Процент выполненного"
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "Декабрь"
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Summary"
-msgstr "Итог"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
-msgstr "Прозрачность"
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr "Роль"
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
-msgstr "URL"
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Состояние"
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
-msgstr "Аудио Таймеры"
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Тип"
 
-#: calendar/gui/e-calendar-table.c:170
-msgid "Click here to add a task"
-msgstr "Щелкните здесь для добавления задачи"
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Организатор:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Организатор:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "Пригласить других..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Организатор:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
+"Эта встреча имеет правила повторения, которые не могут быть отредактированы "
+"в Evolution."
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr "в"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "день"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr "ый"
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr "случаи"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+msgid "Custom recurrence"
+msgstr "Другое повторение"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Каждый"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "Исключения"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
+msgstr "Без повторения"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
+msgstr "Просмотр"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
+msgstr "Правило повторения"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
+msgstr "Простое повторение"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "Изменить"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "в"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "всегда"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "месяцы"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr "до"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+msgid "week(s)"
+msgstr "неделя"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
+msgstr "год"
+
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr "Хотите сохранить изменения?"
+
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "Дата выполнения:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "Удаленное"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "Удаленное"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "Нет"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "Задание"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% Выполнения:"
+
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
+msgstr "Продвижение"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "Дата начала:"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
+msgid "_Due Date:"
+msgstr "Условленная дата:"
+
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
+msgstr "Приоритет:"
+
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
+msgstr "Состояние:"
+
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "Пометить как выполненное"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "Открыть"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
-msgstr "Пометить задание как выполненное"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "Вырезать"
 
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit this task..."
-msgstr "Правка этого задания..."
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "Скопировать"
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "Правка задания"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "Вставить"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "Пометить как выполненное"
+
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Удалить это задание"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
+msgstr "Пометить как выполненное"
+
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Удалить задание"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
-msgstr "д.п."
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "Щелкните здесь для добавления задачи"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
-msgstr "п.п."
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% Выполнения:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Аудио Таймеры"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Категории"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "Выполнено"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "Дата выполненения"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "Условленная дата"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Дата окончания"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "Географическое расположение"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Приоритет"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Дата начала"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "Итог"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "Задания"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "Прозрачность"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "д.п."
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "п.п."
+
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Новая встреча"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "Новые ежедневное событие"
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
-msgid "Go to Today"
-msgstr "Сегодня"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "Перейти к сегодняшнему дню"
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "Перейти к дате..."
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Открыть"
-
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Удалить эту встречу"
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Вставить встречу в расписание"
-
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Сделать эту встречу перемещаемой"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "Удалить это вхождение"
 
-#: calendar/gui/e-day-view.c:3179
-msgid "Delete all Occurrences"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "Удалить все вхождения"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
-msgstr "Не удалось обновить ваш файл календаря!\n"
+#: calendar/gui/e-itip-control.c:697
+#, fuzzy
+msgid "This is a meeting request."
+msgstr "Это почтовый адрес"
 
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
-msgid "Component successfully updated."
-msgstr "Компонент успешно обновлен."
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
-msgstr "При загрузке файла календаря возникла ошибка."
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
-msgstr "Не удалось открыть ваш файл календаря!\n"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
-msgstr "Не удалось загрузить ваш файл календаря!\n"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
-msgid "I couldn't read your calendar file!\n"
-msgstr "Не удалось прочесть ваш файл календаря!\n"
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
+#, fuzzy
+msgid "The message is not understandable."
+msgstr "Это сообщение в настоящий момент не доступно"
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
-msgstr "Это ответ от кого-то кто не был приглашен!"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:499
-msgid "I couldn't update your calendar store."
-msgstr "Не удалось обновить хранилище вашего календаря."
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
-msgstr "Не удалось удалить компонент календаря!\n"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Component successfully deleted."
-msgstr "Компонент успешно удален."
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-msgid "I don't recognize this type of calendar component."
-msgstr "Не распознан этот тип компонента календаря."
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
-msgstr "Добавить к календарю"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
-msgid " Accept "
-msgstr " Принять "
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:815
-msgid " Decline "
-msgstr " Отклонить "
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:834
 #, fuzzy
-msgid " Tentative "
-msgstr "Экспериментальный"
+msgid "The message does not appear to be properly formed"
+msgstr "Видимо папка невостановимо испорчена."
+
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
-msgstr "Обновить календарь"
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
-msgstr "Отменить встречу"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr "Не удалось обновить ваш файл календаря!\n"
+
+#: calendar/gui/e-itip-control.c:1015
+#, fuzzy
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "Не удалось открыть ваш файл календаря!\n"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -2507,26 +3556,22 @@ msgstr ""
 msgid "Calendar Message"
 msgstr "Сообщение календаря"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:623
+#: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Дата:"
 
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "Загрузка календаря"
+
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Загрузка календаря..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Организатор:"
-
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Сообщение сервера:"
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Итог:"
-
 #: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr "дата-завершения"
@@ -2535,422 +3580,48 @@ msgstr "дата-завершения"
 msgid "date-start"
 msgstr "дата-начала"
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-msgid "Attendee"
-msgstr "Сопровождение"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-msgid "Attendee address"
-msgstr "Адрес сопровождения"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-msgid "Attendees: "
-msgstr "Сопровождение:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"Отменить\n"
-"встречу"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-msgid "Chair"
-msgstr "Председатель"
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-msgid "Meeting Invitations"
-msgstr "Приглашение на встречу"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr "Дополнительные участники"
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-msgid "Organizer: "
-msgstr "Организатор:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:14
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:16
-msgid "RSVP"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid ""
-"Request\n"
-"Meeting"
-msgstr ""
-"Запросить\n"
-"встречу"
-
-#: calendar/gui/e-meeting-dialog.glade.h:19
-msgid "Required Participant"
-msgstr "Требуемые участники"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-msgid "Role"
-msgstr "Роль"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-msgid ""
-"Schedule\n"
-"Time"
-msgstr ""
-"Вставить встречу\n"
-"в расписание"
-
-#: calendar/gui/e-meeting-dialog.glade.h:23 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1086
-msgid "Status"
-msgstr "Состояние"
-
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "Все"
 
-#: calendar/gui/e-tasks.c:155
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "Категории:"
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Невозможно загрузить задание в \"%s\""
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Метод необходимый для загрузки \"%s\" не поддерживается"
 
-#: calendar/gui/event-editor.c:377
-msgid "Edit Appointment"
-msgstr "Правка встречи"
-
-#: calendar/gui/event-editor.c:449
-msgid "on"
-msgstr "в"
-
-#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:81
-msgid "day"
-msgstr "день"
-
-#: calendar/gui/event-editor.c:601
-msgid "on the"
-msgstr ""
-
-#: calendar/gui/event-editor.c:608
-msgid "th"
-msgstr "ый"
-
-#: calendar/gui/event-editor.c:754
-msgid "occurrences"
-msgstr "случаи"
-
-#: calendar/gui/event-editor.c:871
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-"Эта встреча имеет правила повторения, которые не могут быть отредактированы "
-"в Evolution."
-
-#: calendar/gui/event-editor.c:1543
-#, c-format
-msgid " %d days"
-msgstr "%d дней"
-
-#: calendar/gui/event-editor.c:1545
-msgid " 1 day"
-msgstr " 1 день"
-
-#: calendar/gui/event-editor.c:1548
-#, c-format
-msgid " %d weeks"
-msgstr " %d недель"
-
-#: calendar/gui/event-editor.c:1550
-msgid " 1 week"
-msgstr " 1 неделя"
-
-#: calendar/gui/event-editor.c:1553
-#, c-format
-msgid " %d hours"
-msgstr " %d часов"
-
-#: calendar/gui/event-editor.c:1555
-msgid " 1 hour"
-msgstr " 1 час"
-
-#: calendar/gui/event-editor.c:1558
-#, c-format
-msgid " %d minutes"
-msgstr " %d минут"
-
-#: calendar/gui/event-editor.c:1560
-msgid " 1 minute"
-msgstr " 1 минута"
-
-#: calendar/gui/event-editor.c:1563
-#, c-format
-msgid " %d seconds"
-msgstr " %d секунд"
-
-#: calendar/gui/event-editor.c:1565
-msgid " 1 second"
-msgstr " 1 секунда"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1588
-msgid "Play a sound"
-msgstr "Воспроизвести звук"
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1591
-msgid "Show a dialog"
-msgstr "Показать диалог"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1594
-msgid "Send an email"
-msgstr "Отправить почту"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1597
-msgid "Run a program"
-msgstr "Запустить программу"
-
-#: calendar/gui/event-editor.c:1612
-msgid " before start of appointment"
-msgstr " до начала встречи"
-
-#: calendar/gui/event-editor.c:1614
-msgid " after start of appointment"
-msgstr " после начала встречи"
-
-#: calendar/gui/event-editor.c:1622
-msgid " before end of appointment"
-msgstr " перед окончанием встречи"
-
-#: calendar/gui/event-editor.c:1624
-msgid " after end of appointment"
-msgstr " после окончания встречи"
-
-#: calendar/gui/event-editor.c:3132 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Все события дня"
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Встреча"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "Основания встречи"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "Custom recurrence"
-msgstr "Другое повторение"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Каждый"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Исключения"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Изменить"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Без повторения"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Просмотр"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Повторение"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Правило повторения"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Напоминание"
-
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "Установки..."
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Простое повторение"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "Время окончания:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "Время начала:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "Дата начала:"
-
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "после"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
-msgid "before"
-msgstr "до"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "day(s)"
-msgstr "день"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "завершение встречи"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "в"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "всегда"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "hour(s)"
-msgstr "часы"
-
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "метка26"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "метка26"
-
-#: calendar/gui/event-editor-dialog.glade.h:42 mail/mail-config.glade.h:77
-msgid "minute(s)"
-msgstr "минуты"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "month(s)"
-msgstr "месяцы"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "start of appointment"
-msgstr "начало встречи"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr "до"
-
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr "неделя"
-
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "год"
-
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-msgid "New Appointment..."
-msgstr "Новая встреча..."
-
-#: calendar/gui/e-week-view.c:3314
-msgid "Delete All Occurrences"
-msgstr "Удалить все вхождения"
-
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/gnome-cal.c:234
-msgid "Summary contains"
-msgstr "Итог содержит"
-
-#: calendar/gui/gnome-cal.c:235
-msgid "Description contains"
-msgstr "Описание содержит"
-
-#: calendar/gui/gnome-cal.c:236
-msgid "Comment contains"
-msgstr "Коментарий содержит"
-
-#: calendar/gui/gnome-cal.c:237
-msgid "Has category"
-msgstr "Имеет категорию"
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "Новая встреча..."
 
-#: calendar/gui/gnome-cal.c:840
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Невозможно открыть папку \"%s\""
 
-#: calendar/gui/gnome-cal.c:851
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Метод необходимый для открытия \"%s\" не поддерживается"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr "Компонент Executive Summary программы Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Просмотрщик iTip/iMip календаря Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "Компонент Evolution для обработки календаря."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "Фабрика компонента календаря Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Апрель"
@@ -2972,232 +3643,256 @@ msgid "Go To Date"
 msgstr "Перейти к дате"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Сегодня"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Январь"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "Июль"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "Июнь"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "Март"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "Май"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "Ноябрь"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "Октябрь"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Сентябрь"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Сегодня"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1-ый"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2-ой"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3-ий"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4-ый"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5-ый"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6-ой"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7-ой"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8-ой"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9-ый"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10-ый"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11-ый"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12-ый"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13-ый"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14-ый"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15-ый"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16-ый"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17-ый"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18-ый"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19-ый"
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20-ый"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21-ый"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22-ой"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23-ий"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24-ый"
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25-ый"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26-ой"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27-ой"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28-ой"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29-ый"
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30-ый"
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31-ый"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Вс"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Пн"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Вт"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "Ср"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Чт"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Пт"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "Cб"
 
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Задания"
+
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "Текущий день (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1104
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Текущая неделя (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Текущий месяц (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Текущий год (%Y)"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Напечатать календарь"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1524
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:57
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Просмотр печати"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Печать этого элемента"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "Настройка страницы"
+
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "URI, который будет показан в папке заданий "
 
@@ -3235,81 +3930,101 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "ПВСЧПСВ"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "Подписывание не поддерживается этим шифром"
 
-#: camel/camel-cipher-context.c:209
+#: camel/camel-cipher-context.c:211
 #, fuzzy
 msgid "Clearsigning is not supported by this cipher"
 msgstr "Указанный тип не поддерживается для этого носителя"
 
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
 msgstr "Проверка не поддерживается этим шифром"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
 msgstr "Шифрование не поддерживается этим шифром"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:336
 msgid "Decryption is not supported by this cipher"
 msgstr "Расшифровка не поддерживается этим шифром"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "Синхронизация папок"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr "Не удалось открыть папку спула"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr "Не удалось обработать папку спула"
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "Получение сообщения %s"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
-#, c-format
-msgid "Failed message %d"
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, fuzzy, c-format
+msgid "Failed on message %d"
 msgstr "Сбойное сообщение %d"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "Невозможно открыть сообщение"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "Синхронизация папки"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-msgid "Complete"
-msgstr "Выполнено"
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Получение сообщения %d из %d"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Сбой на сообщении %d из %d"
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Ошибка анализа фильтра: %s: %s"
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Ошибка выполнения фильтра: %s: %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Ошибка выполнения поиска фильтра: %s: %s"
@@ -3345,14 +4060,33 @@ msgstr "Совершение запроса на неизвестном заголовке: %s"
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Недопустимый тип в тело-содержит, ожидается строка"
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Не удалось создать канал: %s"
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Не удалось получить папку: %s: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "Не удалось разветвить: %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Не удалось создать файл блокировки для %s: %s"
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3369,113 +4103,108 @@ msgstr "Не удалось получить lock используя fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Не удалось получить lock используя flock(2): %s"
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Не удалось проверить почтовый файл %s: %s"
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Невозможно открыть почтовый файл %s: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Невозможно открыть временный почтовый файл %s: %s"
 
-#: camel/camel-movemail.c:199
-#, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Невозможно проверить файл блокировки для %s: %s"
-
-#: camel/camel-movemail.c:245
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Ошибка при чтении почтового файла: %s"
-
-#: camel/camel-movemail.c:256
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Ошибка сохранения временного почтового файла: %s"
-
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Сбой при сохранении почты во временном файле %s: %s"
 
-#: camel/camel-movemail.c:306
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Не удалось создать канал: %s"
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Не удалось разветвить: %s"
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Сбой программы перемещения почты: %s"
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Неизвестная ошибка)"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Ошибка при чтении почтового файла: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Ошибка сохранения временного почтового файла: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Ошибка копирования временного почтового файла: %s"
 
-#: camel/camel-pgp-context.c:188
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Пожалуйста введите вашу %s парольную фразу для %s"
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Пожалуйста введите вашу %s парольную фразу."
 
-#: camel/camel-pgp-context.c:509
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr "Нет текста для подписи."
 
-#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
-#: camel/camel-pgp-context.c:1055 camel/camel-pgp-context.c:1267
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Пароль не предоставлен."
 
-#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
-#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1062
-#: camel/camel-pgp-context.c:1274
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Не удалось создать канал к GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:681
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:871
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr "Нет текста для проверки."
 
-#: camel/camel-pgp-context.c:888
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Не удалось создать временный файл: %s"
 
-#: camel/camel-pgp-context.c:1045
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr "Нет текста для шифрования."
 
-#: camel/camel-pgp-context.c:1071
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "Не указаны получатели"
 
-#: camel/camel-pgp-context.c:1259
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr "Нет шифра для дешифрации."
 
@@ -3510,7 +4239,7 @@ msgid "Connection cancelled"
 msgstr "Соединение отменено"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Не удалось подключиться к %s (порт %d): %s"
@@ -3519,13 +4248,13 @@ msgstr "Не удалось подключиться к %s (порт %d): %s"
 msgid "(unknown host)"
 msgstr "(неизвестный хост)"
 
-#: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
-#: camel/camel-remote-store.c:470
-#: camel/providers/imap/camel-imap-command.c:287
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "Операция отменена"
 
-#: camel/camel-remote-store.c:476
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "Сервер неожиданно отключился"
 
@@ -3637,7 +4366,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "Отрицательный ответ идентификации от сервера."
 
@@ -3703,12 +4432,12 @@ msgstr "Провайдер виртуальных папок электронной почты"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Для чтения почты по запросу к другому набору папок"
 
-#: camel/camel-session.c:294 camel/camel-session.c:363
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Провайдер для протокола \"%s\" не доступен"
 
-#: camel/camel-session.c:478
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3717,33 +4446,53 @@ msgstr ""
 "Невозможно создать каталог %s:\n"
 "%s"
 
-#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:1007 mail/mail-ops.c:1014
-#: mail/mail-ops.c:1032 mail/mail-ops.c:1033
-msgid "Trash"
-msgstr "Мусорная корзина"
+#: camel/camel-smime-context.c:173
+#, fuzzy, c-format
+msgid "Please enter your password for %s"
+msgstr "Пожалуйста введите вашу %s парольную фразу для %s"
 
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "Этот файл не существует."
+
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "Этот файл не существует."
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, fuzzy, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "Сбой при отправке имени пользователя на сервер"
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
+#, fuzzy
+msgid "Failed to decode message."
+msgstr "Сбойное сообщение %d"
+
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
-"Эл.адрес: %s\n"
-"Имя: %s\n"
-"Подразделение: %s\n"
-"Организация: %s\n"
-"Расположение: %s\n"
-"Область: %s\n"
-"Страна: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3758,17 +4507,36 @@ msgstr ""
 "\n"
 "Всё равно принять?"
 
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
+"Эл.адрес: %s\n"
+"Имя: %s\n"
+"Подразделение: %s\n"
+"Организация: %s\n"
+"Расположение: %s\n"
+"Область: %s\n"
+"Страна: %s"
+
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Невозможно проанализировать URL \"%s\""
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Нет сообщения %s в %s"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "Нет такого сообщения: %s"
@@ -3777,64 +4545,75 @@ msgstr "Нет такого сообщения: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Вы не можете скопировать сообщения из этой папки для мусора."
 
-#: camel/providers/imap/camel-imap-message-cache.c:150
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Невозможно открыть каталог кэш: %s"
-
-#: camel/providers/imap/camel-imap-command.c:232
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Неожиданный ответ от сервера IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Сбой команды IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:241 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Неизвестная ошибка"
-
-#: camel/providers/imap/camel-imap-command.c:295
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "Ответ сервера закончился слишком рано."
 
-#: camel/providers/imap/camel-imap-command.c:487
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Ответ IMAP сервера не содержит информации об %s"
 
-#: camel/providers/imap/camel-imap-command.c:524
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Неожиданный ответ \"OK\" от IMAP сервера: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:170
+#: camel/providers/imap/camel-imap-folder.c:192
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Невозможно создать каталог %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:189
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Невозможно загрузить итог для %s"
 
-#: camel/providers/imap/camel-imap-folder.c:362
-msgid "Scanning IMAP folder"
-msgstr "Сканирование папок IMAP"
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
+msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1043
-#: camel/providers/imap/camel-imap-folder.c:1265
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "Сохранение сообщений"
+
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "Это сообщение в настоящий момент не доступно"
 
-#: camel/providers/imap/camel-imap-folder.c:1071
-#: camel/providers/imap/camel-imap-folder.c:1298
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Сохранение сообщений"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "Невозможно найти тело сообщения в ответе FETCH."
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "Невозможно открыть каталог кэш: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "Проверка новое почты"
 
@@ -3842,7 +4621,7 @@ msgstr "Проверка новое почты"
 msgid "Check for new messages in all folders"
 msgstr "Проверка новой почты во всех папках"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:551
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Папки"
 
@@ -3878,28 +4657,28 @@ msgstr ""
 "Подключение к IMAP серверу будет производиться с использованием "
 "незашифрованного пароля."
 
-#: camel/providers/imap/camel-imap-store.c:454
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP сервер %s не поддерживает затребованный тип идентификации %s"
 
-#: camel/providers/imap/camel-imap-store.c:464
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Идентификация типа %s не поддерживается"
 
-#: camel/providers/imap/camel-imap-store.c:488
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sПожалуйста, введите пароль IMAP для %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:503
-#: camel/providers/smtp/camel-smtp-transport.c:410
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "Вы не ввели пароль."
 
-#: camel/providers/imap/camel-imap-store.c:529
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3910,36 +4689,51 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:788 mail/mail-local.c:337
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
 msgid "No such folder %s"
 msgstr "Нет такой папки %s"
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "Почтовые каталоги в формате UNIX MH"
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr "Для хранения локальной почты в почтовых каталогах типа MH"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr "Стандартный файл Unix mailbox"
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr "Для хранения локальной почты в почтовых каталогах формата mbox"
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr "Почтовые файлы в формате почтовых каталогов qmail"
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr "Для хранения локальной почты в почтовых каталогах типа qmail"
 
+#: camel/providers/local/camel-local-provider.c:70
+#, fuzzy
+msgid "Unix mbox spool-format mail files"
+msgstr "Почтовые файлы в формате почтовых каталогов qmail"
+
+#: camel/providers/local/camel-local-provider.c:71
+#, fuzzy
+msgid "For storing local mail in standard Unix spool directories"
+msgstr "Для хранения локальной почты в почтовых каталогах типа qmail"
+
 #: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -3979,24 +4773,24 @@ msgstr "Не удалось удалить итоговый файл папки \"%s\": %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Не удалось удалить индексный файл папки \"%s\": %s"
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Не удалось добавить сообщение к итогу: причина неизвестна"
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-maildir-folder.c:176
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Невозможно добавить сообщение к папке почтового каталога: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4005,18 +4799,19 @@ msgstr ""
 "Невозможно получить сообщение: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "Нет такого сообщения"
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr "Неправильное содержимое сообщения"
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4026,14 +4821,14 @@ msgstr ""
 "Невозможно открыть папку \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Папка \"%s\" не существует."
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4043,13 +4838,13 @@ msgstr ""
 "Не удалось создать папку \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "\"%s\" не является почтовым каталогом."
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
@@ -4057,10 +4852,17 @@ msgstr ""
 "Невозможно удалить папку \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "не является почтовым каталог"
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"Не удалось создать папку \"%s\":\n"
+"%s"
+
 #: camel/providers/local/camel-maildir-summary.c:405
 #: camel/providers/local/camel-maildir-summary.c:526
 #, fuzzy, c-format
@@ -4068,11 +4870,13 @@ msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Не удалось открыть почтовый ящик: %s: %s\n"
 
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Не удалось получить папку: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Не удалось открыть почтовый ящик: %s: %s\n"
@@ -4082,9 +4886,12 @@ msgstr "Не удалось открыть почтовый ящик: %s: %s\n"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Невозможно присоединить сообщение к файлу mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4093,11 +4900,13 @@ msgstr ""
 "Невозможно получить сообщение: %s из папки %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Видимо папка невостановимо испорчена."
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Сбой в конструкции сообщения: почтовый ящик поврежден?"
 
@@ -4143,36 +4952,45 @@ msgstr "Папка \"%s\" не пуста. Не удалена."
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
 #: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "Суммаризация папки"
 
 #: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "Не удалось открыть папку: %s: итог с позиции %ld: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Фатальная ошибка почтового анализатора возле позиции %ld в папке %s"
 
 #: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Не удалось суммировать папку: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1397
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Синхронизация папки"
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Не удалось открыть папку для суммаризации: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Не удалось открыть временный почтовый ящик: %s"
@@ -4181,21 +4999,28 @@ msgstr "Не удалось открыть временный почтовый ящик: %s"
 #: camel/providers/local/camel-mbox-summary.c:557
 #: camel/providers/local/camel-mbox-summary.c:746
 #: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Несовпадение папки и итога, даже после синхронизации"
 
 #: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Ошибка записи во временный почтовый ящик: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Сбой записи во временный почтовый ящик: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:635
 #: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Невозможно закрыть исходную папку %s: %s"
@@ -4210,13 +5035,14 @@ msgstr "Невозможно закрыть временную папку: %s"
 msgid "Could not rename folder: %s"
 msgstr "Не удалось переименовать папку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Неизвестная ошибка: %s"
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Невозможно добавить сообщение к папке mh: %s: %s"
@@ -4231,39 +5057,92 @@ msgstr "\"%s\" не является каталогом."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Не удалось открыть почтовый ящик: %s: %s\n"
 
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "Невозможно присоединить сообщение к файлу mbox: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "%s не является обычным файлом."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "Папка \"%s\" не существует."
+
+#: camel/providers/local/camel-spool-store.c:176
+msgid "Spool stores do not have an inbox"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Локальный почтовый файл %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "Невозможно открыть временный почтовый файл %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "Невозможно закрыть исходную папку %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Пожалуйста, введите пароль NNTP для %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "Сервер отбросил имя пользователя"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "Сбой при отправке имени пользователя на сервер"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "Сервер отбросил имя пользователя/пароль"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "Сообщение %s не найдено."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "Не удалось получить с сервера список групп."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Не удалось загрузить файл списка групп для %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Не удалось сохранить файл списка групп для %s: %s"
@@ -4277,17 +5156,17 @@ msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "Это провайдер для чтения и отправки сообщений в группы новостей USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Невозможно открыть каталог для сервера новостей: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "Новости USENET через %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4295,8 +5174,8 @@ msgstr ""
 "Подключение к NNTP серверу будет производиться с использованием "
 "незашифрованного пароля."
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Не удалось открыть или создать файл .newsrc для %s: %s"
@@ -4347,7 +5226,7 @@ msgstr "Сохранять сообщения на сервере"
 msgid "Delete after %s day(s)"
 msgstr "Удалять через %s дней"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4443,7 +5322,7 @@ msgid "No such folder `%s'."
 msgstr "Нет такой папки \"%s\""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4496,7 +5375,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Доставка почты через программу sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4506,123 +5385,123 @@ msgstr ""
 "Для доставки почты с помощью подключения к удаленному почтовому узлу по "
 "протоколу SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:168
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "Синтаксическая ошибка, команда не распознана"
 
-#: camel/providers/smtp/camel-smtp-transport.c:170
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "Синтаксическая ошибка в параметрах или аргументах"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Команда не реализована"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "Параметр команды не реализован"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr "Состояние системы или ответ справки системы"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "Справочное сообщение"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Сервис готов"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr "Сервис закрывает канал передачи"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr "Сервис не доступен, закрытие канала передачи"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr "Запрошенное почтовое действие выполнено"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr "Не локальный пользователь; будет отправлено к <путь-отправки>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Запрошенное действие с почтой не выполнено: почтовый ящик не доступен"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Запрошенное действие не выполнено: почтовый ящик не доступен"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr "Запрошенное действие отменено: ошибка при обработке"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr "Пользователь не локальный; пожалуйста попробуйте <путь-пересылки>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Запрошенное действие не выполнено: недостаточно системного хранилища"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 "Запрошенное действие не выполнено: название почтового ящика недопустимо"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Начало ввода почты; окончание после <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "Сбой транзакции"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr "Необходима передача пароля"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "Слишком слабый механизм идентификации"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Для запрошенного механизма идентификации требуется шифрование"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "Временный сбой идентификации"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "Идентификация требуется"
 
-#: camel/providers/smtp/camel-smtp-transport.c:313
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:356
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "SMTP сервер %s не поддерживает затребованный тип идентификации %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:395
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sПожалуйста, введите пароль SMTP для %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:418
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4633,316 +5512,236 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:534
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP сервер %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:536
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Доставка SMTP почты через %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr "Невозможно отправить сообщение: не определен адрес отправителя."
 
-#: camel/providers/smtp/camel-smtp-transport.c:568
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr "Невозможно отправить сообщение: неправильный адрес отправителя."
 
-#: camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "Отправка сообщения"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "Невозможно отправить сообщение: не определены получатели."
 
-#: camel/providers/smtp/camel-smtp-transport.c:676
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Превышено время ожидания ответа на HELO: %s: не фатально"
 
-#: camel/providers/smtp/camel-smtp-transport.c:695
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Ошибка ответа HELO: %s: не фатально"
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:743
-#: camel/providers/smtp/camel-smtp-transport.c:755
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Идентификация"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Превышено время ожидания ответа на запрос AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:805
+#: camel/providers/smtp/camel-smtp-transport.c:782
+#, fuzzy
+msgid "AUTH request failed."
+msgstr "Превышено время ожидания ответа на запрос AUTH: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr "Отрицательный ответ идентификации от сервера.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:831
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Превышено время ожидания ответа на MAIL FROM: %s: почта не отправлена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:850
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Ошибка ответа MAIL FROM: %s: почта не отправлена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:875
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Превышено время ожидания ответа на RCPT TO: %s: почта не отправлена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Ошибка ответа RCPT TO: %s: почта не отправлена."
 
-#: camel/providers/smtp/camel-smtp-transport.c:925
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Превышено время ожидания ответа на DATA: %s: почта не отправлена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:944
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Ошибка ответа DATA: %s: почта не отправлена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:959
-#: camel/providers/smtp/camel-smtp-transport.c:977
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Превышено время отправки DATA: сообщение прервано: %s: почта не отправлена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:996
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Ошибка ответа DATA: сообщение прервано: %s: почта не отправлена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1020
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Превышено время ожидания ответа на RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Ошибка ответа RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1062
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Превышено время ожидания ответа на QUIT: %s: не фатально"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Ошибка ответа QUIT: %s: не фатально"
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 байт"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u байт"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fК"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "вложение"
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Присоединить файл"
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "Удалить выбранные элементы из списка вложений"
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Добавить вложение..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "Присоединить файл к сообщению"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1086
-msgid "Attachment"
-msgstr "Вложение"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "Свойства вложения"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Имя файла:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-msgid "Inline attachment"
-msgstr "Встроенное вложение"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "Тип MIME:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-msgid "Send as:"
-msgstr "Отправить как:"
-
-#: composer/e-msg-composer.c:529
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"Невозможно открыть файл подписи %s:\n"
-"%s"
-
-#: composer/e-msg-composer.c:702
-msgid "Save as..."
-msgstr "Сохранить как..."
-
-#: composer/e-msg-composer.c:713
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Ошибка сохранения файла: %s"
-
-#: composer/e-msg-composer.c:733
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Ошибка при загрузке файла: %s"
-
-#: composer/e-msg-composer.c:805
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"Не удалось открыть папку черновиков для этого счёта.\n"
-"Хотите использовать папку черновиков по умолчанию?"
-
-#: composer/e-msg-composer.c:863 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:869
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Это сообщение не было отправлено.\n"
-"\n"
-"Вы хотите сохранить изменения?"
-
-#: composer/e-msg-composer.c:894
-msgid "Open file"
-msgstr "Открыть файл"
-
-#: composer/e-msg-composer.c:1020
-msgid "That file does not exist."
-msgstr "Этот файл не существует."
-
-#: composer/e-msg-composer.c:1030
-msgid "That is not a regular file."
-msgstr "Это не обычный файл."
-
-#: composer/e-msg-composer.c:1040
-msgid "That file exists but is not readable."
-msgstr "Этот файл существует, но не читается."
-
-#: composer/e-msg-composer.c:1050
-msgid "That file appeared accesible but open(2) failed."
-msgstr "Файл выглядит доступным, но произошел сбой open(2)."
-
-#: composer/e-msg-composer.c:1072
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
 msgstr ""
-"Файл очень большой (больше 100К).\n"
-"Вы уверены, что хотите вставить его?"
-
-#: composer/e-msg-composer.c:1093
-msgid "An error occurred while reading the file."
-msgstr "При чтении файла возникла ошибка."
-
-#: composer/e-msg-composer.c:1394 composer/e-msg-composer.c:1737
-msgid "Compose a message"
-msgstr "Создать сообщение"
 
-#: composer/e-msg-composer.c:1828
-msgid "Could not create composer window."
-msgstr "Невозможно создать окно редактора."
-
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "Щелкните здесь для адресной книги"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:354 mail/mail-format.c:744
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "От:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:360 mail/mail-format.c:746
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "Ответить:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:371 mail/mail-format.c:643
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Тема:"
 
-#: composer/e-msg-composer-hdrs.c:385 mail/mail-format.c:748
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "Кому:"
 
-#: composer/e-msg-composer-hdrs.c:386
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "Введите получателей сообщения"
 
-#: composer/e-msg-composer-hdrs.c:389 mail/mail-format.c:750
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Копия:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Введите адресатов, которые получат копию сообщения"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Скр.копия:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4950,7 +5749,137 @@ msgstr ""
 "Введите адресатов, которые получат копию сообщения не попав в список "
 "получателей."
 
-#: composer/evolution-composer.c:355
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Присоединить файл"
+
+#: composer/e-msg-composer.c:670
+#, fuzzy, c-format
+msgid ""
+"Could not open file %s:\n"
+"%s"
+msgstr ""
+"Невозможно открыть файл \"%s\":\n"
+"%s"
+
+#: composer/e-msg-composer.c:683
+#, fuzzy, c-format
+msgid ""
+"Error while reading file %s:\n"
+"%s"
+msgstr "Ошибка при загрузке файла: %s"
+
+#: composer/e-msg-composer.c:873
+msgid "Save as..."
+msgstr "Сохранить как..."
+
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "Предупреждение"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
+#, c-format
+msgid "Error saving file: %s"
+msgstr "Ошибка сохранения файла: %s"
+
+#: composer/e-msg-composer.c:926
+#, c-format
+msgid "Error loading file: %s"
+msgstr "Ошибка при загрузке файла: %s"
+
+#: composer/e-msg-composer.c:997
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"Не удалось открыть папку черновиков для этого счёта.\n"
+"Хотите использовать папку черновиков по умолчанию?"
+
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Ошибка сохранения файла: %s"
+
+#: composer/e-msg-composer.c:1055
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "Не удалось получить сообщение с POP сервера %s: %s"
+
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"Не удалось создать файл вывода: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"Не удалось создать файл вывода: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"Ошибка сохранения сообщений в: %s:\n"
+" %s"
+
+#: composer/e-msg-composer.c:1173
+#, fuzzy
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+"Evolution нашла почтовые файлы Pine.\n"
+"Хотите импортировать их в Evolution?"
+
+#: composer/e-msg-composer.c:1321
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Это сообщение не было отправлено.\n"
+"\n"
+"Вы хотите сохранить изменения?"
+
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
+msgid "Open file"
+msgstr "Открыть файл"
+
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "Вставить текстовый файл..."
+
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+msgid "Compose a message"
+msgstr "Создать сообщение"
+
+#: composer/e-msg-composer.c:2351
+msgid "Could not create composer window."
+msgstr "Невозможно создать окно редактора."
+
+#: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -4958,7 +5887,7 @@ msgstr ""
 "Не удалось создать окно редактора, потому что вы еще не настройли\n"
 "ни одной личности в почтовом компоненте."
 
-#: composer/evolution-composer.c:370
+#: composer/evolution-composer.c:374
 msgid "Cannot initialize Evolution's composer."
 msgstr "Невозможно инициализировать редактор почты Evolution."
 
@@ -4975,36 +5904,56 @@ msgid "calendar information"
 msgstr "информация календаря"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%m/%d/%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %m/%d/%Y"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -5012,264 +5961,65 @@ msgstr "%a %m/%d/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
-
-#: executive-summary/component/component-factory.c:152
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
-"Невозможно инициализировать компонент Executive Summary программы Evolution."
-
-#: executive-summary/component/e-summary.c:926
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Невозможно открыть HTML файл:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:940
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Ошибка при чтении данных:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:958
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:126
-msgid "Select a service"
-msgstr "Выбрать сервис"
-
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "Открыть %s с помощью подходящего приложения GNOME"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Открыть %s с помощью программы просмотра web для GNOME"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Отправить почту %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Изменить вид на %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Запустить %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Закрыть %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Переместить %s влево"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Переместить %s вправо"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Переместить %s в предыдущую строку"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Переместить %s в следующую строку"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "Настроить %s"
-
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
-msgstr "Внешний вид"
-
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
-msgstr "Фон:"
-
-#: executive-summary/component/main.c:62
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Компонент Evolution для Executive Summary."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Фабрика для компонента Executive Summary программы Evolution."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "Фабрика для итога RDF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "Итог RDF"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "Фабрика для тестового компонента."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Проверить сервис bonobo"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Проверить сервис"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "Ошибка"
-
-#: executive-summary/test-service/rdf-summary.c:768
-msgid "Update automatically"
-msgstr "Обновлять автоматически"
-
-#: executive-summary/test-service/rdf-summary.c:778
-msgid "Update now"
-msgstr "Обновить сейчас"
-
-#: executive-summary/test-service/rdf-summary.c:788
-msgid "Update every "
-msgstr "Обновлять каждые "
-
-#: executive-summary/test-service/rdf-summary.c:796
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "минуты"
-
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "год"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "годы"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "месяц"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "месяцы"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "неделя"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "недели"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "дни"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "час"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "часы"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "минута"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "секунда"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "секунды"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Оп-ля! Вы забыли выбрать дату."
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Оп-ля! Вы выбрали неправильную дату."
 
-#: filter/filter-datespec.c:276
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -5279,7 +6029,7 @@ msgstr ""
 "со временем запуска фильтра, либо \n"
 "открытия вирт.папки."
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5287,7 +6037,7 @@ msgstr ""
 "Дата сообщения будет сравниваться с датой,\n"
 "которую вы указали здесь."
 
-#: filter/filter-datespec.c:339
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5298,28 +6048,36 @@ msgstr ""
 "например \"неделю назад\"."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "текущее время"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "указанное вами время"
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "время относительно текущего"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Сравнивать с"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "сейчас"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<щелкните здесь для выбора даты>"
 
@@ -5344,8 +6102,8 @@ msgstr ""
 "Оп-ля... Вы забыли выбрать папку.\n"
 "Пожалуйста, вернитесь и укажите правильную папку для доставки почты."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Выбрать папку"
 
@@ -5357,46 +6115,6 @@ msgstr "Ввести URI папки"
 msgid "<click here to select a folder>"
 msgstr "<щелкните здесь для выбора папки>"
 
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Правка фильтров"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "Правка вирт.папок"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Входящие"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Исходящие"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr "Виртуальные папки"
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr "только указанные папки"
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr "Источники вирт.папки"
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr "со всеми активными удалёнными папками"
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr "со всеми локальными и активными удалёнными папками"
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr "со всеми локальными папками"
-
 #: filter/filter-input.c:193
 #, c-format
 msgid ""
@@ -5418,36 +6136,88 @@ msgstr "Название фильтра: "
 msgid "Untitled"
 msgstr "Неозаглавленное"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "Если"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Выполнить действия"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "если удовлетворяет всем критериям"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "если удовлетворяет любому из критериев"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "Добавить критерий"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "входящие"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "исходящие"
 
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Добавить"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Правка"
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Правка фильтров"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "Правка вирт.папок"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "Входящие"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "Исходящие"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr "Виртуальные папки"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr "только указанные папки"
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "Источники вирт.папки"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "со всеми активными удалёнными папками"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "со всеми локальными и активными удалёнными папками"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "со всеми локальными папками"
+
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
+#, fuzzy
+msgid "Assign Color"
 msgstr "Связать цвет"
 
 #: filter/libfilter-i18n.h:4
@@ -5523,90 +6293,91 @@ msgid "Expression"
 msgstr "Выражение"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "Переслать по адресу"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "Важное"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "является"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "больше чем"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "меньше чем"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "не является"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Список рассылки"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Тело сообщения"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Заголовок сообщения"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Сообщение было получено"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Сообщение было отправлено"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Переместить в папку"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr "на или после"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr "на или до"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Прочитанное"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Получатели"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Совпадение рег.выражения"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Ответить"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.c:1086
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Подсчет"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Отправитель"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Установить состояние"
 
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Размер"
+
 #: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "звучит как"
@@ -5627,7 +6398,8 @@ msgstr "начинается с"
 msgid "Stop Processing"
 msgstr "Остановить обработку"
 
-#: filter/libfilter-i18n.h:51 mail/message-list.c:1087
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Тема"
 
@@ -5655,188 +6427,275 @@ msgstr "Правка правила"
 msgid "Score Rules"
 msgstr "Правила подсчета"
 
-#: mail/component-factory.c:329
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
+msgstr "Импортировать"
+
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "Mail"
+msgstr "Эл.адрес"
+
+#: importers/elm-importer.c:498
+#, fuzzy
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution нашла почтовые файлы Elm.\n"
+"Хотите импортировать их в Evolution?"
+
+#: importers/elm-importer.c:527
+msgid "Elm mail"
+msgstr "Почта Elm"
+
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "Добавить адресную книгу"
+
+#: importers/evolution-gnomecard-importer.c:253
+#, fuzzy
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution нашла почтовые файлы Netscape.\n"
+"Хотите импортировать их в Evolution?"
+
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "Установки..."
+
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution нашла почтовые файлы Netscape.\n"
+"Хотите импортировать их в Evolution?"
+
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution нашла почтовые файлы Pine.\n"
+"Хотите импортировать их в Evolution?"
+
+#: importers/pine-importer.c:691
+msgid "Pine mail"
+msgstr "Почта Pine"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "Компонент Evolution для обработки почты."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr "Компонент редактора писем Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr "Компонент Executive Summary программы Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr "Компонент отображения почтовой папки Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr "Фабрика для редактора почты Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr "Фабрика для почтового компонента Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "Настройка почты"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "Свойства..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Изменить свойства файла"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Невозможно инициализировать почтовый компонент \"Эволюции\"."
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr "Не удалось зарегистрировать хранилище с помощью оболочки"
 
-#: mail/folder-browser.c:268
+#: mail/folder-browser-ui.c:254
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Свойства для \"%s\""
+
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr "Свойства"
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Не удалось создать временный каталог: %s"
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "Сохранить результаты поиска в виртуальной папке"
 
-#: mail/folder-browser.c:576 ui/evolution-mail.xml.h:91
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr "Вирт.папка по теме"
 
-#: mail/folder-browser.c:579 ui/evolution-mail.xml.h:89
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "Вирт.папка по отправителю"
 
-#: mail/folder-browser.c:582 ui/evolution-mail.xml.h:90
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "Вирт.папка по получателю"
 
-#: mail/folder-browser.c:585 ui/evolution-mail.xml.h:88
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr "Вирт.папка по списку рассылки"
 
-#: mail/folder-browser.c:591
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "Фильтр по теме"
 
-#: mail/folder-browser.c:594
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "Фильтр по отправителю"
 
-#: mail/folder-browser.c:597
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "Фильтр по получателям"
 
-#: mail/folder-browser.c:600
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "Фильтр по списку рассылки"
 
-#: mail/folder-browser.c:609
-msgid "_Open"
-msgstr "Открыть"
-
-#: mail/folder-browser.c:611
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Перепослать"
 
-#: mail/folder-browser.c:613 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:113 ui/evolution-tasks.xml.h:8
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Сохранить как..."
 
-#: mail/folder-browser.c:615 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "Печать"
 
-#: mail/folder-browser.c:620
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "Ответить отправителю"
 
-#: mail/folder-browser.c:622 ui/evolution-mail.xml.h:66
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "Ответить всем"
+
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "Ответить всем"
 
-#: mail/folder-browser.c:624 ui/evolution-mail.xml.h:102
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "Переслать"
 
-#: mail/folder-browser.c:626
-msgid "Forward _inline"
-msgstr "Переслать встроенное"
-
-#: mail/folder-browser.c:629 ui/evolution-mail.xml.h:40
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Пометить как прочитанное"
 
-#: mail/folder-browser.c:631 ui/evolution-mail.xml.h:44
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Пометить как непрочтенное"
 
-#: mail/folder-browser.c:636 ui/evolution-mail.xml.h:107
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "Важное"
+
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Пометить как непрочтенное"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "Переместить в папку..."
 
-#: mail/folder-browser.c:638 ui/evolution-mail.xml.h:96
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "Скопировать в папку..."
 
-#: mail/folder-browser.c:642 ui/evolution-mail.xml.h:118
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "Восстановить"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:652 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Добавить адресную книгу"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Применить фильтры"
 
-#: mail/folder-browser.c:656
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "Создать правило из сообщения"
 
-#: mail/folder-browser.c:795
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "Фильтр по списку рассылки"
 
-#: mail/folder-browser.c:796
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "Вирт.папка по списку рассылки"
 
-#: mail/folder-browser.c:798
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Фильтр по списку рассылки (%s)"
 
-#: mail/folder-browser.c:799
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Вирт.папка по списку рассылки (%s)"
 
-#: mail/folder-browser-factory.c:213
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Свойства для \"%s\""
-
-#: mail/folder-browser-factory.c:215 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Свойства"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "Компонент Evolution для обработки почты."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Компонент редактора писем Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Компонент Executive Summary программы Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Компонент отображения почтовой папки Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Фабрика для редактора почты Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Фабрика для почтового компонента Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr ""
-
-#: mail/importers/elm-importer.c:420
-msgid ""
-"Evolution has found Elm mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution нашла почтовые файлы Elm.\n"
-"Хотите импортировать их в Evolution?"
-
-#: mail/importers/elm-importer.c:430
-msgid "Elm mail"
-msgstr "Почта Elm"
-
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr "Фабрика для импорта файлов mbox в Evolution"
@@ -5853,26 +6712,6 @@ msgstr "Фабрика для импорта файлов Outlook Express 4 в Evolution"
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Импортирует файлы Outlook Express 4 в Evolution"
 
-#: mail/importers/netscape-importer.c:440
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Evolution нашла почтовые файлы Netscape.\n"
-"Хотите импортировать их в Evolution?"
-
-#: mail/importers/pine-importer.c:385
-msgid ""
-"Evolution has found Pine mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"Evolution нашла почтовые файлы Pine.\n"
-"Хотите импортировать их в Evolution?"
-
-#: mail/importers/pine-importer.c:395
-msgid "Pine mail"
-msgstr "Почта Pine"
-
 #: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Текущий формат хранения:"
@@ -5907,37 +6746,69 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
 msgid "You have not filled in all of the required information."
 msgstr "Вы не ввели всю необходимую информацию."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Редактор счетов Evolution"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Редактор счетов Evolution"
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "Файл подписи:"
+
+#: mail/mail-account-gui.c:977
+#, fuzzy
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Это сообщение не было отправлено.\n"
+"\n"
+"Вы хотите сохранить изменения?"
+
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr "(Исх.значения)"
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "Отключить"
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "Включить"
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "Вы уверены что хотите удалить этот счет?"
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Восстановить"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "Сделать моим счетом по умолчанию"
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr "Вы уверены что хотите удалить этот новый счет?"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:536
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Диспетчер счетов Evolution"
 
@@ -6005,37 +6876,45 @@ msgstr ""
 "Это сообщение не имеет темы.\n"
 "Послать его?"
 
-#: mail/mail-callbacks.c:311
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr "Вы должны указать получателей, чтобы отправить это сообщение."
 
-#: mail/mail-callbacks.c:354
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr "Вы должны настроить счет до того как вы сможете послать почту."
 
-#: mail/mail-callbacks.c:593
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "%s, %s написал:"
 
-#: mail/mail-callbacks.c:774
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Пересланное сообщение:\n"
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "Переместить сообщение в"
 
-#: mail/mail-callbacks.c:879
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Скопировать сообщения в"
 
-#: mail/mail-callbacks.c:1156
+#: mail/mail-callbacks.c:1374
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Вы уверены что вы хотите править все %d сообщений?"
 
-#: mail/mail-callbacks.c:1170
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6043,7 +6922,7 @@ msgstr ""
 "Вы можете править только сообщения\n"
 "сохраненные в папке \"Черновики\"."
 
-#: mail/mail-callbacks.c:1202
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6051,31 +6930,24 @@ msgstr ""
 "Вы можете только перепослать сообщения\n"
 "из папки \"Отправленные\"."
 
-#: mail/mail-callbacks.c:1224
+#: mail/mail-callbacks.c:1442
+#, fuzzy, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "Вы уверены что вы хотите править все %d сообщений?"
+
+#: mail/mail-callbacks.c:1463
 msgid "No Message Selected"
 msgstr "Сообщение не выбрано"
 
-#: mail/mail-callbacks.c:1250 mail/mail-display.c:90
-msgid "Overwrite file?"
-msgstr "Переписать файл?"
-
-#: mail/mail-callbacks.c:1254 mail/mail-display.c:94
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Файл с таким названием уже существует.\n"
-"Переписать его?"
-
-#: mail/mail-callbacks.c:1298
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Сохранить сообщение как..."
 
-#: mail/mail-callbacks.c:1300
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Сохранить сообщения как..."
 
-#: mail/mail-callbacks.c:1435
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6084,23 +6956,24 @@ msgstr ""
 "Ошибка при загрузке информации фильтра:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1484 ui/evolution-mail.xml.h:56
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "Фильтры..."
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Печать сообщения"
 
-#: mail/mail-callbacks.c:1531
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "Сбой печати сообщения"
 
-#: mail/mail-callbacks.c:1609
+#: mail/mail-callbacks.c:1966
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Вы уверены что хотите открыть все %d сообщений в отдельных окнах?"
 
-#: mail/mail-config.c:1121 mail/mail-config.c:1124
-msgid "Connecting to server..."
-msgstr "Подключение к серверу..."
-
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -6146,10 +7019,14 @@ msgstr ""
 "отображения."
 
 #. set window title
-#: mail/mail-config-druid.c:445
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr "Помощник по счетам Evolution"
 
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
+msgstr "Подключение к серверу..."
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr " Проверка поддерживаемых типов "
@@ -6159,34 +7036,64 @@ msgid " color"
 msgstr " цвет"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Подписывание не поддерживается этим шифром"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Счет"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Информация о счете"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "Управление счетами"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Счета"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Вложение"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Идентификация"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Тип идентификации: "
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "Автоматически проверять почту каждые"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "Создать"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6202,163 +7109,279 @@ msgstr ""
 "\n"
 "Нажмите \"Завершить\", чтобы сохранить ваши настройки."
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "Исх.значения"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Сделано"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Черновики"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Папка черновиков:"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "Правка..."
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "Эл.адрес:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "Включить"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Полное имя:"
 
-#: mail/mail-config.glade.h:27
-msgid "Highlight citations with "
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
+msgstr ""
+
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "Файл подписи:"
+
+#: mail/mail-config.glade.h:43
+#, fuzzy
+msgid "Highlight citations with"
 msgstr "Подсвечивать цитаты "
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Именование"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Inline"
+msgstr "Встроенное"
+
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "Настройка почты"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Формат почтового ящика"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "Сделать моим счетом по умолчанию"
 
-#: mail/mail-config.glade.h:34
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "Помечать сообщения как \"Прочитанные\" после:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "Сервер LDAP"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "Новые"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "Дополнительная информация"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Организация:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "Путь к программе PGP:"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "Выбрать цвет"
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "Невозможно отправить сообщение: не определены получатели."
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr "Почтовый каталог Qmail "
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "Процитированное"
+
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "Получение эл.почты"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "Получение эл.почты"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "Получение параметров"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "Необходимая информация"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
+
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Security"
+msgstr "Безопасность"
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "Выбрать программу PGP"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "По умолчанию отправлять почту в формате HTML."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "Отправка эл.почты"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "Отправка эл.почты"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "Отправленное"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr "Отправленные сообщения и черновики"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "Папка отправленных сообщений:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Настройка сервера"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Тип сервера:"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Сервер требует идентификации"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Файл подписи:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "Источники"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Нет информации"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Источники"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "Специальные папки"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr "Стандартный файл Unix mbox"
 
-#: mail/mail-config.glade.h:68
-msgid "Type"
-msgstr "Тип"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "Использовать защищенное подключение (SSL)"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Имя пользователя:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6368,173 +7391,266 @@ msgstr ""
 "\n"
 "Нажмите \"След.\" для начала."
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:32
-msgid "_Edit"
-msgstr "Правка"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
+msgstr ""
+
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
+msgstr ""
+
+#: mail/mail-config.glade.h:114
+msgid "seconds."
+msgstr "секунд."
+
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "Не удалось подключиться к POP серверу на %s."
+
+#: mail/mail-crypto.c:86
+#, fuzzy
+msgid "Could not create a PGP verification context."
+msgstr "Не удалось подключиться к POP серверу на %s."
+
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr "Невозможно создать окно редактора."
+
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
+msgstr ""
+"Невозможно создать каталог %s:\n"
+"%s"
+
+#: mail/mail-crypto.c:177
+msgid "Could not create a S/MIME signature context."
+msgstr ""
+
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
+msgstr ""
 
-#: mail/mail-display.c:194
+#: mail/mail-crypto.c:240
+msgid "Could not create a S/MIME encryption context."
+msgstr ""
+
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "Невозможно создать окно редактора."
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr "Невозможно создать окно редактора."
+
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Сохранить вложение"
 
-#: mail/mail-display.c:234
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Не удалось создать временный каталог: %s"
-
-#: mail/mail-display.c:295
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Сохранить на диске..."
 
-#: mail/mail-display.c:297
-#, c-format
-msgid "Open in %s..."
-msgstr "Открыть в %s..."
-
-#: mail/mail-display.c:299
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "Встроенный просмотр"
 
-#: mail/mail-display.c:334
-msgid "External Viewer"
-msgstr "Внешняя программа просмотра"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "Открыть в %s..."
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Встроенный просмотр (через %s)"
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Скрыть"
 
-#: mail/mail-display.c:1107
-msgid "Open link in browser"
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "Внешняя программа просмотра"
+
+#: mail/mail-display.c:1048
+msgid "Loading message content"
+msgstr "Загрузка содержимого сообщения"
+
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
 msgstr "Открыть ссылку в браузере"
 
-#: mail/mail-display.c:1109
-msgid "Save as (FIXME)"
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "Скопировать положение (FIXME)"
+
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
 msgstr "Сохранить как (FIXME)"
 
-#: mail/mail-display.c:1111
-msgid "Copy location (FIXME)"
-msgstr "Скопировать положение (FIXME)"
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "Сохранить как..."
+
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
 
-#: mail/mail-format.c:522
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr " %d секунд"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s вложение"
 
-#: mail/mail-format.c:564
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Не удалось разобрать сообщение MIME. Отображается как есть."
 
-#: mail/mail-format.c:771
-msgid "Loading message content"
-msgstr "Загрузка содержимого сообщения"
+#: mail/mail-format.c:746
+msgid "Date"
+msgstr "Дата"
+
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "Эл.адрес:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr "От"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "Ответить:"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "Кому"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Копия:"
 
-#: mail/mail-format.c:1080
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "Программа GPG/PGP не настроена."
 
-#: mail/mail-format.c:1095
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "Зашифрованное сообщение не отображается"
 
-#: mail/mail-format.c:1101
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Зашифрованное сообщение"
 
-#: mail/mail-format.c:1102
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Щелкните на пиктограмме для дешифрации."
 
-#: mail/mail-format.c:1192 mail/mail-format.c:1580
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 "Это сообщение с цифровой подписью, которая прошла проверку идентичности."
 
-#: mail/mail-format.c:1200 mail/mail-format.c:1588
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Это сообщение с цифровой подписью, которая не может быть проверена на "
 "идентичность."
 
-#: mail/mail-format.c:1801
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Указатель на FTP сайт (%s)"
 
-#: mail/mail-format.c:1813
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1817
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Указатель на локальный файл (%s)"
 
-#: mail/mail-format.c:1851
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Указатель на FTP сайт (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Указатель на неизвестные внешние данные (типа \"%s\")"
 
-#: mail/mail-format.c:1856
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:509
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "Открытие \"%s\""
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Изменение папки \"%s\" в формат \"%s\""
 
-#: mail/mail-local.c:791
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Изменить папку \"%s\" в формат \"%s\""
-
-#: mail/mail-local.c:814
-msgid "Reconfiguring folder"
-msgstr "Перенастройка папки"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:843
-msgid "Closing current folder"
-msgstr "Закрытие текущей папки"
-
-#: mail/mail-local.c:875
-msgid "Renaming old folder and opening"
-msgstr "Переименование старой папки и открытие"
-
-#: mail/mail-local.c:893
-msgid "Creating new folder"
-msgstr "Создание новой папки"
-
-#: mail/mail-local.c:907
-msgid "Copying messages"
-msgstr "Копирование сообщений"
-
-#: mail/mail-local.c:924
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:963
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "Вы не можете скопировать сообщения из этой папки для мусора."
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "Настроить %s"
+
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6543,7 +7659,7 @@ msgstr ""
 "Ошибка при \"%s\":\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6552,101 +7668,105 @@ msgstr ""
 "Ошибка при выполнении операции:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:880
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Обработка"
 
-#: mail/mail-mt.c:862
-msgid "Evolution progress"
-msgstr "Продвижение Evolution"
-
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Отправка \"%s\""
 
-#: mail/mail-ops.c:603
-msgid "Sending message"
-msgstr "Отправка сообщения"
-
-#: mail/mail-ops.c:718
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Отправка сообщения %d из %d"
 
-#: mail/mail-ops.c:737
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Сбой на сообщении %d из %d"
 
-#: mail/mail-ops.c:739 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "Выполнено."
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Сохранение сообщения в папке"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Перемещение сообщений в %s"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копирование сообщений в %s"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Перемещение"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Копирование"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Считывание папок в \"%s\""
 
-#: mail/mail-ops.c:1154
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "Мусорная корзина"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "Пересланные сообщения"
 
-#: mail/mail-ops.c:1195 mail/mail-ops.c:1333
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "Открытие папки \"%s\""
 
-#: mail/mail-ops.c:1262
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr "Открытие хранилища %s"
 
-#: mail/mail-ops.c:1449
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "Открытие папки \"%s\""
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "Перенастройка папки"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "Вычеркивание папки"
 
-#: mail/mail-ops.c:1498
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Получение сообщения %s"
 
-#: mail/mail-ops.c:1565
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Получение сообщений"
 
-#: mail/mail-ops.c:1575
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Перемещение сообщения номер %d из %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1649
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Сохранение сообщений"
 
-#: mail/mail-ops.c:1728
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6655,12 +7775,7 @@ msgstr ""
 "Не удалось создать файл вывода: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1741
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Сохранение сообщения %d из %d (uid  \"%s\")"
-
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6669,11 +7784,11 @@ msgstr ""
 "Ошибка сохранения сообщений в: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "Сохранение вложения"
 
-#: mail/mail-ops.c:1844
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6682,254 +7797,191 @@ msgstr ""
 "Не удалось создать файл вывода: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1872
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Невозможно записать данные: %s"
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "Поиск"
-
-#: mail/mail-search.c:167
+#: mail/mail-ops.c:2101
 #, c-format
-msgid "Search \"%s\""
-msgstr "Поиск \"%s\""
+msgid "Disconnecting from %s"
+msgstr ""
 
-#: mail/mail-search.c:169
-msgid "Search Untitled Message"
+#: mail/mail-search.c:138
+#, fuzzy
+msgid "(Untitled Message)"
 msgstr "Поиск неозаглавленного сообщения"
 
-#: mail/mail-search.c:184
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Поиск неозаглавленного сообщения"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "Правка сообщения"
+
+#: mail/mail-search.c:284
+#, fuzzy
+msgid "Find in Message"
+msgstr "Правка сообщения"
+
+#: mail/mail-search.c:314
 msgid "Case Sensitive"
 msgstr "Учитывать регистр"
 
-#: mail/mail-search.c:185
+#: mail/mail-search.c:315
 msgid "Search Forward"
 msgstr "Поиск вперёд"
 
-#: mail/mail-search.c:192
+#: mail/mail-search.c:332
 msgid "Find:"
 msgstr "Поиск:"
 
-#: mail/mail-send-recv.c:138
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "Путь:"
+
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Отмена..."
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "Получение и отправка почты"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "Получение"
 
-#: mail/mail-send-recv.c:285
+#: mail/mail-send-recv.c:302
 msgid "Updating..."
 msgstr "Обновление..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
 msgid "Waiting..."
 msgstr "Ожидание..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "Отправка"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "Отменено."
 
-#: mail/mail-summary.c:110
-msgid "Incomplete message written on pipe!"
-msgstr "Неполное сообщение записано в канал!"
-
-#: mail/mail-summary.c:468
-msgid "Mail Summary"
-msgstr "Итог почты"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
+msgstr ""
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Не удалось создать временный mbox \"%s\": %s"
 
-#: mail/mail-tools.c:188
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (пересланное сообщение)"
-
-#: mail/mail-tools.c:198
-msgid "Fwd: (no subject)"
-msgstr "Пересл.: (нет темы)"
-
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Пересланное сообщение - %s"
 
-#: mail/mail-tools.c:217
-msgid "Forwarded message (no subject)"
-msgstr "Пересланное сообщение (без темы)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Пересланные сообщения"
 
-#: mail/mail-tools.c:415
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Пересылаемое сообщение-----<br><b>От:</b> %s<br><b>Кому:</b> \"\n"
-"\"%s<br><b>Тема:</b> %s<br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Пересланные сообщения"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "Вирт.папки"
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Новая вирт.папка"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:64
-msgid "Reply"
-msgstr "Ответить"
-
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:70
-msgid "Reply to the sender of this message"
-msgstr "Ответить отправителю этого сообщения"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:65
-msgid "Reply to All"
-msgstr "Ответить всем"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:68
-msgid "Reply to all recipients of this message"
-msgstr "Ответить всем получателям этого сообщения"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:25
-msgid "Forward"
-msgstr "Переслать"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:29
-msgid "Forward this message"
-msgstr "Переслать это сообщение"
-
-#: mail/message-browser.c:200 ui/evolution-mail.xml.h:61
-msgid "Print the selected message"
-msgstr "Распечатать выделенное сообщение"
-
-#: mail/message-browser.c:203 ui/evolution-mail.xml.h:13
-msgid "Delete this message"
-msgstr "Удалить это сообщение"
-
-#: mail/message-browser.c:208 ui/evolution-event-editor.xml.h:33
-#: ui/evolution-mail.xml.h:54 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Пред."
-
-#: mail/message-browser.c:208
-msgid "Previous message"
-msgstr "Предыдущее сообщение"
-
-#: mail/message-browser.c:211 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:50
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "След."
-
-#: mail/message-browser.c:211
-msgid "Next message"
-msgstr "Следующее сообщение"
-
-#: mail/message-list.c:682
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "Непрочитанное"
 
-#: mail/message-list.c:683
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "Прочитанное"
 
-#: mail/message-list.c:684
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Отвечено"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "Множество непросмотренных сообщений"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "Множество сообщений"
 
-#: mail/message-list.c:690
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "Самый низкий"
 
-#: mail/message-list.c:691
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "Низкий"
 
-#: mail/message-list.c:695
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "Высокий"
 
-#: mail/message-list.c:696
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "Самый высокий"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:953
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "Сегодня %I:%M %p"
 
-#: mail/message-list.c:962
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "Вчера %l:%M %p"
 
-#: mail/message-list.c:974
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:982
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:984
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1086
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Сохранение сообщений"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Отмеченное"
 
-#: mail/message-list.c:1087
-msgid "From"
-msgstr "От"
-
-#: mail/message-list.c:1087
-msgid "Date"
-msgstr "Дата"
-
-#: mail/message-list.c:1087
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Получения"
 
-#: mail/message-list.c:1088
-msgid "To"
-msgstr "Кому"
-
-#: mail/message-list.c:1088
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "Размер"
 
-#: mail/mail-session.c:161
-msgid "User canceled operation."
-msgstr ""
-
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:47
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Папка"
 
@@ -6957,15 +8009,1454 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Отписывание от папки \"%s\""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "Управление подписками"
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr "Компонент Evolution для Executive Summary."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr "Фабрика для компонента Executive Summary программы Evolution."
+
+#: my-evolution/component-factory.c:140
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr ""
+"Невозможно инициализировать компонент Executive Summary программы Evolution."
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+msgid "Appointments"
+msgstr "Встречи"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "Показать встречи"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%I:%M%p"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%a %l:%M %p"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Итог почты"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "Установка Evolution"
+
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
+msgstr "При загрузке файла календаря возникла ошибка."
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Ошибка при загрузке календаря</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "Показать задания"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "Разделы:"
+
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A, %e %B %Y"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "Сбой печати сообщения"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): Не удалось инициализировать Bonobo"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "Очистить"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
+
+#: my-evolution/metar.c:63
+#, fuzzy
+msgid "Variable"
+msgstr "Отключить"
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "Заметка"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "Заметки:"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "Существует"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "Источники"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "месяц"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "Самый низкий"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Проверка"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "Самый низкий"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "Показать"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "Радио"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Drifting rain"
+msgstr "Описание содержит"
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "Повторный поиск"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "сейчас"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Moderate snow"
+msgstr "Обновить сейчас"
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+#, fuzzy
+msgid "Drifting snow grains"
+msgstr "Описание содержит"
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "Эл.адрес"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "Показать диалог"
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "Первый эл.адрес"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "Получение эл.почты"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Shallow small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Showers of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown precipitation"
+msgstr "Неизвестное состоиние идентификации."
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "Неизвестная ошибка"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "Приглашение на встречу"
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "Мисс"
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "Портрет"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Drifting mist"
+msgstr "Список рассылки"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Shallow fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "Закрыть это окно"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "Подсчет"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "Показать задания"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "Закрыть это окно"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "Отправить"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "Заголовок"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "дни"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+#, fuzzy
+msgid "Dust"
+msgstr "Август"
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Raging tornado"
+msgstr "Задания"
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+#, fuzzy
+msgid "Thunderous tornado"
+msgstr "Задания"
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "Отвечено"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Папки"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "Все сопровождение"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Показать папки начинающиеся с:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "Отобразить параметры"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "Отобразить"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "Пятница"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "Среда"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "месяц"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr " 1 неделя"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr ""
+"Вставить встречу\n"
+"в расписание"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Показать задания"
+
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "со всеми активными удалёнными папками"
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "Показать задания"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "Задания"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
+msgstr ""
+"\n"
+"Единица:  "
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Другой"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "Очистить выделение"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "Апрель"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "Оболочка Evolution."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "Детали"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "Отменить встречу"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Специальные папки"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Установка Evolution"
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6973,30 +9464,26 @@ msgstr ""
 "Этой новой версии Evolution требуется установить дополнительные файлы\n"
 "в ваш личный каталог Evolution"
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Пожалуйста нажмите \"Ок\", чтобы установить файлы или \"Отмена\" для выхода."
 
-#: shell/e-setup.c:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "Невозможно обновить файлы корректно"
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr "Файлы Evolution успешно установлены."
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Похоже вы запустили Evolution в первый раз."
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Пожалуйста нажмите \"Ок\", чтобы установить пользовательские файлы Evolution "
 "в"
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -7007,16 +9494,14 @@ msgstr ""
 "%s\n"
 "Ошибка: %s"
 
-#: shell/e-setup.c:230
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
-msgstr ""
-"Невозможно скопировать файлы в\n"
-"\"%s\"."
+msgstr "При чтении файла возникла ошибка."
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7027,7 +9512,16 @@ msgstr ""
 "Пожалуйста, переместите его, чтобы позволить\n"
 "установить файлы пользователя Evolution."
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7038,21 +9532,58 @@ msgstr ""
 "Пожалуйста, удалите его, чтобы позволить\n"
 "установить файлы пользователя Evolution."
 
-#: shell/e-shell.c:388
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "Не удалось получить папку: %s: %s"
+
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"Невозможно скопировать файлы в\n"
+"\"%s\"."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
 #, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Невозможно установить локальное хранилище -- %s"
+msgid "Specify a folder to copy folder \"%s\" into:"
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "Скопировать в папку"
 
-#: shell/e-shell.c:1273
+#: shell/e-shell-folder-commands.c:313
 #, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
-"Оп-ля! Окно для \"%s\" неожиданно умерло. :-(\n"
-"Возможно это означает, что компонент %s рухнул."
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "Переместить в папку"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "Удалять через %s дней"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "Вы уверены что вы хотите удалить задание \"%s\"?"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "Открытие папки \"%s\""
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -7061,15 +9592,15 @@ msgstr ""
 "Невозможно создать указанную папку:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "Указанное имя папки не допустимо."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Эволюция - Создать новую папку"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -7077,41 +9608,133 @@ msgstr ""
 "Тип выбранной папки не подходит для\n"
 "запрошенного действия."
 
-#: shell/e-shell-folder-selection-dialog.c:321
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Новая..."
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Без заголовка)"
 
-#: shell/e-shell-view.c:148
-msgid "(No folder displayed)"
-msgstr "(Папки не показаны)"
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"Выберите файл, который вы хотите импортировать в Evolution и выберите тип "
+"файла из списка.\n"
+"\n"
+"Вы можете выбрать \"Автоматический\" если вы не знаете и Evolution "
+"попытается опознать его."
 
-#: shell/e-shell-view.c:1203
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
 #, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+"Импортирование %s\n"
+"Импортер не готов.\n"
+"5 секунд ожидания перед повтором."
 
-#: shell/e-shell-view.c:1205
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
 #, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"Импортирование %s\n"
+"Импортирование элемента %d."
+
+#: shell/e-shell-importer.c:352
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"Нет импортера, который способен обработать\n"
+"%s"
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr "Импортирование"
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"Импортирование %s.\n"
+"Начато %s"
+
+#: shell/e-shell-importer.c:383
+#, c-format
+msgid "Error starting %s"
+msgstr "Ошибка при загрузке %s"
+
+#: shell/e-shell-importer.c:402
+#, c-format
+msgid "Error loading %s"
+msgstr "Ошибка при загрузке %s"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"Импортирование %s\n"
+"Импортирование элемента 1."
+
+#: shell/e-shell-importer.c:488
+msgid "Automatic"
+msgstr "Автоматическое"
+
+#: shell/e-shell-importer.c:538
+msgid "Filename:"
+msgstr "Имя файла:"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "Выбрать файл"
+
+#: shell/e-shell-importer.c:553
+msgid "File type:"
+msgstr "Тип файла:"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "Выбрать папку"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy не был найден в вашем $PATH."
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy не может быть запущен."
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright (C) 1999-2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -7121,31 +9744,88 @@ msgstr ""
 "ведения календарей и контактной информации для\n"
 "групповой работы в среде GNOME."
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Перейти к папке..."
 
-#: shell/e-shell-view-menu.c:562
-msgid "Work online"
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Создать новую группу закладок"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
 msgstr "Работать в сети"
 
-#: shell/e-shell-view-menu.c:574 shell/e-shell-view-menu.c:586
-msgid "Work offline"
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
 msgstr "Работать вне сети"
 
-#: shell/e-shortcuts.c:381
-msgid "Error saving shortcuts."
-msgstr "Ошибка сохранения закладок."
+#: shell/e-shell-view.c:175
+msgid "(No folder displayed)"
+msgstr "(Папки не показаны)"
+
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1411
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
+
+#: shell/e-shell-view.c:1413
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Невозможно установить локальное хранилище -- %s"
+
+#: shell/e-shell.c:1311
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"Оп-ля! Окно для \"%s\" неожиданно умерло. :-(\n"
+"Возможно это означает, что компонент %s рухнул."
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Создать новую группу закладок"
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Название группы:"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -7154,119 +9834,202 @@ msgstr ""
 "Вы действительно хотите удалить группу\n"
 "\"%s\" из панели закладок?"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "Не удалять"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "Удалить эту группу закладок"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "Удалить эту группу закладок"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "Маленькие пиктограммы"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Показать закладки как маленькие пиктограммы"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "Большие пиктограммы"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Показать закладки как большие пиктограммы"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "Новая группа..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Создать новую группу закладок"
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "Удалить эту группу..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Удалить эту группу закладок"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "Удалить эту группу..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "Удалить эту группу закладок"
+
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "Скрыть строку закладок"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Скрыть строку закладок"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "Активировать"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "Удалить эту группу закладок"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "Удалить эту группу закладок"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
-msgstr "Активировать эту закладку"
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Открыть"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr "Открыть в новом окне"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "Отправить текущее сообщение в новом окне"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "Название фильтра: "
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
+msgstr "Удалить эту группу закладок"
+
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Удалить эту закладку из строки закладок"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:585
+msgid "Error saving shortcuts."
+msgstr "Ошибка сохранения закладок."
+
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Строка закладок"
+
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "Контакты"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Без имени)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Нет ошибки"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Обычная ошибка"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "Папка с таким названием уже существует"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "Указанный тип папки не допустим"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "Ошибка ввода/вывода"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "Недостаточно места для создания папки"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "Указанная папка не найдена"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "Функция не реализована для этого носителя"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "Отказ в доступе"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "Операция не поддерживается"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "Указанный тип не поддерживается для этого носителя"
 
-#: shell/e-storage-set-view.c:650 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:46
-msgid "_View"
-msgstr "Просмотр"
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
 
-#: shell/e-storage-set-view.c:650
-msgid "View the selected folder"
-msgstr "Просмотр выбранной папки"
+#: shell/e-task-widget.c:173
+#, fuzzy
+msgid "%s (%d%% complete)"
+msgstr "% Выполнения:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "Любое поле содержит"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "Хост:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
 
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
@@ -7280,107 +10043,6 @@ msgstr "Тип папки:"
 msgid "Specify where to create the folder:"
 msgstr "Указать где создать папку:"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "Оболочка Evolution."
-
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"Выберите файл, который вы хотите импортировать в Evolution и выберите тип "
-"файла из списка.\n"
-"\n"
-"Вы можете выбрать \"Автоматический\" если вы не знаете и Evolution "
-"попытается опознать его."
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"Импортирование %s\n"
-"Импортер не готов.\n"
-"5 секунд ожидания перед повтором."
-
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"Импортирование %s\n"
-"Импортирование элемента %d."
-
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"Нет импортера, который способен обработать\n"
-"%s"
-
-#: shell/importer/importer.c:351
-msgid "Importing"
-msgstr "Импортирование"
-
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"Импортирование %s.\n"
-"Начато %s"
-
-#: shell/importer/importer.c:372
-#, c-format
-msgid "Error starting %s"
-msgstr "Ошибка при загрузке %s"
-
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
-msgstr "Ошибка при загрузке %s"
-
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"Импортирование %s\n"
-"Импортирование элемента 1."
-
-#: shell/importer/importer.c:473
-msgid "Automatic"
-msgstr "Автоматическое"
-
-#: shell/importer/importer.c:523
-msgid "Filename:"
-msgstr "Имя файла:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
-msgstr "Выбрать файл"
-
-#: shell/importer/importer.c:538
-msgid "File type:"
-msgstr "Тип файла:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
-msgstr "Импортировать"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -7404,26 +10066,36 @@ msgstr ""
 "Этот помощник проведет вас через процесс импорта\n"
 "внешних файлов в Evolution."
 
-#: shell/importer/intelligent.c:143
+#: shell/importer/intelligent.c:191
+#, fuzzy
+msgid "Importers"
+msgstr "Импортировать"
+
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "Не удалять"
+
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "Не спрашивать снова"
 
-#: shell/main.c:82
-#, no-c-format
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
@@ -7446,7 +10118,7 @@ msgstr ""
 "Мы надеемся, что вам понравятся результаты нашей упорной работы и мы\n"
 "рассчитываем на ваше участие!\n"
 
-#: shell/main.c:107
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7454,236 +10126,323 @@ msgstr ""
 "С благодарностью\n"
 "Команда Evolution\n"
 
-#: shell/main.c:138
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "Невозможно инициализировать оболочку \"Эволюции\"."
 
-#: shell/main.c:184
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "Отключить заставку"
 
-#: shell/main.c:185
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr "Записывать отладочный вывод всех компонентов в файл."
 
-#: shell/main.c:217
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Не удалось инициализировать компонентную систему Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Скопировать"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
+msgstr "Скопировать выделение"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "Создать новый контакт"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Удалить контакт"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "Создать новый контакт"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Поиск"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Вырезать"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Поиск контакта"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr "Вырезать выделение"
+
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "Удалить контакт"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Новый контакт"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:53
-msgid "Previews the message to be printed"
-msgstr "Просмотр печатаемых сообщений"
-
 #: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+#, fuzzy
+msgid "New list"
+msgstr "Новые"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Вставить"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "Вставить выделение"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
+msgstr "Просмотр печатаемого календаря"
+
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "Печать контактов"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:84
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "Выбрать все"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "Удалить контакт"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Стоп"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Остановить загрузку"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "Просмотреть все"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "Просмотреть все контакты"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 msgid "_Addressbook Sources..."
 msgstr "Источники адресных книг..."
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "Контакты"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "Контакты"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "Печать..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "Поиск контактов"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:117
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:45
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
+msgstr "Выбрать все"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "Инструменты"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 дней"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Другие настройки"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a new all day Event"
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "Создать новое ежедневное событие"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Создать новую встречу"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Создать новый календарь"
+msgid "Create a new appointment"
+msgstr "Создать новую встречу"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "День"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Перейти к"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Перейти в прошлое"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Перейти в будущее"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "Перейти к дате"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Today"
-msgstr "Перейти к сегодняшнему дню"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Перейти к указанной дате"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Перейти к настоящему времени"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "Месяц"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr "Новое событие"
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "Открыть календарь"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "Пред."
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Новая встреча"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Просмотр печатаемого календаря"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Напечатать календарь"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Напечатать этот календарь"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Сохранить как"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "Необходимая информация"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "Сохранить календарь как что-нибудь еще"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Показать 1 день"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Показать 1 месяц"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Показать 1 неделю"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Показать рабочую неделю"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
-msgid "Today"
-msgstr "Сегодня"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "Рабочая неделя"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "Неделя"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "Встреча"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "Установки почты..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "День"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "Месяц"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:41
-msgid "_New"
-msgstr "Новый"
-
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "Открыть календарь"
-
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "Неделя"
 
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Закрыть"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "Закрыть эту встречу"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "Удалить эту встречу"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "Главная панель инструментов"
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "Просмотр печатаемых сообщений"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "Просмотр печати"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "Настройка страницы"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Печать этого элемента"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "Печать..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "Сохранить и закрыть"
+
+#: ui/evolution-comp-editor.xml.h:16
+msgid "Save the appointment and close the dialog box"
+msgstr "Сохранить встречу и закрыть окно диалога"
+
+#: ui/evolution-comp-editor.xml.h:17
+#, fuzzy
+msgid "Save this item to disk"
+msgstr "Изменить вид на %s"
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr "Настройки страницы для вашего текущего принтера"
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "Действия"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "Файл"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Удалить этот элемент"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "Удалить..."
 
@@ -7695,27 +10454,12 @@ msgstr "Справка"
 msgid "Print En_velope..."
 msgstr "Печать конверта..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Печать этого элемента"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:62 ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Печать..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Сохранить как..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Сохранить и закрыть"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Сохранить задание и закрыть окно диалога"
@@ -7732,884 +10476,1004 @@ msgstr "Просмотр онлайновой справки"
 msgid "Send _message to contact..."
 msgstr "Послать сообщение к контакту..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:33
-msgid "_File"
-msgstr "Файл"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "Сохранить"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Об этой программе"
-
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "О программе..."
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "Действия"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "Удалить этот элемент"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "Адресная книга... (FIXME)"
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "Сохранить задание и закрыть окно диалога"
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "Очистить"
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "Послать контакт другому..."
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "Вырезать"
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "Послать сообщение к контакту..."
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
-msgid "Chec_k Names (FIXME)"
-msgstr "Проверить имена (FIXME)"
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "Отменить встречу"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "Очистить"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#, fuzzy
+msgid "Cancel the meeting for this item"
+msgstr "Изменить свойства этой папки"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "Очистить выделение"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
+#, fuzzy
+msgid "Forward as i_Calendar"
+msgstr "Переслать как v_Calendar (FIXME)"
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Закрыть эту встречу"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "Переслать это сообщение"
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "Скопировать в папку... (FIXME)"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Скопировать"
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr ""
+"Запросить\n"
+"встречу"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Скопировать выделение"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr "Вставить встречу в расписание"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Вырезать"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#, fuzzy
+msgid "Schedule a meeting for this item"
+msgstr "Вставить встречу в расписание"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Вырезать выделение"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "Действия"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Удалить эту встречу"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "%s - Evolution %s"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
-msgstr "Дамп XML"
+#: ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "Отменено"
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
-msgstr "Дамп XML описания интерфейса"
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "Сохранить текущий файл"
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "Первый элемент в папке (FIXME)"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "Создать"
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "Переслать (FIXME)"
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Создать новое сообщение"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
-msgstr "Переслать как v_Calendar (FIXME)"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "Перейти к следующему элементу"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Перейти к предыдущему элементу"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "Незавершенное задание (FIXME)"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr "Очистить корзину"
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr "Изменить свойства файла"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "Забыть пароли"
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "След."
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Вставить"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
+msgstr "Управление подписками..."
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Вставить выделение"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "Пред."
+#: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Переместить выбранные сообщения в другую папку"
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "Просмотр печати"
+#: ui/evolution-mail-global.xml.h:14
+msgid "Send / Receive"
+msgstr "Получение и отправка"
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "Настройка печати..."
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "Отправить почту из очереди и получить новую почту"
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Настройка страницы"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:241
-msgid "Save"
-msgstr "Сохранить"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:43
-msgid "Save the appointment and close the dialog box"
-msgstr "Сохранить встречу и закрыть окно диалога"
+#: ui/evolution-mail-global.xml.h:18
+msgid "Virtual Folder _Editor..."
+msgstr "Редактор виртуальных папок..."
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "Сохранить текущий файл"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
+msgstr "Фильтры..."
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "Вставить встречу в расписание"
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr "Почтовое сообщение"
 
-#: ui/evolution-event-editor.xml.h:47
-msgid "Schedule some sort of a meeting"
-msgstr "Вставить в расписание встречу некоторого типа"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "Установки почты..."
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "Выбрать все"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "Просмотр"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
-msgid "Select everything"
-msgstr "Выбрать все"
+#: ui/evolution-mail-global.xml.h:23
+msgid "_Send / Receive"
+msgstr "Получить и отправить"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
-msgstr "Настройки страницы для вашего текущего принтера"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr "Изменить свойства этой папки"
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
-msgid "Task _Request (FIXME)"
-msgstr "Запрос задания (FIXME)"
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "Удалить выбранные сообщения"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "О программе..."
+#: ui/evolution-mail-list.xml.h:5
+#, fuzzy
+msgid "Cut selected messages"
+msgstr "Удалить выбранные сообщения"
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:30
-msgid "_Close"
-msgstr "Закрыть"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "Скрыть выделенные сообщения"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:31
-msgid "_Contact (FIXME)"
-msgstr "Контакт (FIXME)"
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "Скрыть удаленные сообщения"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "Скопировать"
+#: ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "Hide _Read Messages"
+msgstr "Скрыть прочитанные сообщения"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "Отладка"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:37
-msgid "_Help"
-msgstr "Справка"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "Пометить все как прочитанное"
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "Элемент (FIXME)"
+#: ui/evolution-mail-list.xml.h:11
+#, fuzzy
+msgid "Mark all visible messages as read"
+msgstr "Пометить выбранные сообщения как уже прочитанные"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "Журнальная запись (FIXME)"
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "Вставить выделение"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "Последний элемент в папке (FIXME)"
+#: ui/evolution-mail-list.xml.h:14
+#, fuzzy
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Переместить выбранные сообщения в другую папку"
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "Почтовое сообщение (FIXME)"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "Выбрать все"
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "Переместить в папку... (FIXME)"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "Выбрать подшивку"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "Заметка (FIXME)"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "Вставить"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:109
-#: ui/evolution-task-editor-dialog.xml.h:83
-msgid "_Properties..."
-msgstr "Свойства..."
+#: ui/evolution-mail-list.xml.h:19
+#, fuzzy
+msgid "Select all visible messages"
+msgstr "Удалить выбранные сообщения"
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "Выбрать все"
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "Показать все"
 
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:44
-msgid "_Task (FIXME)"
-msgstr "Задание (FIXME)"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
-msgid "_Unread Item (FIXME)"
-msgstr "Непрочитанный элемент (FIXME)"
+#: ui/evolution-mail-list.xml.h:22
+#, fuzzy
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Пометить выбранные сообщения как уже прочитанные"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Add Service"
-msgstr "Добавить сервис"
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "Удалить выбранные сообщения"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
-msgstr "Добавить новый сервис к Executive Summary"
+#: ui/evolution-mail-list.xml.h:24
+msgid "Threaded Message list"
+msgstr "Список подшитых сообщений"
 
-#: ui/evolution-executive-summary.xml.h:3
-msgid "Create a new email"
-msgstr "Создать новое сообщение"
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "Вычеркнуть"
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr "Установки Executive Summary"
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "Папка"
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Новое сообщение"
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "Обратить выделение"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
-msgstr "Применить все новые фильтры к почте в этом ящике"
+#: ui/evolution-mail-list.xml.h:28
+msgid "_Properties..."
+msgstr "Свойства..."
 
-#: ui/evolution-mail.xml.h:3
-msgid "Change the properties of this folder"
-msgstr "Изменить свойства этой папки"
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "Список подшитых сообщений"
 
-#: ui/evolution-mail.xml.h:4
-msgid "Compose"
-msgstr "Создать"
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "Apply filter rules to the selected messages"
+msgstr "Удалить выбранные сообщения"
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
-msgstr "Создать новое сообщение"
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "Ответить всем получателям этого сообщения"
 
-#: ui/evolution-mail.xml.h:6
-msgid "Configure Folder..."
-msgstr "Настроить папку..."
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
-msgstr "Скопировать сообщение в новую папку"
+#: ui/evolution-mail-message.xml.h:4
+#, fuzzy
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Ответить отправителю этого сообщения"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail-message.xml.h:6
 msgid "Copy selected messages to another folder"
 msgstr "Скопировать выбранные сообщения в другую папку"
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail-message.xml.h:7
 msgid "Create _Virtual Folder From Message"
 msgstr "Создать вирт.папку из сообщения"
 
-#: ui/evolution-mail.xml.h:12
-msgid "Delete the selected messages"
-msgstr "Удалить выбранные сообщения"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
-msgstr "Показать все заголовки сообщения"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:15
-msgid "Edit Message"
-msgstr "Правка сообщения"
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:16
-msgid "Edit the current message"
-msgstr "Правка текущего сообщения"
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
-msgstr "Очистить корзину"
+#: ui/evolution-mail-message.xml.h:12
+#, fuzzy
+msgid "Create a virtual folder for these recipients"
+msgstr "Создать вирт.папку из сообщения"
 
-#: ui/evolution-mail.xml.h:18
-msgid "Expunge"
-msgstr "Вычеркнуть"
+#: ui/evolution-mail-message.xml.h:13
+#, fuzzy
+msgid "Create a virtual folder for this mailing list"
+msgstr "Создать вирт.папку из сообщения"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Filter on Mailing _List"
-msgstr "Фильтр по списку рассылки"
+#: ui/evolution-mail-message.xml.h:14
+#, fuzzy
+msgid "Create a virtual folder for this sender"
+msgstr "Создать вирт.папку из сообщения"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Filter on Se_nder"
-msgstr "Фильтр по отправителю"
+#: ui/evolution-mail-message.xml.h:15
+#, fuzzy
+msgid "Create a virtual folder for this subject"
+msgstr "Создать вирт.папку из сообщения"
 
-#: ui/evolution-mail.xml.h:21
-msgid "Filter on _Recipients"
-msgstr "Фильтр по получателю"
+#: ui/evolution-mail-message.xml.h:17
+#, fuzzy
+msgid "Display the next important message"
+msgstr "Ответить отправителю этого сообщения"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Filter on _Subject"
-msgstr "Фильтр по теме"
+#: ui/evolution-mail-message.xml.h:18
+#, fuzzy
+msgid "Display the next message"
+msgstr "Перейти к следующему сообщению"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Finaly remove all mails tagged for deletion"
-msgstr "Окончательно удалить всю почту помеченную для удаления"
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
+msgstr "Удалить выбранные сообщения"
 
-#: ui/evolution-mail.xml.h:24
-msgid "Forget _Passwords"
-msgstr "Забыть пароли"
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:26
-msgid "Forward As"
-msgstr "Переслать как"
+#: ui/evolution-mail-message.xml.h:21
+#, fuzzy
+msgid "Display the previous important message"
+msgstr "Перейти к предыдущему сообщению"
 
-#: ui/evolution-mail.xml.h:27
-msgid "Forward inline"
-msgstr "Переслать встроенное"
+#: ui/evolution-mail-message.xml.h:22
+#, fuzzy
+msgid "Display the previous message"
+msgstr "Перейти к предыдущему сообщению"
 
-#: ui/evolution-mail.xml.h:28
-msgid "Forward the selected mail to someone"
-msgstr "Переслать выбранную почту кому-то"
+#: ui/evolution-mail-message.xml.h:23
+#, fuzzy
+msgid "Display the previous unread message"
+msgstr "Перейти к предыдущему сообщению"
+
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
+msgstr "Фильтр по списку рассылки"
+
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
+msgstr "Фильтр по отправителю"
+
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
+msgstr "Фильтр по получателю"
+
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
+msgstr "Фильтр по теме"
 
-#: ui/evolution-mail.xml.h:30
-msgid "Forward this message in-line with your mail, so you can edit it"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
 msgstr ""
-"Переслать это сообщение вставленным в ваше письмо, чтобы вы могли править его"
 
-#: ui/evolution-mail.xml.h:31
-msgid "Full _Headers"
-msgstr "Полные заголовки"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "Переслать"
 
-#: ui/evolution-mail.xml.h:32
-msgid "Go to the next message"
-msgstr "Перейти к следующему сообщению"
+#: ui/evolution-mail-message.xml.h:30
+msgid "Forward As"
+msgstr "Переслать как"
 
-#: ui/evolution-mail.xml.h:33
-msgid "Go to the previous message"
-msgstr "Перейти к предыдущему сообщению"
+#: ui/evolution-mail-message.xml.h:31
+#, fuzzy
+msgid "Forward _Attached"
+msgstr "Переслать как"
 
-#: ui/evolution-mail.xml.h:34
-msgid "Hide Deleted Messages"
-msgstr "Скрыть удаленные сообщения"
+#: ui/evolution-mail-message.xml.h:32
+#, fuzzy
+msgid "Forward _Inline"
+msgstr "Переслать встроенное"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Hide S_elected Messages"
-msgstr "Скрыть выделенные сообщения"
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Forward _Quoted"
+msgstr "Переслать встроенное"
 
-#: ui/evolution-mail.xml.h:36
-msgid "Hide _Deleted Messages"
-msgstr "Скрыть удаленные сообщения"
+#: ui/evolution-mail-message.xml.h:34
+#, fuzzy
+msgid "Forward the selected message in the body of a new message"
+msgstr "Переслать выбранную почту кому-то"
 
-#: ui/evolution-mail.xml.h:37
-msgid "Hide _Read messages"
-msgstr "Скрыть прочитанные сообщения"
+#: ui/evolution-mail-message.xml.h:35
+#, fuzzy
+msgid "Forward the selected message quoted like a reply"
+msgstr "Переслать выбранную почту кому-то"
 
-#: ui/evolution-mail.xml.h:38
-msgid "Invert Selection"
-msgstr "Обратить выделение"
+#: ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward the selected message to someone"
+msgstr "Переслать выбранную почту кому-то"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Manage _Subscriptions..."
-msgstr "Управление подписками..."
+#: ui/evolution-mail-message.xml.h:37
+#, fuzzy
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Переслать выбранную почту кому-то"
 
-#: ui/evolution-mail.xml.h:41
-msgid "Mark All as R_ead"
-msgstr "Пометить все как прочитанное"
+#: ui/evolution-mail-message.xml.h:39
+#, fuzzy
+msgid "Load _Images"
+msgstr "Пересланные сообщения"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Mark As Read"
-msgstr "Пометить как прочитанное"
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "Важное"
 
-#: ui/evolution-mail.xml.h:43
-msgid "Mark As U_nread"
-msgstr "Пометить как непрочитанное"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
+msgstr "Пометить как непрочтенное"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "Пометить выбранные сообщения как уже прочитанные"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "Пометить выбранные сообщения как уже прочитанные"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "Пометить выбранные сообщения как ещё не прочитанные"
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Пометить выбранные сообщения как ещё не прочитанные"
+
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "Пометить выбранные сообщения как уже прочитанные"
+
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Переместить"
 
-#: ui/evolution-mail.xml.h:48
-msgid "Move message to a new folder"
-msgstr "Переместить сообщение в новую папку"
-
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "Переместить выбранные сообщения в другую папку"
 
-#: ui/evolution-mail.xml.h:51
-msgid "Open in New Window"
-msgstr "Открыть в новом окне"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "След."
 
-#: ui/evolution-mail.xml.h:52
-msgid "Open the current message in a new window"
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Следующее сообщение"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Следующее сообщение"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Выбрать подшивку"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Следующее сообщение"
+
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Open the selected message in a new window"
 msgstr "Отправить текущее сообщение в новом окне"
 
-#: ui/evolution-mail.xml.h:58
-msgid "Print Preview of message..."
-msgstr "Просмотр печати сообщения..."
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Open the selected message in the composer to re-send it"
+msgstr "Пометить выбранные сообщения как уже прочитанные"
 
-#: ui/evolution-mail.xml.h:59
-msgid "Print message to the printer"
-msgstr "Распечатать сообщение на принтере"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "Просмотр печатаемых сообщений"
 
-#: ui/evolution-mail.xml.h:60
-msgid "Print message..."
-msgstr "Печать сообщения..."
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "Пред."
 
-#: ui/evolution-mail.xml.h:63
-msgid "Redirect (FIXME: implement me)"
-msgstr "Перенаправить (FIXME: не реализовано)"
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Предыдущее сообщение"
 
-#: ui/evolution-mail.xml.h:67
-msgid "Reply to all"
-msgstr "Ответить всем"
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Предыдущее сообщение"
 
-#: ui/evolution-mail.xml.h:69
-msgid "Reply to sender"
-msgstr "Ответить отправителю"
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Предыдущее сообщение"
 
-#: ui/evolution-mail.xml.h:71
-msgid "S_earch Message"
-msgstr "Поиск сообщения"
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
+msgid "Print Message..."
+msgstr "Печать сообщения..."
 
-#: ui/evolution-mail.xml.h:72
-msgid "S_ource"
-msgstr "Источник"
+#: ui/evolution-mail-message.xml.h:65
+#, fuzzy
+msgid "Print Preview..."
+msgstr "Просмотр печати"
 
-#: ui/evolution-mail.xml.h:73
-msgid "Save the message into a new file"
-msgstr "Сохранить сообщение в новом файле"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "Печать сообщения"
 
-#: ui/evolution-mail.xml.h:75 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Выбрать все"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "Ответить"
 
-#: ui/evolution-mail.xml.h:76
-msgid "Select _Thread"
-msgstr "Выбрать подшивку"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "Ответить всем"
 
-#: ui/evolution-mail.xml.h:77
-msgid "Send / Receive"
-msgstr "Получение и отправка"
+#: ui/evolution-mail-message.xml.h:71
+msgid "S_earch Message"
+msgstr "Поиск сообщения"
 
-#: ui/evolution-mail.xml.h:78
-msgid "Send a reply to the person who sent you this mail"
-msgstr "Послать ответ тому кто прислал это сообщение"
+#: ui/evolution-mail-message.xml.h:72
+#, fuzzy
+msgid "Save the message as a text file"
+msgstr "Сохранить сообщение в новом файле"
 
-#: ui/evolution-mail.xml.h:79
-msgid "Send a single mail in reply to all the selected mail"
-msgstr "Послать одно письмо в ответ на все выбранные сообщения"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:80
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
+#: ui/evolution-mail-message.xml.h:74
+msgid "Show Email _Source"
 msgstr ""
-"Отправить почту из очереди\n"
-" и получить новую почту"
 
-#: ui/evolution-mail.xml.h:82
-msgid "Send queued mail and retrieve new mail"
-msgstr "Отправить почту из очереди и получить новую почту"
+#: ui/evolution-mail-message.xml.h:75
+#, fuzzy
+msgid "Show Full _Headers"
+msgstr "Полные заголовки"
 
-#: ui/evolution-mail.xml.h:83
-msgid "Show _All"
-msgstr "Показать все"
+#: ui/evolution-mail-message.xml.h:76
+#, fuzzy
+msgid "Show message in the normal style"
+msgstr "Время должно быть в формате: %s"
 
-#: ui/evolution-mail.xml.h:85
-msgid "Threaded Message list"
-msgstr "Список подшитых сообщений"
+#: ui/evolution-mail-message.xml.h:77
+#, fuzzy
+msgid "Show message with all email headers"
+msgstr "Проверка новой почты во всех папках"
 
-#: ui/evolution-mail.xml.h:86
+#: ui/evolution-mail-message.xml.h:78
+#, fuzzy
+msgid "Show the raw email source of the message"
+msgstr "Присоединить файл к сообщению"
+
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "Вернуть удалённые выделенные сообщения"
 
-#: ui/evolution-mail.xml.h:87
-msgid "Undelete"
-msgstr "Восстановить"
+#: ui/evolution-mail-message.xml.h:80
+#, fuzzy
+msgid "VFolder on Mailing _List..."
+msgstr "Вирт.папка по списку рассылки"
 
-#: ui/evolution-mail.xml.h:92
-msgid "View Raw Message Source"
-msgstr "Просмотр исходного текста сообщения"
+#: ui/evolution-mail-message.xml.h:81
+#, fuzzy
+msgid "VFolder on Se_nder..."
+msgstr "Вирт.папка по отправителю"
 
-#: ui/evolution-mail.xml.h:93
-msgid "Virtual Folder _Editor..."
-msgstr "Редактор виртуальных папок..."
+#: ui/evolution-mail-message.xml.h:82
+#, fuzzy
+msgid "VFolder on _Recipients..."
+msgstr "Вирт.папка по получателю"
+
+#: ui/evolution-mail-message.xml.h:83
+#, fuzzy
+msgid "VFolder on _Subject..."
+msgstr "Вирт.папка по теме"
 
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "Применить фильтры"
 
-#: ui/evolution-mail.xml.h:95
-msgid "_Attachment"
-msgstr "Вложение"
+#: ui/evolution-mail-message.xml.h:85
+#, fuzzy
+msgid "_Copy to Folder"
+msgstr "Скопировать в папку"
 
-#: ui/evolution-mail.xml.h:97
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "Создать фильтр из сообщения"
 
-#: ui/evolution-mail.xml.h:99
-msgid "_Expunge"
-msgstr "Вычеркнуть"
-
-#: ui/evolution-mail.xml.h:100
-msgid "_Filters..."
-msgstr "Фильтры..."
-
-#: ui/evolution-mail.xml.h:101 ui/evolution.xml.h:34
-msgid "_Folder"
-msgstr "Папка"
+#: ui/evolution-mail-message.xml.h:88
+#, fuzzy
+msgid "_Forward Message"
+msgstr "Пересланные сообщения"
 
-#: ui/evolution-mail.xml.h:103
-msgid "_Inline"
-msgstr "Встроенное"
+#: ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "_Message Display"
+msgstr "Сообщения"
 
-#: ui/evolution-mail.xml.h:104 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "Обратить выделение"
+#: ui/evolution-mail-message.xml.h:90
+#, fuzzy
+msgid "_Move to Folder"
+msgstr "Переместить в папку"
 
-#: ui/evolution-mail.xml.h:105
-msgid "_Mail Message"
-msgstr "Почтовое сообщение"
+#: ui/evolution-mail-message.xml.h:91
+#, fuzzy
+msgid "_Normal Display"
+msgstr "Отобразить"
 
-#: ui/evolution-mail.xml.h:106
-msgid "_Mail Settings..."
-msgstr "Установки почты..."
+#: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Open Message"
+msgstr "Перепослать сообщения"
 
-#: ui/evolution-mail.xml.h:108
-msgid "_Open Selected Items"
-msgstr "Открыть выделенные элементы"
+#: ui/evolution-mail-message.xml.h:93
+#, fuzzy
+msgid "_Re-send Message"
+msgstr "Перепослать сообщения"
 
-#: ui/evolution-mail.xml.h:110
-msgid "_Quoted"
-msgstr "Процитированное"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Закрыть это окно"
 
-#: ui/evolution-mail.xml.h:111
-msgid "_Reply"
-msgstr "Ответить"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr "Настроить панели инструментов..."
 
-#: ui/evolution-mail.xml.h:112
-msgid "_Resend Messages"
-msgstr "Перепослать сообщения"
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr "Настроить"
 
-#: ui/evolution-mail.xml.h:114
-msgid "_Save Message As..."
-msgstr "Сохранить сообщение как..."
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr "Настроить панели инструментов"
 
-#: ui/evolution-mail.xml.h:115
-msgid "_Send / Receive"
-msgstr "Получить и отправить"
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "Закрыть"
 
-#: ui/evolution-mail.xml.h:116
-msgid "_Threaded"
-msgstr "Подшитые"
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "Просмотр"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Присоединить"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Закрыть текущий файл"
 
 #: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Delete all but signature"
+msgstr "Удалить все вхождения"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Зашифровать это сообщение с помощью PGP"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "Формат"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "Вставить текстовый файл..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Вставить файл как текст в сообщение"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Вставить текстовый файл..."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Открыть файл"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "Шифрование PGP"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "Подпись PGP"
 
 #: ui/evolution-message-composer.xml.h:17
-msgid "Save _Draft"
-msgstr "Сохранить черновик"
+#, fuzzy
+msgid "S/MIME Encrypt"
+msgstr "Шифрование PGP"
 
 #: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Сохранить в папке... (FIXME)"
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "Сохранить"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Сохранить как"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save _Draft"
+msgstr "Сохранить черновик"
+
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Сохранить в папке..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "Сохранить текущий файл"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Сохранить текущий файл под другим именем"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Сохранить сообщение в указанной папке"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Отправить"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Отправить позже"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Отправить позже"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Отправить почту в формате HTML"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Отправить сообщение позже"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "Отправить сообщение сейчас"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Отправить это сообщение сейчас"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Показать/Скрыть вложения"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Показать вложения"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Показать вложения"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "Подписать это сообщение с вашим PGP-ключом"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Подписать это сообщение с вашим PGP-ключом"
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Переключить отображение поля скрытой копии"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr "Переключить отображение поля копии"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Переключить отображение выбора для поля \"От\""
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Переключить отображение поля \"Ответ\""
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "Вложение"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "Поле скрытой копии"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "Поле копии"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "Отладка"
+
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Delete all"
+msgstr "Удалить"
+
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "Поле \"От\""
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "Вставить"
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
-msgstr "Вставить текстовый файл... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "Открыть..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 msgid "_Reply-To Field"
 msgstr "Поле \"Ответ\""
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "Безопасность"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "Справка"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Добавить папку к вашему списку папок подписок"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "Папка"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Обновить список"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Обновить список папок"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Удалить папку из вашего списка папок подписок"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Подписаться"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Отказаться"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
-msgid "Assig_n Task (FIXME)"
-msgstr "Назначить задание (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Повторный поиск"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr "Запрос встречи (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Возврат"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Повторить отмененное действие"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Заменить"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Заменить строку"
-
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "Ответить всем (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:48
-msgid "S_end Status Report (FIXME)"
-msgstr "Послать отчет о состоянии (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
-msgstr "Пропустить повторы (FIXME)"
-
-#: ui/evolution-task-editor-dialog.xml.h:54
-msgid "Save the task and close the dialog box"
-msgstr "Сохранить задание и закрыть окно диалога"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "Искать ту же строку еще раз"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "Поиск строки"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "Откат"
+#: ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Task"
+msgstr "Новое задание"
 
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "Отменить последнее действие"
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "Удалить задание"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:29
-msgid "_Appointment (FIXME)"
-msgstr "Встреча (FIXME)"
+#: ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "Re_fresh Task"
+msgstr "Обновить список"
 
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "Пометить как выполненное (FIXME)"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "Ответить (FIXME)"
+#: ui/evolution-tasks.xml.h:3
+#, fuzzy
+msgid "Copy selected task"
+msgstr "Открыть выделенные элементы"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Создать новое задание"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "Удалить задание"
+
+#: ui/evolution-tasks.xml.h:7
+#, fuzzy
+msgid "Delete selected tasks"
+msgstr "Удалить задание"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Новое задание"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "Вставить выделение"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Сохранить задание как что-нибудь еще"
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "Настройки заданий..."
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "Установки почты..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "Задание"
 
@@ -8617,144 +11481,217 @@ msgstr "Задание"
 msgid "About Evolution..."
 msgstr "О программе..."
 
-#: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Закрыть это окно"
-
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
-msgstr "Настроить панели инструментов..."
+#: ui/evolution.xml.h:2
+#, fuzzy
+msgid "Add to _Shortcut Bar"
+msgstr "Строка закладок"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr "Настроить"
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the name of this folder"
+msgstr "Изменить свойства этой папки"
 
 #: ui/evolution.xml.h:6
-msgid "Customize toolbars"
-msgstr "Настроить панели инструментов"
+#, fuzzy
+msgid "Copy this folder"
+msgstr "Скопировать в папку"
 
 #: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "Создание новой папки"
+
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "Удалить эту закладку из строки закладок"
+
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Создание новой папки"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "Удалить этот элемент"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Показать другую папку"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "Выход"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "Окно Evolution"
 
-#: ui/evolution.xml.h:10
-msgid "Evolution bar _shortcut"
-msgstr "Строка ярлыков Evolution"
-
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Выйти из программы"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "Краткое руководство"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Импортировать во внешний формат файла"
 
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "Главная панель инструментов"
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "Переместить выбранные сообщения в другую папку"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Open in New _Window"
+msgstr "Открыть в новом окне"
+
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Open this folder in an other window"
+msgstr "Отправить текущее сообщение в новом окне"
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Показать информацию о программе Evolution"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Отправить сообщение об ошибке"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "Отправить сообщение об ошибке"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "Отправить сообщение об ошибке используя Bug Buddy."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:30
 msgid "Toggle"
 msgstr "Переключить"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Переключить отображение строки папок"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Переключить отображение строки закладок"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Переключить работу в/вне сети."
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "Использование диспетчера контактов"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "Использование календаря"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "Использование почты"
 
-#: ui/evolution.xml.h:26
-msgid "Work Offline"
-msgstr "Работать вне сети"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr "Просмотр выбранной папки"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "О программе..."
 
-#: ui/evolution.xml.h:28
-msgid "_Actions"
-msgstr "Действия"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "Встреча (FIXME)"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "Контакт (FIXME)"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "Скопировать"
+
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "Строка папки"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "Перейти к папке..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "Импортировать файл..."
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "Индекс"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "Почтовое сообщение"
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "Переместить"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "Новый"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "Новая папка"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "Открыть..."
+
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "Строка закладок"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "Строка закладок"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "Задание (FIXME)"
+
+#: ui/evolution.xml.h:64
 msgid "_Work Offline"
 msgstr "Работать вне сети"
 
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "Установки почты..."
+
 #: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
+#, fuzzy
+msgid "Address Cards"
 msgstr "Визитная карточка"
 
 #: views/addressbook/galview.xml.h:2
@@ -8785,9 +11722,12 @@ msgstr "Сообщения"
 msgid "With Category"
 msgstr "C категорией:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "Экспериментальный"
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
@@ -8861,69 +11801,136 @@ msgstr "Время завершения собрания:"
 msgid "All Attendees"
 msgstr "Все сопровождение"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-#: widgets/menus/gal-view-menus.c:176
+#: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "Текущий просмотр"
 
-#: widgets/menus/gal-view-menus.c:202
+#: widgets/menus/gal-view-menus.c:259
 msgid "Define Views"
 msgstr "Определить окна просмотра"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:422
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "ПВСЧПСВ"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Сейчас"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Сегодня"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "Ок"
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Время должно быть в формате: %s"
 
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "неделя"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "Мусорная корзина"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "Сбой транзакции"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "Новые"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Неизвестная ошибка: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "Другой"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Редактор контактов"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "Сохранить результаты поиска"
 
-#: widgets/misc/e-filter-bar.c:239
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "Расширенный поиск"
 
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "Сохранить как..."
-
 #: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Показать все"
 
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Правка..."
-
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Расширенные..."
@@ -8936,6 +11943,10 @@ msgstr "Информация"
 msgid "Warning"
 msgstr "Предупреждение"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Ошибка"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Вопрос"
@@ -8972,3 +11983,616 @@ msgstr "init_corba(): Не удалось инициализировать GNOME"
 #: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Не удалось инициализировать Bonobo"
+
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "Другие настройки"
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "Настройки заданий..."
+
+#~ msgid "???"
+#~ msgstr "???"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "Контакты..."
+
+#~ msgid "_Company:"
+#~ msgstr "Компания:"
+
+#~ msgid "As _Minicards"
+#~ msgstr "Как миникарточки"
+
+#~ msgid "As _Table"
+#~ msgstr "Как таблица"
+
+#~ msgid "SASL"
+#~ msgstr "SASL"
+
+#~ msgid "Find..."
+#~ msgstr "Найти..."
+
+#~ msgid "label26"
+#~ msgstr "метка26"
+
+#~ msgid "Open calendar"
+#~ msgstr "Открыть календарь"
+
+#~ msgid "Save calendar"
+#~ msgstr "Сохранить календарь"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>Ошибка загрузки календаря:<br>Метод не поддерживается"
+
+#~ msgid "Alarms timeout after"
+#~ msgstr "Задержка таймера на"
+
+#~ msgid "Colors"
+#~ msgstr "Цвета"
+
+#~ msgid "Enable snoozing for"
+#~ msgstr "Разрешить краткий сон для "
+
+#~ msgid "Highlight"
+#~ msgstr "Подсвеченные дни:"
+
+#~ msgid "Items Due Today:"
+#~ msgstr "Задания установленные на сегодня:"
+
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Еще не просроченные задания"
+
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Еще не просроченные задания:"
+
+#~ msgid "Overdue Items:"
+#~ msgstr "Просроченные задания:"
+
+#~ msgid "TaskPad"
+#~ msgstr "Панель заданий"
+
+#~ msgid "Time Until Due"
+#~ msgstr "Время до условленного"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "Видимые таймеры"
+
+#~ msgid "Work week"
+#~ msgstr "Рабочая неделя"
+
+#~ msgid "Edit Task"
+#~ msgstr "Правка задания"
+
+#~ msgid "Percent complete"
+#~ msgstr "Процент выполненного"
+
+#~ msgid "Mark the task complete"
+#~ msgstr "Пометить задание как выполненное"
+
+#~ msgid "Edit this task..."
+#~ msgstr "Правка этого задания..."
+
+#~ msgid "Edit the task"
+#~ msgstr "Правка задания"
+
+#~ msgid "Go to Today"
+#~ msgstr "Сегодня"
+
+#~ msgid "Component successfully updated."
+#~ msgstr "Компонент успешно обновлен."
+
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "Не удалось загрузить ваш файл календаря!\n"
+
+#~ msgid "I couldn't read your calendar file!\n"
+#~ msgstr "Не удалось прочесть ваш файл календаря!\n"
+
+#~ msgid "This is a reply from someone who was uninvited!"
+#~ msgstr "Это ответ от кого-то кто не был приглашен!"
+
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "Не удалось обновить хранилище вашего календаря."
+
+#~ msgid "I couldn't delete the calendar component!\n"
+#~ msgstr "Не удалось удалить компонент календаря!\n"
+
+#~ msgid "Component successfully deleted."
+#~ msgstr "Компонент успешно удален."
+
+#~ msgid "I don't recognize this type of calendar component."
+#~ msgstr "Не распознан этот тип компонента календаря."
+
+#~ msgid "Add to Calendar"
+#~ msgstr "Добавить к календарю"
+
+#, fuzzy
+#~ msgid " Tentative "
+#~ msgstr "Экспериментальный"
+
+#~ msgid "Update Calendar"
+#~ msgstr "Обновить календарь"
+
+#~ msgid "Attendee address"
+#~ msgstr "Адрес сопровождения"
+
+#~ msgid "Attendees: "
+#~ msgstr "Сопровождение:"
+
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr ""
+#~ "Отменить\n"
+#~ "встречу"
+
+#~ msgid "Organizer: "
+#~ msgstr "Организатор:"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "Основания встречи"
+
+#~ msgid "_Starting date:"
+#~ msgstr "Дата начала:"
+
+#~ msgid "label21"
+#~ msgstr "метка26"
+
+#~ msgid "label55"
+#~ msgstr "метка26"
+
+#~ msgid "Summary contains"
+#~ msgstr "Итог содержит"
+
+#~ msgid "Comment contains"
+#~ msgstr "Коментарий содержит"
+
+#~ msgid "Has category"
+#~ msgstr "Имеет категорию"
+
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "Невозможно проверить файл блокировки для %s: %s"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Сканирование папок IMAP"
+
+#~ msgid "Inline attachment"
+#~ msgstr "Встроенное вложение"
+
+#~ msgid "Send as:"
+#~ msgstr "Отправить как:"
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Невозможно открыть файл подписи %s:\n"
+#~ "%s"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "Это не обычный файл."
+
+#~ msgid "That file exists but is not readable."
+#~ msgstr "Этот файл существует, но не читается."
+
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "Файл выглядит доступным, но произошел сбой open(2)."
+
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "Файл очень большой (больше 100К).\n"
+#~ "Вы уверены, что хотите вставить его?"
+
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr "%I:%M:%S %p%n"
+
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Невозможно открыть HTML файл:\n"
+#~ "%s"
+
+#~ msgid "Select a service"
+#~ msgstr "Выбрать сервис"
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "Открыть %s с помощью подходящего приложения GNOME"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "Открыть %s с помощью программы просмотра web для GNOME"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "Отправить почту %s"
+
+#~ msgid "Run %s"
+#~ msgstr "Запустить %s"
+
+#~ msgid "Close %s"
+#~ msgstr "Закрыть %s"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "Переместить %s влево"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "Переместить %s вправо"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Переместить %s в предыдущую строку"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "Переместить %s в следующую строку"
+
+#~ msgid "Appearance"
+#~ msgstr "Внешний вид"
+
+#~ msgid "Background:"
+#~ msgstr "Фон:"
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "Фабрика для итога RDF."
+
+#~ msgid "RDF Summary"
+#~ msgstr "Итог RDF"
+
+#~ msgid "Factory for the test component."
+#~ msgstr "Фабрика для тестового компонента."
+
+#~ msgid "Test bonobo service"
+#~ msgstr "Проверить сервис bonobo"
+
+#~ msgid "Test service"
+#~ msgstr "Проверить сервис"
+
+#~ msgid "Update automatically"
+#~ msgstr "Обновлять автоматически"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Переслать по адресу"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "Изменить папку \"%s\" в формат \"%s\""
+
+#~ msgid "Closing current folder"
+#~ msgstr "Закрытие текущей папки"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Переименование старой папки и открытие"
+
+#~ msgid "Copying messages"
+#~ msgstr "Копирование сообщений"
+
+#~ msgid "Evolution progress"
+#~ msgstr "Продвижение Evolution"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Перемещение сообщения номер %d из %d (uid \"%s\")"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Сохранение сообщения %d из %d (uid  \"%s\")"
+
+#~ msgid "Search \"%s\""
+#~ msgstr "Поиск \"%s\""
+
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "Неполное сообщение записано в канал!"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (пересланное сообщение)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Пересл.: (нет темы)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Пересланное сообщение (без темы)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Пересылаемое сообщение-----<br><b>От:</b> %s<br><b>Кому:</b> \"\n"
+#~ "\"%s<br><b>Тема:</b> %s<br>"
+
+#~ msgid "Print the selected message"
+#~ msgstr "Распечатать выделенное сообщение"
+
+#~ msgid "Delete this message"
+#~ msgstr "Удалить это сообщение"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Файлы Evolution успешно установлены."
+
+#~ msgid "Activate"
+#~ msgstr "Активировать"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "Активировать эту закладку"
+
+#~ msgid "Find"
+#~ msgstr "Поиск"
+
+#~ msgid "Find a contact"
+#~ msgstr "Поиск контакта"
+
+#~ msgid "View All"
+#~ msgstr "Просмотреть все"
+
+#~ msgid "View all contacts"
+#~ msgstr "Просмотреть все контакты"
+
+#~ msgid "5 Days"
+#~ msgstr "5 дней"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Создать новый календарь"
+
+#~ msgid "Day"
+#~ msgstr "День"
+
+#~ msgid "New _Event"
+#~ msgstr "Новое событие"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Открыть календарь"
+
+#~ msgid "Prev"
+#~ msgstr "Пред."
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Сохранить календарь как что-нибудь еще"
+
+#~ msgid "Week"
+#~ msgstr "Неделя"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "Открыть календарь"
+
+#~ msgid "About this application"
+#~ msgstr "Об этой программе"
+
+#~ msgid "About..."
+#~ msgstr "О программе..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "Действия"
+
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "Адресная книга... (FIXME)"
+
+#~ msgid "C_lear"
+#~ msgstr "Очистить"
+
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "Проверить имена (FIXME)"
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "Скопировать в папку... (FIXME)"
+
+#~ msgid "Dump XML"
+#~ msgstr "Дамп XML"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "Дамп XML описания интерфейса"
+
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "Первый элемент в папке (FIXME)"
+
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "Переслать (FIXME)"
+
+#~ msgid "Go to the next item"
+#~ msgstr "Перейти к следующему элементу"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "Перейти к предыдущему элементу"
+
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "Незавершенное задание (FIXME)"
+
+#~ msgid "N_ext"
+#~ msgstr "След."
+
+#~ msgid "Pre_vious"
+#~ msgstr "Пред."
+
+#~ msgid "Print S_etup..."
+#~ msgstr "Настройка печати..."
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "Вставить в расписание встречу некоторого типа"
+
+#~ msgid "Select everything"
+#~ msgstr "Выбрать все"
+
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "Запрос задания (FIXME)"
+
+#~ msgid "_About..."
+#~ msgstr "О программе..."
+
+#~ msgid "_Item (FIXME)"
+#~ msgstr "Элемент (FIXME)"
+
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "Журнальная запись (FIXME)"
+
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "Последний элемент в папке (FIXME)"
+
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "Почтовое сообщение (FIXME)"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "Переместить в папку... (FIXME)"
+
+#~ msgid "_Note (FIXME)"
+#~ msgstr "Заметка (FIXME)"
+
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "Непрочитанный элемент (FIXME)"
+
+#~ msgid "Add Service"
+#~ msgstr "Добавить сервис"
+
+#~ msgid "Add a new service to the Executive Summary"
+#~ msgstr "Добавить новый сервис к Executive Summary"
+
+#~ msgid "Create a new email"
+#~ msgstr "Создать новое сообщение"
+
+#~ msgid "Executive Summary Settings..."
+#~ msgstr "Установки Executive Summary"
+
+#~ msgid "New Mail"
+#~ msgstr "Новое сообщение"
+
+#~ msgid "Apply any new filters to the mail in this box"
+#~ msgstr "Применить все новые фильтры к почте в этом ящике"
+
+#~ msgid "Configure Folder..."
+#~ msgstr "Настроить папку..."
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Скопировать сообщение в новую папку"
+
+#~ msgid "Edit the current message"
+#~ msgstr "Правка текущего сообщения"
+
+#~ msgid "Expunge"
+#~ msgstr "Вычеркнуть"
+
+#~ msgid "Finaly remove all mails tagged for deletion"
+#~ msgstr "Окончательно удалить всю почту помеченную для удаления"
+
+#~ msgid "Forward inline"
+#~ msgstr "Переслать встроенное"
+
+#~ msgid "Forward this message in-line with your mail, so you can edit it"
+#~ msgstr ""
+#~ "Переслать это сообщение вставленным в ваше письмо, чтобы вы могли править его"
+
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "Скрыть удаленные сообщения"
+
+#~ msgid "Invert Selection"
+#~ msgstr "Обратить выделение"
+
+#~ msgid "Mark As Read"
+#~ msgstr "Пометить как прочитанное"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Пометить как непрочитанное"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Переместить сообщение в новую папку"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Просмотр печати сообщения..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Распечатать сообщение на принтере"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "Перенаправить (FIXME: не реализовано)"
+
+#~ msgid "Reply to all"
+#~ msgstr "Ответить всем"
+
+#~ msgid "Reply to sender"
+#~ msgstr "Ответить отправителю"
+
+#~ msgid "S_ource"
+#~ msgstr "Источник"
+
+#~ msgid "Send a reply to the person who sent you this mail"
+#~ msgstr "Послать ответ тому кто прислал это сообщение"
+
+#~ msgid "Send a single mail in reply to all the selected mail"
+#~ msgstr "Послать одно письмо в ответ на все выбранные сообщения"
+
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr ""
+#~ "Отправить почту из очереди\n"
+#~ " и получить новую почту"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "Просмотр исходного текста сообщения"
+
+#~ msgid "_Reply"
+#~ msgstr "Ответить"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "Сохранить сообщение как..."
+
+#~ msgid "_Threaded"
+#~ msgstr "Подшитые"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Сохранить в папке... (FIXME)"
+
+#~ msgid "Send the message now"
+#~ msgstr "Отправить сообщение сейчас"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "Вставить текстовый файл... (FIXME)"
+
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "Назначить задание (FIXME)"
+
+#~ msgid "Meeting Re_quest (FIXME)"
+#~ msgstr "Запрос встречи (FIXME)"
+
+#~ msgid "Redo"
+#~ msgstr "Возврат"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Повторить отмененное действие"
+
+#~ msgid "Replace"
+#~ msgstr "Заменить"
+
+#~ msgid "Replace a string"
+#~ msgstr "Заменить строку"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "Ответить всем (FIXME)"
+
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "Послать отчет о состоянии (FIXME)"
+
+#~ msgid "S_kip Occurrence (FIXME)"
+#~ msgstr "Пропустить повторы (FIXME)"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "Искать ту же строку еще раз"
+
+#~ msgid "Search for a string"
+#~ msgstr "Поиск строки"
+
+#~ msgid "Undo"
+#~ msgstr "Откат"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Отменить последнее действие"
+
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "Пометить как выполненное (FIXME)"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "Ответить (FIXME)"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Строка ярлыков Evolution"
diff --git a/po/sk.po b/po/sk.po
index 451e311ba5..1f15ad3adb 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.10.99\n"
-"POT-Creation-Date: 2001-07-24 17:00+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-07-24 17:46CET\n"
 "Last-Translator: Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>\n"
 "Language-Team: Slovak <sk-i18n@linux.sk>\n"
@@ -21,11 +21,11 @@ msgstr "VytvАracie rozhranie pre import sЗborov VCard do Evolution."
 msgid "Imports VCard files into Evolution."
 msgstr "Importuje sЗbory VCard do Evolution."
 
-#: addressbook/backend/ebook/e-card.c:3606
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Karta: "
 
-#: addressbook/backend/ebook/e-card.c:3608
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -33,7 +33,7 @@ msgstr ""
 "\n"
 "Meno: "
 
-#: addressbook/backend/ebook/e-card.c:3609
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -41,7 +41,7 @@ msgstr ""
 "\n"
 "  Predpona:     "
 
-#: addressbook/backend/ebook/e-card.c:3610
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -49,7 +49,7 @@ msgstr ""
 "\n"
 "  KrstnИ:      "
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -57,7 +57,7 @@ msgstr ""
 "\n"
 "  оal╧ie: "
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -65,7 +65,7 @@ msgstr ""
 "\n"
 "  Priezvisko:     "
 
-#: addressbook/backend/ebook/e-card.c:3613
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -73,7 +73,7 @@ msgstr ""
 "\n"
 "  PrМpona:     "
 
-#: addressbook/backend/ebook/e-card.c:3627
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -81,7 +81,7 @@ msgstr ""
 "\n"
 "DАtum narodenia:"
 
-#: addressbook/backend/ebook/e-card.c:3638
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -89,7 +89,7 @@ msgstr ""
 "\n"
 "Adresa:"
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -97,7 +97,7 @@ msgstr ""
 "\n"
 "Po╧tovА schrАnka:"
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -105,7 +105,7 @@ msgstr ""
 "\n"
 "  PrМp:         "
 
-#: addressbook/backend/ebook/e-card.c:3642
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -113,7 +113,7 @@ msgstr ""
 "\n"
 "  Ulica:      "
 
-#: addressbook/backend/ebook/e-card.c:3643
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -121,7 +121,7 @@ msgstr ""
 "\n"
 "   Mesto:  "
 
-#: addressbook/backend/ebook/e-card.c:3644
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -129,7 +129,7 @@ msgstr ""
 "\n"
 "  RegiСn:      "
 
-#: addressbook/backend/ebook/e-card.c:3645
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -137,7 +137,7 @@ msgstr ""
 "\n"
 "   PSх:  "
 
-#: addressbook/backend/ebook/e-card.c:3646
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -145,7 +145,7 @@ msgstr ""
 "\n"
 "  Krajina:  "
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
@@ -153,7 +153,7 @@ msgstr ""
 "\n"
 "Dodacie ozn:"
 
-#: addressbook/backend/ebook/e-card.c:3671
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -161,7 +161,7 @@ msgstr ""
 "\n"
 "TelefСny:\n"
 
-#: addressbook/backend/ebook/e-card.c:3674
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -169,7 +169,7 @@ msgstr ""
 "\n"
 " TelefСn: "
 
-#: addressbook/backend/ebook/e-card.c:3698
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -177,7 +177,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3701
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -185,7 +185,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3720
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -193,7 +193,7 @@ msgstr ""
 "\n"
 "Po╧t.klient:"
 
-#: addressbook/backend/ebook/e-card.c:3726
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -201,7 +201,7 @@ msgstr ""
 "\n"
 "хasovА zСna:"
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -209,7 +209,7 @@ msgstr ""
 "\n"
 "Miesto: "
 
-#: addressbook/backend/ebook/e-card.c:3738
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -217,7 +217,7 @@ msgstr ""
 "\n"
 "PozМcia: "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -225,7 +225,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3751
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -233,7 +233,7 @@ msgstr ""
 "\n"
 " Meno: "
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -241,7 +241,7 @@ msgstr ""
 "\n"
 "  VlastnИ:"
 
-#: addressbook/backend/ebook/e-card.c:3753
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -249,7 +249,7 @@ msgstr ""
 "\n"
 "  VlastnИ2: "
 
-#: addressbook/backend/ebook/e-card.c:3754
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -257,7 +257,7 @@ msgstr ""
 "\n"
 "  VlastnИ3: "
 
-#: addressbook/backend/ebook/e-card.c:3755
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -265,7 +265,7 @@ msgstr ""
 "\n"
 "  VlastnИ4: "
 
-#: addressbook/backend/ebook/e-card.c:3759
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -273,7 +273,7 @@ msgstr ""
 "\n"
 "KategСrie: "
 
-#: addressbook/backend/ebook/e-card.c:3760
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -291,7 +291,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3773
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -299,7 +299,7 @@ msgstr ""
 "\n"
 "UnikАtny re╩azec:"
 
-#: addressbook/backend/ebook/e-card.c:3776
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -307,11 +307,11 @@ msgstr ""
 "\n"
 "VerejnЩ k╣ЗХ:"
 
-#: addressbook/backend/ebook/e-card.c:4038
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr "Viacero VKariet"
 
-#: addressbook/backend/ebook/e-card.c:4046
+#: addressbook/backend/ebook/e-card.c:4045
 #, c-format
 msgid "VCard for %s"
 msgstr "VKartapre %s"
@@ -321,9 +321,9 @@ msgstr "VKartapre %s"
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Nie je mo╬nИ inicializova╩ Bonobo"
@@ -337,14 +337,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook nenaХМtanЩ\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Nie je mo╬nИ spusti╩ server wombat"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Nie je mo╬nИ spusti╩ wombat"
 
@@ -416,7 +416,7 @@ msgstr "╝iadny (anonymnЩ mСd)"
 #: addressbook/gui/component/addressbook-config.c:165
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:66
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
 msgid "Password"
 msgstr "Heslo"
 
@@ -448,13 +448,14 @@ msgstr "PripАjacie DN:"
 msgid "FIXME Bind DN Help text here"
 msgstr "FIXME PomocnМk pre Bind DN"
 
+#. Remember the password?
 #: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
 msgid "Remember this password"
 msgstr "Ulo╬i╩ toto heslo"
 
 #: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 msgid "Host:"
 msgstr "Hostite╣:"
 
@@ -491,7 +492,7 @@ msgid "Advanced LDAP Options"
 msgstr "PokroХilИ mo╬nosti LDAP"
 
 #: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Path:"
 msgstr "Cesta:"
 
@@ -503,36 +504,36 @@ msgstr "FIXME PomocnМk pre Path"
 msgid "Create path if it doesn't exist."
 msgstr "Vytvori╩ cestu, ak e╧te neexistuje."
 
-#: addressbook/gui/component/addressbook-config.c:662
+#: addressbook/gui/component/addressbook-config.c:663
 msgid "Edit Addressbook"
 msgstr "Upravi╩ adresАr"
 
-#: addressbook/gui/component/addressbook-config.c:664
+#: addressbook/gui/component/addressbook-config.c:665
 msgid "Add Addressbook"
 msgstr "Prida╩ adresАr"
 
-#: addressbook/gui/component/addressbook-config.c:682
+#: addressbook/gui/component/addressbook-config.c:683
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
 msgstr "Vyberte typ adresАra, ktorЩ mАte, a zadajte po╬adovanИ informАcie."
 
-#: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:56 my-evolution/e-summary-preferences.c:894
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr "Meno:"
 
-#: addressbook/gui/component/addressbook-config.c:689
+#: addressbook/gui/component/addressbook-config.c:692
 msgid "FIXME Name help text here"
 msgstr "FIXME PomocnМk pre Name"
 
-#: addressbook/gui/component/addressbook-config.c:691
+#: addressbook/gui/component/addressbook-config.c:694
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2
 msgid "Description:"
 msgstr "Popis:"
 
-#: addressbook/gui/component/addressbook-config.c:692
+#: addressbook/gui/component/addressbook-config.c:695
 msgid "FIXME Description help text here"
 msgstr "FIXME PomocnМk pre Description"
 
@@ -557,20 +558,19 @@ msgstr "URI"
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:11
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:108
 msgid "_Add"
 msgstr "_Prida╩"
 
 #: addressbook/gui/component/addressbook-config.glade.h:6
-#: mail/mail-config.glade.h:108 ui/evolution-comp-editor.xml.h:20
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:47
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 #: ui/evolution.xml.h:46
 msgid "_Edit"
 msgstr "_Upravi╩"
 
-#: addressbook/gui/component/addressbook-storage.c:115
+#: addressbook/gui/component/addressbook-storage.c:118
 msgid "Other Contacts"
 msgstr "InИ kontakty"
 
@@ -611,7 +611,7 @@ msgstr ""
 "Nebolo mo╬nИ otvori╩ tento adresАr. ProsМm, overte, ╬e cesta\n"
 "existuje a ╬e mАte dostatoХnИ prАva."
 
-#: addressbook/gui/component/addressbook.c:554 calendar/gui/gnome-cal.c:218
+#: addressbook/gui/component/addressbook.c:554
 msgid "Any field contains"
 msgstr "╔ubovo╣nИ pole obsahuje"
 
@@ -631,29 +631,20 @@ msgstr "KategСria obsahuje"
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ktorИ zobrazМ prehliadaХ prieХinku"
 
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * card.
-#.
-#: addressbook/gui/component/e-address-popup.c:178
-msgid "(none)"
-msgstr "(niХ)"
-
 #: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:1476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
 msgid "Primary Email"
 msgstr "PrimАrny e-mail"
 
 #: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1477
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
 #: addressbook/gui/widgets/e-addressbook-view.c:728
 msgid "Email 2"
 msgstr "E-mail 2"
 
 #: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1478
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
 #: addressbook/gui/widgets/e-addressbook-view.c:729
 msgid "Email 3"
 msgstr "E-mail 3"
@@ -684,7 +675,7 @@ msgstr "Upravi╩ kontakt"
 
 #: addressbook/gui/component/e-address-popup.c:946
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:339
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
 msgid "Add to Contacts"
 msgstr "Prida╩ do kontaktov"
 
@@ -709,13 +700,13 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "VytvАracie rozhranie pre rozhranie pre vЩber mena adresАra."
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:156
-#: addressbook/gui/component/select-names/e-select-names.c:618
+#: addressbook/gui/component/select-names/e-select-names.c:630
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
 #: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: my-evolution/e-summary-preferences.c:1181
-#: my-evolution/e-summary-preferences.c:1235
-#: my-evolution/e-summary-preferences.c:1296 shell/e-shortcuts-view.c:272
-#: shell/e-shortcuts-view.c:475
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
 msgid "Remove"
 msgstr "OdstrАni╩"
 
@@ -727,6 +718,15 @@ msgstr "OdstrАni╩ v╧etky"
 msgid "Send HTML Mail?"
 msgstr "Posla╩ po╧tu HTML?"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "ZmenenЩ kontakt:"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Message Recipients"
 msgstr "AdresАti sprАvy"
@@ -832,9 +832,9 @@ msgstr "_Kontakty..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1205
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1302
-#: mail/mail-config.glade.h:107 ui/evolution-mail-message.xml.h:79
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_OdstrАni╩"
@@ -887,95 +887,95 @@ msgstr "_Toto je e-mailovА adresa"
 msgid "Delete Contact?"
 msgstr "OdstrАni╩ kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "Tento kontakt patrМ do tЩchto kategСriМ:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1434
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
 #: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Asistent"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1435
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "PrАca"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1436
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "PrАca 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1437
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
 #: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "PracovnЩ fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1438
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "SpДtnИ volanie"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1439
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1440
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1441
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Domov"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Domov 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1443
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
 #: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "DomАci fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1444
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
 #: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1445
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1446
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: mail/mail-config.glade.h:62
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "InИ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1447
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
 #: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "оal╧М fax"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1448
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
 #: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1449
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "PrimАrny"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1450
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
 #: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "RАdio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1451
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
 #: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1452
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
@@ -1138,19 +1138,24 @@ msgid "Contact List Editor"
 msgstr "Editor zoznamu kontaktov"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+#, fuzzy
+msgid "Add Anyway"
+msgstr "_Prida╩ aj tak"
+
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Duplicate Contact Detected"
 msgstr "NАjdenЩ duplikАt kontaktu"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
 msgid "New Contact:"
 msgstr "NovЩ kontakt:"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
 msgid "Original Contact:"
 msgstr "PТvodnЩ kontakt:"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -1158,10 +1163,6 @@ msgstr ""
 "Meno alebo e-mail pre tento kontakt u╬ v tomto prieХinku\n"
 "existuje. Chcete ho aj tak prida╩?"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:6
-msgid "_Add Anyway"
-msgstr "_Prida╩ aj tak"
-
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "ZmenenЩ kontakt:"
@@ -1314,9 +1315,9 @@ msgstr "Posla╩ sprАvu kontaktu"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
 #: addressbook/gui/widgets/e-addressbook-view.c:604
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-mail-message.xml.h:55
-#: ui/evolution-tasks.xml.h:9 ui/my-evolution.xml.h:2
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "TlaХi╩"
 
@@ -1328,9 +1329,9 @@ msgstr "TlaХi╩ obАlku"
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
 #: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
 #: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
-#: mail/mail-config.glade.h:27 ui/evolution-addressbook.xml.h:8
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "OdstrАni╩"
 
@@ -1345,7 +1346,7 @@ msgid "Success"
 msgstr "зspech"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:250 shell/e-storage.c:497
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
 msgid "Unknown error"
 msgstr "NeznАma chyba"
 
@@ -1712,18 +1713,18 @@ msgstr "╘Мrka:"
 msgid "_Font..."
 msgstr "_PМsmo..."
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Chyba pri komunikАcii s kalendАrovЩm serverom"
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nie je mo╬nИ preХМta╩ blok aplikАcie Calendar pilota"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nie je mo╬nИ preХМta╩ blok aplikАcie ToDo pilota"
 
@@ -1759,6 +1760,11 @@ msgstr "VytvАracie rozhranie pre ovlАdacМ prvok poh╣adu iTip kalendАra"
 msgid "Factory for the sample Calendar control"
 msgstr "VytvАracie rozhranie pre ukА╬kovЩ ovlАdacМ prvok KalendАr."
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "VytvАracie rozhranie pre komponent KalendАr Evolution."
+
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
 msgstr "Slu╬ba upozorРovania na poplachy"
@@ -1865,127 +1871,151 @@ msgstr "Nie je mo╬nИ inicializova╩ gnome-vfs"
 msgid "Could not create the alarm notify service factory"
 msgstr "Nie je mo╬nИ vytvori╩ vytvАracie rozhranie pre slu╬bu upozorРovania"
 
-#: calendar/gui/calendar-commands.c:278
-msgid "File not found"
-msgstr "SЗbor nenАjdenЩ"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A, %d %B %Y"
 
-#: calendar/gui/calendar-commands.c:302
-msgid "Open calendar"
-msgstr "Otvori╩ kalendАr"
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:344
-msgid "Save calendar"
-msgstr "Ulo╬i╩ kalendАr"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: calendar/gui/calendar-commands.c:597
-msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
+#: calendar/gui/calendar-commands.c:586
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Nie je mo╬nИ vytvori╩ kalendАrovЩ poh╣ad. ProsМm, overte nastavenie ORBit a "
 "OAF."
 
-#: calendar/gui/calendar-model.c:375 calendar/gui/calendar-model.c:981
-#: calendar/gui/e-calendar-table.c:346
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "VerejnЩ"
 
-#: calendar/gui/calendar-model.c:378 calendar/gui/calendar-model.c:983
-#: calendar/gui/e-calendar-table.c:347
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "SЗkromnЩ"
 
-#: calendar/gui/calendar-model.c:381 calendar/gui/calendar-model.c:985
-#: calendar/gui/e-calendar-table.c:348
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "TajnЩ"
 
-#: calendar/gui/calendar-model.c:384 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
 #: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
 #: camel/providers/smtp/camel-smtp-transport.c:223
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "NeznАmy"
 
-#: calendar/gui/calendar-model.c:481
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:481
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "J"
 
-#: calendar/gui/calendar-model.c:483
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:483
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "Z"
 
-#: calendar/gui/calendar-model.c:521 calendar/gui/calendar-model.c:1166
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
 #: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:368 mail/message-list.c:625
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "VysokА"
 
-#: calendar/gui/calendar-model.c:523 calendar/gui/calendar-model.c:1168
-#: calendar/gui/calendar-model.c:1691
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:369 mail/message-list.c:624
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "NormАlny"
 
-#: calendar/gui/calendar-model.c:525 calendar/gui/calendar-model.c:1170
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:370 mail/message-list.c:623
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "NМzka"
 
-#: calendar/gui/calendar-model.c:561 calendar/gui/calendar-model.c:1222
-#: calendar/gui/e-calendar-table.c:422
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Prieh╣adnИ"
 
-#: calendar/gui/calendar-model.c:564 calendar/gui/calendar-model.c:1224
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Neprieh╣adnИ"
 
-#: calendar/gui/calendar-model.c:718 calendar/gui/calendar-model.c:1276
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
 #: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:442
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "NezaХal"
 
-#: calendar/gui/calendar-model.c:721 calendar/gui/calendar-model.c:1278
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
 #: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:443
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "Prebieha"
 
-#: calendar/gui/calendar-model.c:724 calendar/gui/calendar-model.c:1280
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "DokonХenЩ"
 
-#: calendar/gui/calendar-model.c:727 calendar/gui/calendar-model.c:1282
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
 #: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:445 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Zru╧enЩ"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:877 e-util/e-time-utils.c:307
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:880 e-util/e-time-utils.c:316
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:885
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1996,25 +2026,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:965
-msgid "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+#: calendar/gui/calendar-model.c:981
+msgid ""
+"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr "KlasifikАcia musМ by╩ 'VerejnИ', 'SЗkromnИ', 'TajnИ' alebo '╝iadna'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:979 calendar/gui/calendar-model.c:1220
-#: calendar/gui/calendar-model.c:1274
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
 #: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
 #: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:345 calendar/gui/e-calendar-table.c:420
-#: mail/mail-account-gui.c:1364 mail/mail-accounts.c:134
-#: mail/mail-accounts.c:388 mail/mail-config.glade.h:59
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
 #: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
 #: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
 #: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "╝iadna"
 
-#: calendar/gui/calendar-model.c:1070
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2024,38 +2056,42 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1110
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "PercentuАlna hodnota musМ by╩ medzi 0 a╬ 100"
 
-#: calendar/gui/calendar-model.c:1151
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "Priorita musМ by╩ 'VysokА', 'NormАlna', 'NМzka' alebo 'NedefinovanА'."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1164
+#: calendar/gui/calendar-model.c:1181
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:371
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "NedefinovanА"
 
-#: calendar/gui/calendar-model.c:1205
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "Prieh╣adnos╩ musМ by╩ 'Prieh╣adnИ', 'Neprieh╣adnИ' alebo '╝iadne'."
 
-#: calendar/gui/calendar-model.c:1693
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "Opakovanie"
 
-#: calendar/gui/calendar-model.c:1695
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "PriradenИ"
 
-#: calendar/gui/calendar-model.c:1701
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "аno"
 
-#: calendar/gui/calendar-model.c:1701
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Nie"
 
@@ -2275,7 +2311,7 @@ msgstr "koniec schТdzky"
 msgid "hour(s)"
 msgstr "hodМn"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:109
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
 msgid "minute(s)"
 msgstr "minЗt"
 
@@ -2317,7 +2353,6 @@ msgstr "PМpnu╩ pri zobrazenМ okna alarmu."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
-#: ui/evolution-calendar.xml.h:4
 msgid "Calendar"
 msgstr "KalendАr"
 
@@ -2350,7 +2385,7 @@ msgid "Defaults"
 msgstr "╘tandard"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:30
 msgid "Display"
 msgstr "Zobrazenie"
 
@@ -2367,7 +2402,7 @@ msgid "Fri"
 msgstr "Pia"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:978
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Piatok"
 
@@ -2376,7 +2411,7 @@ msgid "Mon"
 msgstr "Pon"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:974
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Pondelok"
 
@@ -2397,7 +2432,7 @@ msgid "Sat"
 msgstr "So"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:979
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Sobota"
 
@@ -2418,7 +2453,7 @@ msgid "Sun"
 msgstr "Ne"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:980
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Nede╣a"
 
@@ -2435,7 +2470,7 @@ msgid "Thu"
 msgstr "╘tv"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:977
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "╘tvrtok"
 
@@ -2460,7 +2495,7 @@ msgid "Tue"
 msgstr "Ut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:975
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "Utorok"
 
@@ -2469,7 +2504,7 @@ msgid "Wed"
 msgstr "Str"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:976
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Streda"
 
@@ -2542,27 +2577,27 @@ msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Neurobili ste ╬iadne zmeny. Aktualizova╩ editor?"
 
 #: calendar/gui/dialogs/comp-editor-util.c:154
-#: calendar/gui/e-itip-control.c:618 calendar/gui/print.c:2116
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
 msgid " to "
 msgstr "u do "
 
 #: calendar/gui/dialogs/comp-editor-util.c:158
-#: calendar/gui/e-itip-control.c:622 calendar/gui/print.c:2120
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
 msgid " (Completed "
 msgstr " (DokonХenЩ "
 
 #: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:624 calendar/gui/print.c:2122
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
 msgid "Completed "
 msgstr "DokonХenЩ "
 
 #: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:629 calendar/gui/print.c:2127
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
 msgid " (Due "
 msgstr " (TermМn do "
 
 #: calendar/gui/dialogs/comp-editor-util.c:167
-#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2129
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
 msgid "Due "
 msgstr "TermМn do "
 
@@ -2589,12 +2624,12 @@ msgstr "Polo╬ka dennМka - %s"
 msgid "No summary"
 msgstr "╝iadny sЗhrn"
 
-#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1468
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
 #: mail/mail-display.c:98
 msgid "Overwrite file?"
 msgstr "PrepМsa╩ sЗbor?"
 
-#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1472
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
 #: mail/mail-display.c:102
 msgid ""
 "A file by that name already exists.\n"
@@ -2604,7 +2639,7 @@ msgstr ""
 "PrepМsa╩ ho?"
 
 #: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
-#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+#: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Ulo╬i╩ ako..."
 
@@ -2672,7 +2707,8 @@ msgid ""
 "zone.\n"
 " Use the right mouse button to zoom out."
 msgstr ""
-"Pomocou ╣avИho tlaХidla my╧i mТ╬ete zvДХ╧i╩ oblas╩ mapy a vybra╩ ХasovЗ zСnu.\n"
+"Pomocou ╣avИho tlaХidla my╧i mТ╬ete zvДХ╧i╩ oblas╩ mapy a vybra╩ ХasovЗ "
+"zСnu.\n"
 "Pre zmen╧enie pou╬ite pravИ tlaХidlo my╧i."
 
 #: calendar/gui/dialogs/event-editor.c:154
@@ -2735,11 +2771,135 @@ msgstr "хas _konca:"
 msgid "_Start time:"
 msgstr "хas _zaХiatku:"
 
-#: calendar/gui/dialogs/meeting-page.c:623
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Meno skupiny:"
+
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Zdroj"
+
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+#, fuzzy
+msgid "Chair"
+msgstr "Auto"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+#, fuzzy
+msgid "Required Participant"
+msgstr "PovinnИ informАcie"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+#, fuzzy
+msgid "Optional Participant"
+msgstr "NepovinnИ informАcie"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Vyberte akciu"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Accepted"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr "OdstrАnenИ"
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Predbe╬nЩ"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "OdstrАnenИ"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "Prebieha"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "TelefСn v aute"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "PovinnИ informАcie"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "NepovinnИ informАcie"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Non-Participants"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:891
 msgid "Sent By:"
 msgstr "PoslanИ:"
 
-#: calendar/gui/dialogs/meeting-page.c:1200
+#: calendar/gui/dialogs/meeting-page.c:1442
 msgid "_Delegate To..."
 msgstr "_Delegova╩ na..."
 
@@ -2776,13 +2936,13 @@ msgid "Role"
 msgstr "Rola"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:50
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
 #: mail/message-list.etspec.h:8
 msgid "Status"
 msgstr "Stav"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:100
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Typ"
@@ -2805,32 +2965,32 @@ msgstr "_Pozva╩ ostatnЩch"
 msgid "_Other Organizer"
 msgstr "_InЩ organizАtor"
 
-#: calendar/gui/dialogs/recurrence-page.c:434 calendar/gui/print.c:1839
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
 #: calendar/gui/print.c:1841 calendar/gui/print.c:1842
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/dialogs/recurrence-page.c:582
+#: calendar/gui/dialogs/recurrence-page.c:584
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "TАto schТdzka obsahuje opakovanie, ktorИ Evolution nedokА╬e upravi╩."
 
-#: calendar/gui/dialogs/recurrence-page.c:947
+#: calendar/gui/dialogs/recurrence-page.c:938
 msgid "on"
 msgstr "zapnutА"
 
-#: calendar/gui/dialogs/recurrence-page.c:973 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
 msgid "day"
 msgstr "deР"
 
-#: calendar/gui/dialogs/recurrence-page.c:1103
+#: calendar/gui/dialogs/recurrence-page.c:1094
 msgid "on the"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1111
+#: calendar/gui/dialogs/recurrence-page.c:1102
 msgid "th"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1281
+#: calendar/gui/dialogs/recurrence-page.c:1274
 msgid "occurrences"
 msgstr "vЩskytov"
 
@@ -2923,7 +3083,7 @@ msgid "No one"
 msgstr "╝iadna"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:902
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
@@ -2956,104 +3116,106 @@ msgstr "_Priorita:"
 msgid "_Status:"
 msgstr "_Stav:"
 
-#: calendar/gui/e-calendar-table.c:390
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:391
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:392
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:393
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:394
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:395
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:396
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:397
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:399
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:400
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:886
-msgid "Edit this task"
-msgstr "Upravi╩ tЗto Зlohu"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "_Otvori╩"
 
-#: calendar/gui/e-calendar-table.c:887 calendar/gui/e-calendar-table.c:897
-#: calendar/gui/e-day-view.c:3331 calendar/gui/e-week-view.c:3168
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-calendar.xml.h:10
-#: ui/evolution-mail-list.xml.h:4
-msgid "Cut"
-msgstr "VystrihnЗ╩"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "Vystri_hnЗ╩"
 
-#: calendar/gui/e-calendar-table.c:888 calendar/gui/e-calendar-table.c:898
-#: calendar/gui/e-day-view.c:3333 calendar/gui/e-week-view.c:3170
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-calendar.xml.h:5
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:5
-msgid "Copy"
-msgstr "KopМrova╩"
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_KopМrova╩"
 
-#: calendar/gui/e-calendar-table.c:889 calendar/gui/e-calendar-table.c:899
-#: calendar/gui/e-day-view.c:3306 calendar/gui/e-day-view.c:3335
-#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3172
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:26
-#: ui/evolution-mail-list.xml.h:12
-msgid "Paste"
-msgstr "Vlo╬i╩"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "_Vlo╬i╩"
 
-#: calendar/gui/e-calendar-table.c:891
-msgid "Mark as complete"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
 msgstr "OznaХi╩ ako dokonХenЗ"
 
-#: calendar/gui/e-calendar-table.c:892
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "OdstrАni╩ tЗto Зlohu"
 
-#: calendar/gui/e-calendar-table.c:901
-msgid "Mark tasks as complete"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
 msgstr "OznaХi╩ Зlohy ako dokonХenЗ"
 
-#: calendar/gui/e-calendar-table.c:902 ui/evolution-tasks.xml.h:6
-msgid "Delete selected tasks"
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "OdstrАni╩ vybranИ Зlohy"
 
-#: calendar/gui/e-calendar-table.c:1259
+#: calendar/gui/e-calendar-table.c:1137
 msgid "Click here to add a task"
 msgstr "KliknutМm pridАte Зlohu"
 
@@ -3127,13 +3289,6 @@ msgstr "%02i rozdelenМ minЗty"
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:289 calendar/gui/e-day-view.c:1344
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
 #: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
@@ -3153,122 +3308,124 @@ msgstr "dopoludnia"
 msgid "pm"
 msgstr "popoludnМ"
 
-#: calendar/gui/e-day-view.c:3311 ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "NovА schТdzka"
 
-#: calendar/gui/e-day-view.c:3313 calendar/gui/e-week-view.c:3151
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "NovА celodennА udalos╩"
 
 #: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-msgid "Go to Today"
-msgstr "Prejs╩ na dne╧nЩ dАtum"
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "Prejs╩ na d_ne╧nЩ dАtum"
 
 #: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
-msgid "Go to Date..."
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "Prejs╩ na dАtum..."
 
-#: calendar/gui/e-day-view.c:3327 calendar/gui/e-week-view.c:3164
-#: shell/e-shortcuts-view.c:468 ui/evolution-calendar.xml.h:24
-#: ui/evolution-message-composer.xml.h:12
-msgid "Open"
-msgstr "Otvori╩"
-
 #: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
-msgid "Delete this Appointment"
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "OdstrАni╩ tЗto schТdzku"
 
-#: calendar/gui/e-day-view.c:3344 calendar/gui/e-week-view.c:3186
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Nastavi╩ tento vЩskyt ako presunute╣nЩ"
 
-#: calendar/gui/e-day-view.c:3346 calendar/gui/e-week-view.c:3188
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "OdstrАni╩ tento vЩskyt"
 
-#: calendar/gui/e-day-view.c:3348
-msgid "Delete all Occurrences"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "OdstrАni╩ v╧etky vЩskyty"
 
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:694
 msgid "This is an event that can be added to your calendar."
 msgstr "Toto je udalos╩, ktorЗ je mo╬nИ prida╩ do vА╧ho kalendАra."
 
-#: calendar/gui/e-itip-control.c:688
+#: calendar/gui/e-itip-control.c:697
 msgid "This is a meeting request."
 msgstr "Toto je po╬iadavka na schТdzku."
 
-#: calendar/gui/e-itip-control.c:691
+#: calendar/gui/e-itip-control.c:700
 msgid "This is one or more additions to a current meeting."
 msgstr "Toto je jedna, alebo viacero Зprav aktuАlnej schТdzky."
 
-#: calendar/gui/e-itip-control.c:694
+#: calendar/gui/e-itip-control.c:703
 msgid "This is a request for the latest event information."
 msgstr "Toto je po╬iadavka na najnov╧ie informАcie o udalosti."
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:706
 msgid "This is a reply to a meeting request."
 msgstr "Toto je odpoveО na po╬iadavku na schТdzku."
 
-#: calendar/gui/e-itip-control.c:700
+#: calendar/gui/e-itip-control.c:709
 msgid "This is an event cancellation."
 msgstr "Toto je zru╧enie udalosti."
 
-#: calendar/gui/e-itip-control.c:703 calendar/gui/e-itip-control.c:743
-#: calendar/gui/e-itip-control.c:771
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 msgid "The message is not understandable."
 msgstr "TАto sprАva nie je k zrozumite╣nА."
 
-#: calendar/gui/e-itip-control.c:728
+#: calendar/gui/e-itip-control.c:737
 msgid "This is an task that can be added to your calendar."
 msgstr "Toto je Зloha, ktorА je mo╬nИ prida╩ do vА╧ho kalendАra."
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:740
 msgid "This is a task request."
 msgstr "Toto je po╬iadavka na Зlohu."
 
-#: calendar/gui/e-itip-control.c:734
+#: calendar/gui/e-itip-control.c:743
 msgid "This is a request for the latest task information."
 msgstr "Toto je po╬iadavka na najnov╧ie informАcie o Зlohe."
 
-#: calendar/gui/e-itip-control.c:737
+#: calendar/gui/e-itip-control.c:746
 msgid "This is a reply to a task request."
 msgstr "Toto je odpoveО na po╬iadavku na Зlohu."
 
-#: calendar/gui/e-itip-control.c:740
+#: calendar/gui/e-itip-control.c:749
 msgid "This is an task cancellation."
 msgstr "Toto je zru╧enie Зlohy."
 
-#: calendar/gui/e-itip-control.c:762
+#: calendar/gui/e-itip-control.c:771
 msgid "This is freebusy information."
 msgstr "Toto je informАcia o vo╣nom Хase."
 
-#: calendar/gui/e-itip-control.c:765
+#: calendar/gui/e-itip-control.c:774
 msgid "This is a request for freebusy information."
 msgstr "Toto je po╬iadavka na informАciu o vo╣nom Хase."
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:777
 msgid "This is a reply to a freebusy request."
 msgstr "Toto je odpoveО na po╬iadavku na vo╣nЩ Хas."
 
-#: calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:834
 msgid "The message does not appear to be properly formed"
 msgstr "SprАva vyzerА ako nesprАvna"
 
-#: calendar/gui/e-itip-control.c:844
+#: calendar/gui/e-itip-control.c:853
 msgid "The message contains only unsupported requests."
 msgstr "SprАva obsahuje iba nepodporovanИ po╬iadavky."
 
-#: calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:877
 msgid "The information contained in this attachment was not valid"
 msgstr "InformАcia obsiahnutА v tento prМlohe nie je platnА"
 
-#: calendar/gui/e-itip-control.c:978
+#: calendar/gui/e-itip-control.c:989
 msgid "I couldn't update your calendar file!\n"
 msgstr "Nie je mo╬nИ aktualizova╩ vА╧ sЗbor s kalendАrom!\n"
 
-#: calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1015
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Nie je mo╬nИ odstrАni╩ polo╬ku zo sЗboru s kalendАrom!\n"
 
@@ -3309,21 +3466,21 @@ msgstr "dАtum konca"
 msgid "date-start"
 msgstr "dАtum zaХiatku"
 
-#: calendar/gui/e-tasks.c:184 calendar/gui/e-tasks.c:521
-#: calendar/gui/e-tasks.c:554
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "V╧etky"
 
-#: calendar/gui/e-tasks.c:190
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "KategСria:"
 
-#: calendar/gui/e-tasks.c:329
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nepodarilo sa naХМta╩ Зlohy v `%s'"
 
-#: calendar/gui/e-tasks.c:341
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "MetСdy potrebnА pre naХМtanie `%s' nie je podporovanА"
@@ -3336,36 +3493,17 @@ msgstr "MetСdy potrebnА pre naХМtanie `%s' nie je podporovanА"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/e-week-view.c:3149 calendar/gui/e-week-view.c:3177
-msgid "New Appointment..."
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
 msgstr "NovА schТdzka..."
 
-#: calendar/gui/e-week-view.c:3190
-msgid "Delete All Occurrences"
-msgstr "OdstrАni╩ v╧etky vЩskyty"
-
-#: calendar/gui/gnome-cal.c:219
-msgid "Summary contains"
-msgstr "SЗhrn obsahuje"
-
-#: calendar/gui/gnome-cal.c:220
-msgid "Description contains"
-msgstr "Popis obsahuje"
-
-#: calendar/gui/gnome-cal.c:221
-msgid "Comment contains"
-msgstr "KomentАr obsahuje"
-
-#: calendar/gui/gnome-cal.c:222
-msgid "Has category"
-msgstr "MА kategСriu"
-
-#: calendar/gui/gnome-cal.c:1058
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nie je mo╬nИ otvori╩ prieХinok v `%s'"
 
-#: calendar/gui/gnome-cal.c:1069
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "MetСda nutnА k otvoreniu `%s' nie je podporovanА"
@@ -3426,7 +3564,7 @@ msgstr "September"
 msgid "_Go To Today"
 msgstr "_Prejs╩ na dne╧nЩ dАtum"
 
-#: calendar/gui/itip-utils.c:223
+#: calendar/gui/itip-utils.c:224
 msgid "An organizer must be set."
 msgstr "OrganizАtor musМ by╩ nastavenЩ."
 
@@ -3590,7 +3728,8 @@ msgstr "зlohy"
 
 #. Day
 #: calendar/gui/print.c:1815
-msgid "Current day (%a %b %d %Y)"
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "Dnes (%a %b %d %Y)"
 
 #: calendar/gui/print.c:1834 calendar/gui/print.c:1838
@@ -3602,18 +3741,20 @@ msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
 #: calendar/gui/print.c:1846
-#, c-format
-msgid "Current week (%s - %s)"
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Tento tЩ╬deР (%s - %s)"
 
 #. Month
 #: calendar/gui/print.c:1854
-msgid "Current month (%b %Y)"
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Tento mesiac (%b - %Y)"
 
 #. Year
 #: calendar/gui/print.c:1861
-msgid "Current year (%Y)"
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Tento rok (%Y)"
 
 #: calendar/gui/print.c:2200
@@ -3621,8 +3762,8 @@ msgid "Print Calendar"
 msgstr "TlaХi╩ kalendАr"
 
 #: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1829 my-evolution/e-summary.c:511
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:31
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "UkА╬ka pred tlaХou"
@@ -3635,7 +3776,7 @@ msgstr "TlaХi╩ polo╬ku"
 msgid "Print Setup"
 msgstr "Nastavenie tlaХiarne"
 
-#: calendar/gui/tasks-control.c:122
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "URI, ktorИ bude zobrazova╩ prieХinok Зloh"
 
@@ -3743,7 +3884,6 @@ msgid "Unable to process spool folder"
 msgstr "Nie je mo╬nИ spracova╩ prieХinok fronty"
 
 #: camel/camel-filter-driver.c:667
-#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "ZМskavam sprАvu %d (%d%%)"
 
@@ -4005,7 +4145,7 @@ msgstr "(neznАmy hostite╣)"
 
 #: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
 #: camel/camel-remote-store.c:484
-#: camel/providers/imap/camel-imap-command.c:296
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "OperАcia zru╧enА"
 
@@ -4086,7 +4226,8 @@ msgstr "SprАva challenge pre server neplatnА\n"
 
 #: camel/camel-sasl-digest-md5.c:825
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr "SprАva challenge pre server obsahovala neplatnЩ prvok \"Kvalita ochrany\"\n"
+msgstr ""
+"SprАva challenge pre server obsahovala neplatnЩ prvok \"Kvalita ochrany\"\n"
 
 #: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
@@ -4128,7 +4269,8 @@ msgstr "PrihlАsenie NT"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
-msgstr "TАto vo╣ba pripojМ na server pomocou hesiel prenА╧anЩch ako ХistЩ text."
+msgstr ""
+"TАto vo╣ba pripojМ na server pomocou hesiel prenА╧anЩch ako ХistЩ text."
 
 #: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
@@ -4296,26 +4438,26 @@ msgstr "╝iadna takА sprАva: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "NemТ╬ete skopМrova╩ sprАvy z tohto prieХinku s odpadkami."
 
-#: camel/providers/imap/camel-imap-command.c:241
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "NeoХakАvanА odpoveО od IMAP serveru: %s"
 
-#: camel/providers/imap/camel-imap-command.c:249
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP prМkaz zlyhal: %s"
 
-#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "OdpoveО serveru skonХila prМli╧ skoro."
 
-#: camel/providers/imap/camel-imap-command.c:507
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "OdpoveО IMAP serveru neobsahovala informАciu %s"
 
-#: camel/providers/imap/camel-imap-command.c:544
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "NeoХakАvanА odpoveО OK od IMAP serveru: %s"
@@ -4334,16 +4476,28 @@ msgstr "Nie je mo╬nИ naХМta╩ sЗhrn pre %s"
 msgid "Folder was destroyed and recreated on server."
 msgstr "PrieХinok bol zniХenЩ a znovu vytvorenЩ na serveri."
 
-#: camel/providers/imap/camel-imap-folder.c:430
-msgid "Scanning IMAP folder"
-msgstr "PrechАdzam prieХinok IMAP"
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "UkladАm %d sprАv"
 
-#: camel/providers/imap/camel-imap-folder.c:1483
-#: camel/providers/imap/camel-imap-folder.c:1769
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "TАto sprАva momentАlne nie je k dipozМcii"
 
-#: camel/providers/imap/camel-imap-folder.c:1802
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "PrechАdzam prieХinky v \"%s\""
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "Nie je mo╬nИ nАjs╩ telo sprАvy v odpovedi FETCH."
 
@@ -4352,7 +4506,7 @@ msgstr "Nie je mo╬nИ nАjs╩ telo sprАvy v odpovedi FETCH."
 msgid "Could not open cache directory: %s"
 msgstr "Nie je mo╬nИ otvori╩ prieХinok pre vyrovnАvaciu pamД╩: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:16
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "Kontrolujem novЗ po╧tu"
 
@@ -4378,7 +4532,8 @@ msgstr "Priestor mien"
 
 #: camel/providers/imap/camel-imap-provider.c:57
 msgid "Apply filters to new messages in INBOX on this server"
-msgstr "Aplikova╩ filtre na novИ sprАvy v prieХinku novej po╧ty na tomto serveri"
+msgstr ""
+"Aplikova╩ filtre na novИ sprАvy v prieХinku novej po╧ty na tomto serveri"
 
 #: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAPv4"
@@ -4390,7 +4545,8 @@ msgstr "Pre ХМtanie a ukladanie po╧ty na IMAP serveroch."
 
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "TАto vo╣ba pripojМ na IMAP server pomocou hesiel prenА╧anЩch ako ХistЩ text."
+msgstr ""
+"TАto vo╣ba pripojМ na IMAP server pomocou hesiel prenА╧anЩch ako ХistЩ text."
 
 #: camel/providers/imap/camel-imap-store.c:463
 #, c-format
@@ -4956,7 +5112,7 @@ msgstr "Necha╩ po╧tu na serveri"
 msgid "Delete after %s day(s)"
 msgstr "OdstrАni╩ po %s dРoch"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:65
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4988,7 +5144,8 @@ msgstr ""
 "tento protokol podporuje."
 
 #: camel/providers/pop3/camel-pop3-provider.c:91
-msgid "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+msgid ""
+"This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr "TАto vo╣ba vАs spojМ s POP serverom pomocou overenia Kerberos 4."
 
 #: camel/providers/pop3/camel-pop3-store.c:199
@@ -5048,7 +5205,7 @@ msgid "No such folder `%s'."
 msgstr "PrieХinok `%s' neexistuje."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -5100,7 +5257,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Prenos po╧ty pomocou programu sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:80
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -5154,7 +5311,8 @@ msgstr "Pou╬Мvate╣ nie je lokАlny, bude predanА pod╣a <forward-path>"
 
 #: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "Po╬adovanА po╧tovА akcia nevykonanА, po╧tovА schrАnka nie je k dispozМcii"
+msgstr ""
+"Po╬adovanА po╧tovА akcia nevykonanА, po╧tovА schrАnka nie je k dispozМcii"
 
 #: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
@@ -5382,7 +5540,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:131
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "prМloha"
 
@@ -5491,29 +5649,29 @@ msgstr ""
 "Chyba pri ХМtanМ sЗboru %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:869
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Ulo╬i╩ ako..."
 
-#: composer/e-msg-composer.c:878
+#: composer/e-msg-composer.c:882
 msgid "Warning!"
 msgstr "Varovanie!"
 
-#: composer/e-msg-composer.c:880
+#: composer/e-msg-composer.c:884
 msgid "File exists, overwrite?"
 msgstr "SЗbor existuje, prepМsa╩ ho?"
 
-#: composer/e-msg-composer.c:902
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Chyba pri ukladanМ sЗboru: %s"
 
-#: composer/e-msg-composer.c:922
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Chyba pri naХМtavanМ sЗboru: %s"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:997
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5521,16 +5679,16 @@ msgstr ""
 "Nei je mo╬nИ otvori╩ prieХinok na koncepty pre tento ЗХet.\n"
 "Chcete pou╬i╩ ╧tandardnЩ prieХinok na koncepty?"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1047
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Chyba pri prМstupe k sЗboru: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1055
 msgid "Unable to retrieve message from editor"
 msgstr "Nie je mo╬nИ zМska╩ sprАvu z editora"
 
-#: composer/e-msg-composer.c:1057
+#: composer/e-msg-composer.c:1061
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -5539,7 +5697,7 @@ msgstr ""
 "Nepodarilo sa h╣ada╩ v sЗbore: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1063
+#: composer/e-msg-composer.c:1067
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5548,7 +5706,7 @@ msgstr ""
 "Nepodarilo sa skrАti╩ sЗbor: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1072
+#: composer/e-msg-composer.c:1076
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5557,7 +5715,7 @@ msgstr ""
 "Chyba pri automatickom ukladanМ sprАv: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1169
+#: composer/e-msg-composer.c:1173
 msgid ""
 "Evolution has found unsaved files from a previous session.\n"
 "Would you like to attempt recovery?"
@@ -5565,7 +5723,7 @@ msgstr ""
 "Evolution na╧iel neulo╬enИ sЗbory z predchАdzajЗceho sedenia.\n"
 "Chcete sa pokЗsi╩ o ich zАchranu?"
 
-#: composer/e-msg-composer.c:1317
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5575,24 +5733,24 @@ msgstr ""
 "\n"
 "Chcete ulo╬i╩ zmeny?"
 
-#: composer/e-msg-composer.c:1324 data/evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
 #: shell/e-shell-view-menu.c:215
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1347
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Otvori╩ sЗbor"
 
-#: composer/e-msg-composer.c:1496
+#: composer/e-msg-composer.c:1500
 msgid "Insert File"
 msgstr "Vlo╬i╩ sЗbor"
 
-#: composer/e-msg-composer.c:1852 composer/e-msg-composer.c:2241
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "NapМsa╩ sprАvu"
 
-#: composer/e-msg-composer.c:2335
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "Nie je mo╬nИ vytvori╩ okno editora sprАv."
 
@@ -5818,7 +5976,7 @@ msgstr ""
 "ProsМm, vrА╩te sa a zadajte platnЩ prieХinok, kam doruХi╩ po╧tu."
 
 #: filter/filter-folder.c:225 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:768
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Vybra╩ prieХinok"
 
@@ -5879,14 +6037,14 @@ msgstr "prijatА"
 msgid "outgoing"
 msgstr "odoslanА"
 
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:7
-#: my-evolution/e-summary-preferences.c:1174
-#: my-evolution/e-summary-preferences.c:1226
-#: my-evolution/e-summary-preferences.c:1288
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
 msgid "Add"
 msgstr "Prida╩"
 
-#: filter/filter.glade.h:3 mail/mail-config.glade.h:33
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
 msgid "Edit"
 msgstr "Upravi╩"
 
@@ -6007,124 +6165,120 @@ msgid "Expression"
 msgstr "VЩraz"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "Preda╩ Оalej na adresu"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "DТle╬itИ"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "je"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "je viac ne╬"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "je menej ne╬"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "nie je"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Konferencia"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Telo sprАvy"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "HlaviХka sprАvy"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "SprАva bola prijatА"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "SprАva bola odoslanА"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "PresunЗ╩ do prieХinku"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr "dРa a po"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr "dРa a pred"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "PreХМtanА"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "AdresАti"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Regul. vЩraz"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "OdpovedanА"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:6
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "SkСre"
 
-#: filter/libfilter-i18n.h:43 mail/mail-callbacks.c:1062
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Odosielate╣"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Nastavi╩ stav"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:44
 msgid "Size (kB)"
 msgstr "Ve╣kos╩ (kB)"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "vyzerА ako"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:46
 msgid "Source Account"
 msgstr "ZdrojovЩ ЗХet"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr "╘pecifickА hlaviХka"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:48
 msgid "starts with"
 msgstr "zaХМna na"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Zastavi╩ spracovanie"
 
-#: filter/libfilter-i18n.h:52 mail/mail-format.c:860
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Predmet"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "bolo po"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:53
 msgid "was before"
 msgstr "bolo pred"
 
@@ -6248,11 +6402,21 @@ msgstr "Rozhranie pre nastavenie po╧ty"
 msgid "This folder cannot contain messages."
 msgstr "Tento prieХinok nemТ╬e obsahova╩ sprАvy."
 
-#: mail/component-factory.c:727
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "_Vlastnosti..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "ZmenМ vlastnosti tohto prieХinku"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nie je mo╬nИ inicializova╩ po╧tovЩ komponent Evolution."
 
-#: mail/component-factory.c:864
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr "Nie je mo╬nИ zaregistrova╩ sklad u shellu"
 
@@ -6265,134 +6429,130 @@ msgstr "Vlastnosti \"%s\""
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: mail/folder-browser.c:227 mail/mail-display.c:277
+#: mail/folder-browser.c:231 mail/mail-display.c:278
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nie je mo╬nИ vytvori╩ doХasnЩ prieХinok: %s"
 
-#: mail/folder-browser.c:889
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "Ulo╬i╩ h╣adanie ako vPrieХinok"
 
-#: mail/folder-browser.c:1234
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr "VprieХinok na _predmet"
 
-#: mail/folder-browser.c:1237
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "VprieХinok na _odosielate╣a"
 
-#: mail/folder-browser.c:1240
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "VprieХinok na _adresАtov"
 
-#: mail/folder-browser.c:1243
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr "VPrieХinok na _konferenciu"
 
-#: mail/folder-browser.c:1249
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "Filter na _predmet"
 
-#: mail/folder-browser.c:1252
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "Filter na o_dosielate╣ovi"
 
-#: mail/folder-browser.c:1255
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "Filter na _adresАtoch"
 
-#: mail/folder-browser.c:1258
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "Filter na _konferenciu"
 
-#: mail/folder-browser.c:1267
-msgid "_Open"
-msgstr "_Otvori╩"
-
-#: mail/folder-browser.c:1269
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Znovuposla╩"
 
-#: mail/folder-browser.c:1271 ui/evolution-calendar.xml.h:54
-#: ui/evolution-mail-message.xml.h:87 ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Ulo╬i╩ _ako..."
 
-#: mail/folder-browser.c:1273 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "_TlaХi╩"
 
-#: mail/folder-browser.c:1278 ui/evolution-mail-message.xml.h:86
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "_Odpoveda╩ odosielate╣ovi"
 
-#: mail/folder-browser.c:1280 ui/evolution-mail-message.xml.h:62
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
 msgid "Reply to _List"
 msgstr "Odpoveda╩ _zoznamu"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:61
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "Odpoveda╩ _v╧etkЩm"
 
-#: mail/folder-browser.c:1284
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "Posla╩ О_alej"
 
-#: mail/folder-browser.c:1287 ui/evolution-mail-message.xml.h:39
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "OznaХi╩ ako _preХМtanЗ"
 
-#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:41
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "OznaХi╩ ako _nepreХМtanЗ"
 
-#: mail/folder-browser.c:1291
+#: mail/folder-browser.c:1295
 msgid "Mark as _Important"
 msgstr "OznaХi╩ ako _dТle╬itЗ"
 
-#: mail/folder-browser.c:1293
+#: mail/folder-browser.c:1297
 msgid "Mark as Unim_portant"
 msgstr "OznaХi╩ ako nedТ_le╬itЗ"
 
-#: mail/folder-browser.c:1298
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "Pre_sunЗ╩ do prieХinka..."
 
-#: mail/folder-browser.c:1300
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "_KopМrova╩ do prieХinku..."
 
-#: mail/folder-browser.c:1304 ui/evolution-mail-message.xml.h:88
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "Obnovi╩ _zmazanИ"
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1313
 msgid "Add Sender to Address Book"
 msgstr "Prida╩ odosielate╣a do adresАra"
 
-#: mail/folder-browser.c:1314
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Pou╬i╩ filtre"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "Vytvori╩ pra_vidlo zo sprАvy"
 
-#: mail/folder-browser.c:1475
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "Filter na konferenciu"
 
-#: mail/folder-browser.c:1476
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "VPrieХinok na konferenciu"
 
-#: mail/folder-browser.c:1478
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter na konferenciu (%s)"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VPrieХinok na konferenciu (%s)"
@@ -6461,11 +6621,11 @@ msgstr "Editor diskusnЩch skupМn Evolution"
 msgid "Evolution Account Editor"
 msgstr "Editor ЗХtov Evolution"
 
-#: mail/mail-account-gui.c:958
+#: mail/mail-account-gui.c:971
 msgid "Save signature"
 msgstr "Ulo╬i╩ podpis"
 
-#: mail/mail-account-gui.c:964
+#: mail/mail-account-gui.c:977
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -6483,7 +6643,7 @@ msgstr " (╧tandard)"
 msgid "Disable"
 msgstr "ZakАza╩"
 
-#: mail/mail-accounts.c:176 mail/mail-config.glade.h:37
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "Povoli╩"
 
@@ -6503,7 +6663,7 @@ msgstr "Naozaj odstrАni╩ ЗХet?"
 msgid "Are you sure you want to delete this news account?"
 msgstr "Naozaj chcete odstrАni╩ tento ЗХet diskusnЩch skupМn?"
 
-#. give our dialog an OK button and title
+#. give our dialog an Close button and title
 #: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "SprАvca ЗХtov Evolution"
@@ -6591,29 +6751,29 @@ msgstr "MusМte zada╩ adresАtov pre poslanie tejto sprАvy."
 msgid "You must configure an account before you can send this email."
 msgstr "MusМte nastavi╩ ЗХet pred poslanМm tejto sprАvy."
 
-#: mail/mail-callbacks.c:656
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "V %s, %s zapМsanИ:"
 
-#: mail/mail-callbacks.c:888
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "PredanА sprАva:\n"
 
-#: mail/mail-callbacks.c:982
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "PresunЗ╩ sprАvu do"
 
-#: mail/mail-callbacks.c:984
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "KopМrova╩ sprАvu do"
 
-#: mail/mail-callbacks.c:1345
+#: mail/mail-callbacks.c:1374
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Naozaj chcete upravi╩ v╧etkЩch %d sprАv?"
 
-#: mail/mail-callbacks.c:1367
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6621,7 +6781,7 @@ msgstr ""
 "Upravova╩ mТ╬ete iba sprАvy ulo╬enИ\n"
 "v prieХinku Koncepty."
 
-#: mail/mail-callbacks.c:1401
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6629,24 +6789,24 @@ msgstr ""
 "Iba sprАvy z prieХinku OdoslanИ je mo╬nИ\n"
 "znovu posla╩."
 
-#: mail/mail-callbacks.c:1413
+#: mail/mail-callbacks.c:1442
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Naozaj chcete znovu posla╩ v╧etkЩch %d sprАv?"
 
-#: mail/mail-callbacks.c:1434
+#: mail/mail-callbacks.c:1463
 msgid "No Message Selected"
 msgstr "╝iadna vybranА sprАva"
 
-#: mail/mail-callbacks.c:1516
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Ulo╬i╩ sprАvu ako..."
 
-#: mail/mail-callbacks.c:1518
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Ulo╬i╩ sprАvy ako..."
 
-#: mail/mail-callbacks.c:1731
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6655,19 +6815,19 @@ msgstr ""
 "Chyba pri naХМtavanМ informАcie o filtroch:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1741
+#: mail/mail-callbacks.c:1776
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:1788
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "TlaХi╩ sprАvu"
 
-#: mail/mail-callbacks.c:1836
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "TlaХ sprАvy zlyhala"
 
-#: mail/mail-callbacks.c:1931
+#: mail/mail-callbacks.c:1966
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Naozaj chcete otvori╩ v╧etkЩch %d sprАv v samostatnЩch oknАch?"
@@ -6719,7 +6879,7 @@ msgstr ""
 msgid "Evolution Account Wizard"
 msgstr "Sprievodca ЗХtom Evolution"
 
-#: mail/mail-config.c:1560 mail/mail-config.c:1563
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
 msgid "Connecting to server..."
 msgstr "PripАjam sa na server..."
 
@@ -6732,58 +6892,63 @@ msgid " color"
 msgstr " farba"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "DigitАlny podpis nie je podporovanЩ touto ╧ifrou"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "зХet"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "InformАcia o ЗХte"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "SprАva ЗХtu"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "зХty"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr "V╬dy ╧ifrova╩ kСpiu sebe pri posielanМ ╧ifrovanej sprАvy"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr "V╬dy ╧ifrova╩ kСpiu sebe pri posielanМ ╧ifrovanej sprАvy"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:11
 msgid "Always load images off the net"
 msgstr "V╬dy naХМtava╩ obrАzky zo siete"
 
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "PrМloha"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Overenie"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Typ overenia:"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "Automaticky kontrolova╩ po╧tu ka╬dЩch"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid "Certificate ID:"
 msgstr "ID certifikАtu:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:18
 msgid "Composer"
 msgstr "Editor"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6799,264 +6964,269 @@ msgstr ""
 "\n"
 "KliknutМm na \"DokonХi╩\" ulo╬Мte va╧e nastavenie."
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "╘_tandardnИ"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:26
 msgid "Default Forward style is: "
 msgstr "╘tandardnЩ ╧tЩl \"Preda╩ Оalej\" je: "
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:27
 msgid "Default character set: "
 msgstr "╘tandardnА znakovА sada:"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr "DigitАlne IDs..."
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Hotovo"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "PrieХinok konceptov:"
 
-#: mail/mail-config.glade.h:34 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Upravi╩..."
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "E-mailovА adresa:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37
 msgid "Empty trash folders on exit"
 msgstr "VyprАzdni╩ prieХinky na Odpadky pri ukonХenМ"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "Povoli╩"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "CelИ meno:"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Get Digital ID..."
 msgstr "ZМska╩ digitАlne ID..."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "HTML Signature:"
 msgstr "HTML podpis:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Highlight citations with"
 msgstr "ZvЩrazni╩ citАcie pomocou"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Identita"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "In HTML mail"
 msgstr "v HTML po╧te"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "Inline"
 msgstr "v texte"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Load images if sender is in addressbook"
 msgstr "NaХМta╩ obrАzky ak je odosielate╣ v adresАri"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "Nastavenie po╧ty"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Mailbox location"
 msgstr "Umiestnenie po╧tovej schrАnky"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "Pou╬i╩ ho ako ╧tandardnЩ ЗХet"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Mark messages as Read after"
 msgstr "OznaХi╩ sprАvy ako \"PreХМtanИ\" po"
 
-#: mail/mail-config.glade.h:53
-msgid "Message list should display in a threaded fasion by default"
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Message list should display in a threaded fashion by default"
 msgstr "╘tandardne zobrazova╩ sprАvy ako vlАkna"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Message preview should be displayed by default"
 msgstr "╘tandardne zobrazova╩ nАh╣ad sprАvy"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "NNTP Server:"
 msgstr "NNTP server:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 msgid "Never load images off the net"
 msgstr "Nikdy nenaХМta╩ obrАzky zo siete"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "DiskusnИ skupiny"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "NepovinnИ informАcie"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "OrganizАcia:"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:65
 msgid "PGP Key ID:"
 msgstr "ID PGP k╣ЗХa:"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "Cesta k spustite╣nИmu sЗboru PGP:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Pick a color"
 msgstr "Vyberte farbu"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:71
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Prompt when sending messages with an empty subject"
 msgstr "PЩta╩ sa pri posielanМ sprАv bez predmetu"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Prompt when sending messages with only Bcc recipients defined"
 msgstr "PЩta╩ sa pri posielanМ sprАv s adresАtmi iba v Bcc"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 msgid "Quoted"
 msgstr "Citova╩"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "PrМjem po╧ty"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "PrijМmam po╧tu"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "Mo╬nosti prМjmu"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 msgid "Remember PGP Passphrase until exit"
 msgstr "PamДta╩ si heslo PGP pri ukonХenМ"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "PovinnИ informАcie"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 msgid "Secure MIME"
 msgstr "BezpeХnИ MIME"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Security"
 msgstr "BezpeХnos╩"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "Vyberte program PGP"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "Posiela╩ ╧tandardne ako HTML."
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "Posielanie po╧ty"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "Posielanie po╧ty"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "OdoslanИ"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr "OdoslanИ a koncepty"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "PrieХinok pre odoslanИ sprАvy:"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Nastavenie serveru"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Typ serveru:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Server vy╬aduje overenie"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "SЗbor s podpisom:"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:97
 msgid "Source"
 msgstr "Zdroj"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:98
 msgid "Source Information"
 msgstr "InformАcia o zdrojovom kСde"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Zdroje"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "╘peciАlne prieХinky"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr "╘tandardnЩ UnixovЩ sЗbor mbox"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "Pou╬i╩ bezpeХnИ pripojenie (SSL)"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Meno pou╬Мvate╣a:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -7066,15 +7236,15 @@ msgstr ""
 "\n"
 "KliknutМm \"оal╧М\" zaХneme."
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:112
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:113
 msgid "placeholder"
 msgstr "miesto"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:114
 msgid "seconds."
 msgstr "sekЗnd."
 
@@ -7114,53 +7284,53 @@ msgstr "Nepodarilo sa vytvori╩ kontext obАlky S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Nepodarilo sa vytvori╩ kontext dekСdovania S/MIME."
 
-#: mail/mail-display.c:220
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Ulo╬i╩ prМlohu"
 
-#: mail/mail-display.c:337
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Ulo╬i╩ na disk..."
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "Zobrazi╩ v texte"
 
-#: mail/mail-display.c:341
+#: mail/mail-display.c:342
 #, c-format
 msgid "Open in %s..."
 msgstr "Otvori╩ v %s..."
 
-#: mail/mail-display.c:398
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Zobrazi╩ v text (pomocou %s)"
 
-#: mail/mail-display.c:402
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Skry╩"
 
-#: mail/mail-display.c:423
+#: mail/mail-display.c:424
 msgid "External Viewer"
 msgstr "ExternЩ zobrazovaХ"
 
-#: mail/mail-display.c:1047
+#: mail/mail-display.c:1048
 msgid "Loading message content"
 msgstr "NaХМtavam obsah sprАvy"
 
-#: mail/mail-display.c:1403
+#: mail/mail-display.c:1404
 msgid "Open Link in Browser"
 msgstr "Otvori╩ odkaz v prehliadaХi"
 
-#: mail/mail-display.c:1405
+#: mail/mail-display.c:1406
 msgid "Copy Link Location"
 msgstr "KopМrova╩ umiestnenie odkazu"
 
-#: mail/mail-display.c:1407
+#: mail/mail-display.c:1408
 msgid "Save Link as (FIXME)"
 msgstr "Ulo╬i╩ odkaz ako"
 
-#: mail/mail-display.c:1409
+#: mail/mail-display.c:1410
 msgid "Save Image as..."
 msgstr "Ulo╬i╩ obrАzok ako..."
 
@@ -7188,94 +7358,104 @@ msgstr "%d neposlanЩch"
 msgid "%d total"
 msgstr "celkovo %d"
 
-#: mail/mail-format.c:602
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s prМloha"
 
-#: mail/mail-format.c:651
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nie je mo╬nИ spracova╩ sprАvu MIME. Zobrazujem ako zdrojovЩ kСd."
 
-#: mail/mail-format.c:733 mail/message-list.etspec.h:2
+#: mail/mail-format.c:746
 msgid "Date"
 msgstr "DАtum"
 
-#: mail/mail-format.c:849 mail/message-list.etspec.h:4
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "E-mailovА adresa:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:867
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: mail/mail-format.c:855 mail/message-list.etspec.h:10
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Komu"
 
-#: mail/mail-format.c:858
+#: mail/mail-format.c:873
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1181
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "NenastavenЩ ╬iadny program GPG/PGP."
 
-#: mail/mail-format.c:1196
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "Za╧ifrovanА sprАva nie je zobrazenА"
 
-#: mail/mail-format.c:1202
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Za╧ifrovanА sprАva"
 
-#: mail/mail-format.c:1203
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Kliknite na ikonu pre de╧ifrovanie."
 
-#: mail/mail-format.c:1259
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "TАto sprАva je digitАlne podpМsanА a podpis je platnЩ."
 
-#: mail/mail-format.c:1267
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "TАto sprАva je digitАlne podpМsanА ale podpis nie je platnЩ."
 
-#: mail/mail-format.c:1921
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Odkaz na FTP server (%s)"
 
-#: mail/mail-format.c:1933
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Odkaz na lokАlny sЗbor (%s) platnЩ na serveri \"%s\""
 
-#: mail/mail-format.c:1937
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Odkaz na lokАlny sЗbor (%s)"
 
-#: mail/mail-format.c:1971
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Odkaz na FTP server (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Odkaz na neznАme externИ dАta (typ \"%s\")"
 
-#: mail/mail-format.c:1976
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr "NesprАvna Хas╩ externИho tela."
 
-#: mail/mail-local.c:452
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "OtvАram '%s'"
 
-#: mail/mail-local.c:741
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "MenМ prieХinok \"%s\" na formАt \"%s\""
 
-#: mail/mail-local.c:862
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -7284,7 +7464,7 @@ msgstr ""
 "Nie je mo╬nИ ulo╬i╩ metainformАcie do prieХinku, asi zistМte,\n"
 "╬e ho nie je mo╬nИ ani otvori╩: %s"
 
-#: mail/mail-local.c:901
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -7292,16 +7472,16 @@ msgstr ""
 "Ak nemТ╬ete otvori╩ tЗto po╧tovЗ schrАnku, potom\n"
 "ju budete musie╩ opravi╩ ruХne."
 
-#: mail/mail-local.c:994
+#: mail/mail-local.c:1000
 msgid "You cannot change the format of a non-local folder."
 msgstr "NemТ╬ete zmeni╬ formАt nelokАlnych prieХinkov."
 
-#: mail/mail-local.c:1005
+#: mail/mail-local.c:1011
 #, c-format
 msgid "Reconfigure %s"
 msgstr "Znovu nastavi╩ %s"
 
-#: mail/mail-mt.c:184
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -7310,7 +7490,7 @@ msgstr ""
 "Chyba poХas '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:187
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -7319,7 +7499,7 @@ msgstr ""
 "Chyba pri vykonАvanМ operАcie:\n"
 "%s"
 
-#: mail/mail-mt.c:719
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Pracujem"
 
@@ -7438,7 +7618,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "UkladАm prМlohu"
 
-#: mail/mail-ops.c:2002
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7447,12 +7627,12 @@ msgstr ""
 "Nepodarilo sa vytvori╩ vЩstupnЩ sЗbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2030
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie je mo╬nИ zapМsa╩ dАta: %s"
 
-#: mail/mail-ops.c:2097
+#: mail/mail-ops.c:2101
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odpojujem sa od %s"
@@ -7517,36 +7697,29 @@ msgstr "Posielam"
 msgid "Cancelled."
 msgstr "Zru╧enИ."
 
-#: mail/mail-session.c:170
+#: mail/mail-session.c:171
 msgid "User canceled operation."
 msgstr "Pou╬Мvate╣ zru╧il operАciu."
 
-#: mail/mail-tools.c:159
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Nie je mo╬nИ vytvori╩ doХasnЗ po╧tovЗ schrАnku `%s': %s"
 
-#: mail/mail-tools.c:212
-msgid "[Fwd: No Subject]"
-msgstr "[Fwd: ╬iadny predmet]"
-
-#: mail/mail-tools.c:229
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "PredanА sprАva - %s"
 
-#: mail/mail-tools.c:231
-msgid "Forwarded message (no subject)"
-msgstr "PredanА sprАva (bez predmetu)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "SprАvy predanИ Оalej"
 
-#: mail/mail-tools.c:452
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
-"s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----SprАva poslanА Оalej-----<br><b>Od:</b> %s<br><b>Komu:</b> %"
-"s<br><b>Predmet:</b> %s<br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "SprАvy predanИ Оalej"
 
 #: mail/mail-vfolder.c:270
 msgid "VFolders"
@@ -7620,11 +7793,11 @@ msgstr "%b %d %Y"
 msgid "Updating message list"
 msgstr "Aktualizujem zoznam sprАv"
 
-#: mail/message-list.etspec.h:3
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "VyznaХenИ"
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "PrijatИ"
 
@@ -7696,31 +7869,32 @@ msgstr "%a %l:%M%p"
 msgid "Mail summary"
 msgstr "SЗhrn po╧ty"
 
-#: my-evolution/e-summary-preferences.c:424
+#: my-evolution/e-summary-preferences.c:420
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Slovo dРa"
 
-#: my-evolution/e-summary-preferences.c:446
+#: my-evolution/e-summary-preferences.c:442
 msgid "Quotes of the Day"
 msgstr "CitАt dРa"
 
-#: my-evolution/e-summary-preferences.c:882
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "Prida╩ novЩ kanАl sprАv"
 
-#: my-evolution/e-summary-preferences.c:890
+#: my-evolution/e-summary-preferences.c:877
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Zadajte URL novИho kanАlu sprАv, ktorЩ chcete prida╩"
 
-#: my-evolution/e-summary-preferences.c:1425
+#: my-evolution/e-summary-preferences.c:1408
 msgid "My Evolution Settings"
 msgstr "Nastavenie pre Moje Evolution"
 
-#: my-evolution/e-summary-rdf.c:311
-msgid "There was an error downloading news feed</b></dt>"
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
 msgstr "Nastala chyba poХas naХМtavania kanАla sprАv.</b></dt>"
 
-#: my-evolution/e-summary-rdf.c:393 my-evolution/e-summary-rdf.c:419
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b> Chyba naХМtavania RDF</b>"
 
@@ -7756,38 +7930,6 @@ msgstr "TlaХ Mojej Evolution zlyhala"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Komponent sЗhrnu nemohol inicializova╩ Bonobo.\n"
 
-#: my-evolution/metar.c:29
-msgid "╟F"
-msgstr "╟F"
-
-#: my-evolution/metar.c:29
-msgid "╟C"
-msgstr "╟C"
-
-#: my-evolution/metar.c:33
-msgid "knots"
-msgstr "uzlov"
-
-#: my-evolution/metar.c:33
-msgid "kph"
-msgstr "kph"
-
-#: my-evolution/metar.c:38
-msgid "inHg"
-msgstr "inHg"
-
-#: my-evolution/metar.c:38
-msgid "mmHg"
-msgstr "mmHg"
-
-#: my-evolution/metar.c:41
-msgid "miles"
-msgstr "mМ╣"
-
-#: my-evolution/metar.c:41
-msgid "kilometers"
-msgstr "kilometrov"
-
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "JasnА obloha"
@@ -9035,14 +9177,10 @@ msgid "Weather settings"
 msgstr "Nastavenie poХasia"
 
 #: my-evolution/my-evolution.glade.h:27
-msgid "Wipe trackers"
-msgstr "VyХisti╩ sledovaХe"
-
-#: my-evolution/my-evolution.glade.h:28
 msgid "imperial"
 msgstr "imperiАlne"
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:28
 msgid "metric"
 msgstr "metrickИ"
 
@@ -9058,6 +9196,11 @@ msgstr "Zobrazi╩ detaily"
 msgid "Cancel Operation"
 msgstr "Zru╧i╩ operАciu"
 
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "╘peciАlne prieХinky"
+
 #: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "In╧talАcia Evolution"
@@ -9072,7 +9215,8 @@ msgstr ""
 
 #: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr "ProsМm, stlaХte \"OK\" pre in╧talАciu sЗborov, alebo \"Zru╧i╩\" pre koniec."
+msgstr ""
+"ProsМm, stlaХte \"OK\" pre in╧talАciu sЗborov, alebo \"Zru╧i╩\" pre koniec."
 
 #: shell/e-setup.c:170
 msgid "Could not update files correctly"
@@ -9185,7 +9329,7 @@ msgstr "Naozaj chcete odstrАni╩ prieХinok `%s'?"
 msgid "Rename folder '%s'"
 msgstr "Premenova╩ prieХinok '%s'"
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -9194,11 +9338,11 @@ msgstr ""
 "ZadanЩ prieХinok sa nedА vytvori╩:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "ZadanИ meno prieХinku nie je platnИ."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Vytvori╩ novЩ prieХinok"
 
@@ -9210,7 +9354,7 @@ msgstr ""
 "Typ vybranИho prieХinku nie je platnЩ\n"
 "pre po╬adovanЗ operАciu."
 
-#: shell/e-shell-folder-selection-dialog.c:332
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "NovА..."
 
@@ -9363,11 +9507,13 @@ msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vyberte prieХinok, kam mА skratka smerova╩:"
 
 #: shell/e-shell-view-menu.c:689
-msgid "Work online"
+#, fuzzy
+msgid "Work Online"
 msgstr "Pracova╩ on-line"
 
 #: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
-msgid "Work offline"
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
 msgstr "Pracova╩ off-line"
 
 #: shell/e-shell-view.c:175
@@ -9375,7 +9521,7 @@ msgid "(No folder displayed)"
 msgstr "(NezobrazenЩ ╬iadny prieХinok)"
 
 #. Special case for My Evolution
-#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1439
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
 msgid "My Evolution"
 msgstr "Moje Evolution"
 
@@ -9440,91 +9586,95 @@ msgstr ""
 msgid "Don't remove"
 msgstr "NeodstraРova╩"
 
-#: shell/e-shortcuts-view.c:297
+#: shell/e-shortcuts-view.c:300
 msgid "Rename Shortcut Group"
 msgstr "Premenova╩ skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:298
+#: shell/e-shortcuts-view.c:301
 msgid "Rename selected shortcut group to:"
 msgstr "Premenova╩ tЗto skupinu skratiek na:"
 
-#: shell/e-shortcuts-view.c:308
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "_MalИ ikony"
 
-#: shell/e-shortcuts-view.c:309
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Zobrazi╩ skratky ako malИ ikony"
 
-#: shell/e-shortcuts-view.c:311
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "_Ve╣kИ ikony"
 
-#: shell/e-shortcuts-view.c:312
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Zobrazi╩ skratky ako ve╣kИ ikony"
 
-#: shell/e-shortcuts-view.c:323
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_NovА skupina..."
 
-#: shell/e-shortcuts-view.c:324
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Vytvori╩ novЗ skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:326
+#: shell/e-shortcuts-view.c:332
 msgid "_Remove this Group..."
 msgstr "Odst_rАni╩ tЗto skupinu..."
 
-#: shell/e-shortcuts-view.c:327
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "OdstrАni╩ tЗto skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:335
 msgid "Re_name this Group..."
 msgstr "_Premenova╩ tЗto skupinu..."
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:336
 msgid "Rename this shortcut group"
 msgstr "Premenuje tЗto skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:335
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "_Skry╩ panel skratiek"
 
-#: shell/e-shortcuts-view.c:336
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Skry╩ panel skratiek"
 
-#: shell/e-shortcuts-view.c:455
+#: shell/e-shortcuts-view.c:461
 msgid "Rename shortcut"
 msgstr "Premenova╩ skratku"
 
-#: shell/e-shortcuts-view.c:456
+#: shell/e-shortcuts-view.c:462
 msgid "Rename selected shortcut to:"
 msgstr "Premenova╩ tЗto skratku na:"
 
-#: shell/e-shortcuts-view.c:468
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Otvori╩"
+
+#: shell/e-shortcuts-view.c:474
 msgid "Open the folder linked to this shortcut"
 msgstr "Otvori╩ prieХinok skratky v novom okn"
 
-#: shell/e-shortcuts-view.c:470 ui/evolution.xml.h:23
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Otvori╩ v novom okne"
 
-#: shell/e-shortcuts-view.c:470
+#: shell/e-shortcuts-view.c:476
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "OtvorМ prieХinok spojenЩ s touto skratkou v novom okne"
 
-#: shell/e-shortcuts-view.c:473
+#: shell/e-shortcuts-view.c:479
 msgid "Rename"
 msgstr "Premenova╩"
 
-#: shell/e-shortcuts-view.c:473
+#: shell/e-shortcuts-view.c:479
 msgid "Rename this shortcut"
 msgstr "Premenuje tЗto skratku"
 
-#: shell/e-shortcuts-view.c:475
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "OdstrАni╩ tЗto skratku z panelu skratiek"
 
@@ -9588,13 +9738,12 @@ msgstr "OperАcia nepodporovanА"
 msgid "The specified type is not supported in this storage"
 msgstr "UvedenЩ typ nie je podporovanЩ tЩmto skladom"
 
-#: shell/e-task-widget.c:169
+#: shell/e-task-widget.c:168
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:174
-#, c-format
+#: shell/e-task-widget.c:173
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% hotovЩch)"
 
@@ -9664,7 +9813,7 @@ msgstr "TЗto sprАvu u╬ nezobrazova╩"
 msgid "Evolution has found the following data sources:"
 msgstr "Evolution na╧la tieto zdroje dАt:"
 
-#: shell/main.c:92
+#: shell/main.c:96
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -9693,7 +9842,7 @@ msgstr ""
 "DЗfame, ╬e vАs pote╧ia vЩsledky na╧ej ╩a╬kej prАce a netrpezlivo\n"
 "ХakАme na vА╧ prМspevok!\n"
 
-#: shell/main.c:113
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -9701,28 +9850,28 @@ msgstr ""
 "VОaka\n"
 "TМm Evolution\n"
 
-#: shell/main.c:151
+#: shell/main.c:155
 msgid "Cannot access the Evolution shell."
 msgstr "Nie je mo╬nИ inicializova╩ shell Evolution."
 
-#: shell/main.c:211
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "ZakАza╩ ЗvodnИ okno"
 
-#: shell/main.c:212
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr "Posla╩ ladiaci vЩstup zo v╧etkЩch komponent od sЗboru."
 
-#: shell/main.c:247
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nie je mo╬nИ inicializova╩ komponentovЩ systИm Bonobo."
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:3
-#: ui/evolution-tasks.xml.h:1
-msgid "C_ut"
-msgstr "Vystri_hnЗ╩"
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "KopМrova╩"
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:6
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
 msgstr "SkopМruje vЩber"
 
@@ -9734,7 +9883,11 @@ msgstr "Vytvori╩ novЩ kontakt"
 msgid "Create new contact list"
 msgstr "Vytvori╩ novЩ zoznam kontaktov"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:11
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "VystrihnЗ╩"
+
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
 msgid "Cut the selection"
 msgstr "Vystrihne vЩber"
 
@@ -9750,7 +9903,11 @@ msgstr "NovЩ kontakt"
 msgid "New list"
 msgstr "NovЩ zoznam"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:27
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Vlo╬i╩"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Vlo╬М obsah schrАnky"
 
@@ -9790,17 +9947,7 @@ msgstr "_Kontakt"
 msgid "_Contact Group"
 msgstr "Skupina _kontaktov"
 
-#: ui/evolution-addressbook.xml.h:25 ui/evolution-calendar.xml.h:47
-#: ui/evolution-tasks.xml.h:14
-msgid "_Copy"
-msgstr "_KopМrova╩"
-
-#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:52
-#: ui/evolution-tasks.xml.h:16
-msgid "_Paste"
-msgstr "_Vlo╬i╩"
-
-#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:53
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
 #: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "_TlaХi╩..."
@@ -9813,165 +9960,120 @@ msgstr "_H╣ada╩ kontakty"
 msgid "_Select All"
 msgstr "Vybra╩ _v╧etko"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:55
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
 #: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_NАstroje"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 dnМ"
-
 #: ui/evolution-calendar.xml.h:2
-msgid "Alter preferences"
-msgstr "Zmeni╩ nastavenie"
+msgid "Configure the calendar's settings"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new all day Event"
+#: ui/evolution-calendar.xml.h:4
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "Vytvori╩ novЗ celodennЗ udalos╩"
 
-#: ui/evolution-calendar.xml.h:8
-msgid "Create a new appointment"
+#: ui/evolution-calendar.xml.h:5
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Vytvori╩ novЗ schТdzku"
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Create a new calendar"
-msgstr "Vytvori╩ novЩ kalendАr"
+#: ui/evolution-calendar.xml.h:6
+msgid "Create a new appointment"
+msgstr "Vytvori╩ novЗ schТdzku"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr "DeР"
+#: ui/evolution-calendar.xml.h:7
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Prejs╩ na"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Prejs╩ dozadu"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Prejs╩ dopredu"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "Prejs╩ na _dАtum"
 
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to _Today"
-msgstr "Prejs╩ na d_ne╧nЩ dАtum"
-
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Prejs╩ na zadanЩ dАtum"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Prejs╩ na aktuАlny Хas"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Month"
-msgstr "Mesiac"
-
-#: ui/evolution-calendar.xml.h:22
-msgid "New _Event"
-msgstr "NovА _udalos╩"
-
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail-message.xml.h:50
-msgid "Next"
-msgstr "Nasl"
-
-#: ui/evolution-calendar.xml.h:25
-msgid "Open Calendar"
-msgstr "Otvori╩ kalendАr"
-
-#: ui/evolution-calendar.xml.h:28
-msgid "Prev"
-msgstr "Pred"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "NovА schТdzka"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "UkА╬ka kalendАra pred tlaХou"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "TlaХi╩ kalendАr"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "TlaХi╩ tento kalendАr"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy Information"
 msgstr "Publikova╩ informАcie o vo╣nom Хase"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:23
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publikova╩ informАcie o vo╣nom Хase pre tento kalendАr"
 
-#: ui/evolution-calendar.xml.h:36 ui/evolution-message-composer.xml.h:19
-msgid "Save As"
-msgstr "Ulo╬i╩ ako"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "Save calendar as something else"
-msgstr "Ulo╬i╩ kalendАr ako nieХo inИ"
-
-#: ui/evolution-calendar.xml.h:38
-msgid "Settings..."
-msgstr "Nastavenie..."
-
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Zobrazi╩ jeden deР"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Zobrazi╩ jeden mesiac"
 
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Zobrazi╩ jeden tЩ╬deР"
 
-#: ui/evolution-calendar.xml.h:42
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Zobrazi╩ pracovnЩ tЩ╬deР"
 
-#: ui/evolution-calendar.xml.h:43 widgets/misc/e-cell-date-edit.c:232
-#: widgets/misc/e-dateedit.c:429
-msgid "Today"
-msgstr "Dnes"
-
-#: ui/evolution-calendar.xml.h:44
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "P_racovnЩ tЩ╬deР"
 
-#: ui/evolution-calendar.xml.h:45
-msgid "Week"
-msgstr "TЩ╬deР"
-
-#: ui/evolution-calendar.xml.h:46
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "_SchТdzka"
 
-#: ui/evolution-calendar.xml.h:48
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "Nastavenie _po╧ty..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "_DeР"
 
-#: ui/evolution-calendar.xml.h:49
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "_Mesiac"
 
-#: ui/evolution-calendar.xml.h:50 ui/evolution.xml.h:56
-msgid "_New"
-msgstr "_NovЩ"
-
-#: ui/evolution-calendar.xml.h:51
-msgid "_Open Calendar"
-msgstr "_Otvori╩ kalendАr"
-
-#: ui/evolution-calendar.xml.h:56
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "_TЩ╬deР"
 
@@ -10000,7 +10102,7 @@ msgstr "HlavnЩ panel nАstrojov"
 msgid "Preview the printed item"
 msgstr "NАh╣ad polo╬ky pred tlaХou"
 
-#: ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
 msgid "Print Pre_view"
 msgstr "U_kА╬ka pred tlaХou"
 
@@ -10037,20 +10139,15 @@ msgstr "NastavМ strАnku pre aktuАlnu tlaХiareР"
 msgid "_Action"
 msgstr "A_kcia"
 
-#: ui/evolution-comp-editor.xml.h:21 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-contact-list-editor.xml.h:9
 #: ui/evolution-mail-messagedisplay.xml.h:10
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:49
 #: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:47
 msgid "_File"
 msgstr "_SЗbor"
 
-#: ui/evolution-comp-editor.xml.h:22 ui/evolution-signature-editor.xml.h:9
-#: ui/evolution.xml.h:51
-msgid "_Help"
-msgstr "_PomocnМk"
-
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "OdstrАni tЗto polo╬ku"
@@ -10070,7 +10167,7 @@ msgstr "TlaХi╩ _obАlku..."
 
 #: ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:4
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Ulo╬i╩ _ako..."
 
@@ -10167,78 +10264,83 @@ msgid "Compose"
 msgstr "NapМsa╩"
 
 #: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "NapМsa╩ sprАvu"
+
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit mail accounts and other preferences"
 msgstr "VytvorМ alebo upravМ po╧tovИ ЗХty a inИ nastavenia"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
 msgstr "VytvorМ alebo upravМ pravidlА pre filtrovanie novej po╧ty"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:7
 msgid "Create or edit virtual folder definitions"
 msgstr "VytvorМ alebo upravМ definМcie virtuАlnych prieХinkov"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
 msgstr "VyprАzdni╩ _Odpadky"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget _Passwords"
 msgstr "ZabudnЗ╩ _heslА"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:10
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "ZabudnЗ╩ ulo╬enИ heslА, tak╬e ich budete musie╩ znovu zada╩"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:11
 msgid "Manage _Subscriptions..."
 msgstr "SprАva _prihlАsenМ..."
 
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:12
 msgid "Open a window for composing a mail message"
 msgstr "OtvorМ okno pre pМsanie sprАvy"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:13
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Trvalo odstrАni╩ v╧etky zmazanИ sprАvy zo v╧etkЩch prieХinkov"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send / Receive"
 msgstr "PrМjem / odoslanie"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Send queued mail and retrieve new mail"
 msgstr "Posla╩ neodoslanЗ po╧tu a prija╩ novЗ po╧tu"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "Zobrazi╩ okno s nАh╣adom sprАvy"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:17
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "PrihlАsi╩ alebo odhlАsi╩ prieХinky na vzdialenЩch serveroch"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor virtuАlneho prieХinku..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Filters..."
 msgstr "_Filtre..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:20
 msgid "_Mail Message"
 msgstr "_Posla╩ sprАvu"
 
-#: ui/evolution-mail-global.xml.h:20
+#: ui/evolution-mail-global.xml.h:21
 msgid "_Mail Settings..."
 msgstr "Nastavenie _po╧ty..."
 
-#: ui/evolution-mail-global.xml.h:21
+#: ui/evolution-mail-global.xml.h:22
 msgid "_Preview Pane"
 msgstr "_NАh╣ad"
 
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:23
 msgid "_Send / Receive"
 msgstr "_Posla╩ / Prija╩"
 
@@ -10267,7 +10369,8 @@ msgid "Hide _Read Messages"
 msgstr "Skry╩ _preХМtanИ sprАvy"
 
 #: ui/evolution-mail-list.xml.h:9
-msgid "Hide deleted messages rather than displaying them with a line through them"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr "Skryje zmazanИ sprАvy namiesto zobrazenia ╧krtnutМm"
 
 #: ui/evolution-mail-list.xml.h:10
@@ -10486,167 +10589,207 @@ msgstr "PredА niekomu vybranЗ sprАvu"
 msgid "Forward the selected message to someone as an attachment"
 msgstr "PredА vybranЗ sprАvu niekomu ako prМlohu"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 msgid "Load _Images"
 msgstr "NahrАva╩ _obrАzky"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 msgid "Mark as I_mportant"
 msgstr "OznaХi╩ ako _dТle╬itИ"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:43
 msgid "Mark as Unimp_ortant"
 msgstr "OznaХi╩ ako nedТ_le╬itИ"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "OznaХМ vybranИ sprАvy ako u╬ preХМtanИ"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark the selected messages as important"
 msgstr "OznaХМ vybranИ sprАvy ako dТle╬itИ"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "OznaХМ vybranИ sprАvy ako nepreХМtanИ"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected messages as unimportant"
 msgstr "OznaХМ vybranИ sprАvy ako nedТle╬itИ"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages for deletion"
 msgstr "OznaХМ vybranИ sprАvy na zmazanie"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "PresunЗ╩"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "PresunЗ╩ vybranИ sprАvy do inИho prieХinku"
 
 #: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "Nasl"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Prejs╩ na nasledujЗcu dТle╬itЗ sprАvu"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "SprАva"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Vybra╩ _vlАkno"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "SprАva bez mena"
+
+#: ui/evolution-mail-message.xml.h:56
 msgid "Open the selected message in a new window"
 msgstr "OtvorМ aktuАlnu sprАvu v novom okne"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:57
 msgid "Open the selected message in the composer to re-send it"
 msgstr "OtvorМ vybranЗ sprАvu v composeri pre novИ poslanie"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:58
 msgid "Previews the message to be printed"
 msgstr "UkА╬ka sprАvy pred tlaХou"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Previous"
 msgstr "PredchАdzajЗca"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Prejs╩ na predchАdzajЗcu dТle╬itЗ sprАvu"
+
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "TlaХi╩ sprАvu"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Prejs╩ na predchАdzajЗcu nepreХМtanЗ sprАvu"
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Print Message..."
 msgstr "TlaХi╩ sprАvu..."
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:65
 msgid "Print Preview..."
 msgstr "NАh╣ad..."
 
-#: ui/evolution-mail-message.xml.h:58
-msgid "Print message to the printer"
-msgstr "TlaХi╩ sprАvu na tlaХiarni"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "TlaХi╩ sprАvu"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply"
 msgstr "Odpoveda╩"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:68
 msgid "Reply to All"
 msgstr "Odpoveda╩ v╧etkЩm"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:71
 msgid "S_earch Message"
 msgstr "_NАjs╩ sprАvu"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:72
 msgid "Save the message as a text file"
 msgstr "Ulo╬i╩ sprАvu do textovИho sЗboru"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:73
 msgid "Search for text in the body of the displayed message"
 msgstr "H╣adА v texte zobrazenej sprАvy"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "Zobrazi╩ zdrojovЩ _kСd sprАvy"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:75
 msgid "Show Full _Headers"
 msgstr "Zobrazi╩ З_plnИ hlaviХky"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:76
 msgid "Show message in the normal style"
 msgstr "Zobrazi╩ sprАvu normАlne"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:77
 msgid "Show message with all email headers"
 msgstr "Zobrazi╩ sprАvu so v╧etkЩmi hlaviХkami"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:78
 msgid "Show the raw email source of the message"
 msgstr "Zobrazi╩ zdrojovЩ po╧tovЩ formАt v sprАve"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "Obnovi╩ vybranИ sprАvy"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:80
 msgid "VFolder on Mailing _List..."
 msgstr "VPrieХinok na _konferenciu..."
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:81
 msgid "VFolder on Se_nder..."
 msgstr "VprieХinok na _odosielate╣a..."
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:82
 msgid "VFolder on _Recipients..."
 msgstr "VprieХinok na _adresАtov..."
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:83
 msgid "VFolder on _Subject..."
 msgstr "VprieХinok na _predmet..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_Pou╬i╩ filtre"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Copy to Folder"
 msgstr "_KopМrova╩ do prieХinku"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "Vytvori╩ _filter zo sprАvy"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:88
 msgid "_Forward Message"
 msgstr "SprАvy _predanИ Оalej"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:89
 msgid "_Message Display"
 msgstr "Zobrazenie _sprАvy"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Move to Folder"
 msgstr "_PresunЗ╩ do prieХinku"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Normal Display"
 msgstr "_NormАlne zobrazenie"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Open Message"
 msgstr "_Otvori╩ sprАvu"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Re-send Message"
 msgstr "_Znovu posla╩ sprАvu"
 
@@ -10667,7 +10810,7 @@ msgid "Customize toolbars"
 msgstr "PrispТsobi╩ panely nАstrojov"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:42
 msgid "_Close"
@@ -10707,153 +10850,159 @@ msgid "HTML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "Vlo╬i╩ textovЩ sЗbor...."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Vlo╬i╩ sЗbor ako text do sprАvy"
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Vlo╬i╩ textovЩ sЗbor...."
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Otvorц╜ sЗbor"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "╘ifrovanie PGP"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "Podpis PGP"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
 msgstr "╘ifrovanie S/MIME"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr "Podpis S/MIME"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:19
 #: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
 msgid "Save"
 msgstr "Ulo╬i╩"
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Ulo╬i╩ ako"
+
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save _Draft"
 msgstr "Ulo╬i╩ _koncept"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Ulo╬i╩ v prieХinku..."
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:24
 #: ui/evolution-signature-editor.xml.h:4
 msgid "Save the current file"
 msgstr "Ulo╬i╩ aktuАlny sЗbor"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Ulo╬М aktuАlny sЗbor pod inЩm menom"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Ulo╬i╩ sprАvu do danИho prieХinku"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Posla╩"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Posla╩ _neskТr"
 
-#: ui/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Posla╩ _neskТr"
 
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Posla╩ sprАvu vo formАte HTML"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Posla╩ sprАvu neskТr"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Posla╩ tЗto sprАvu hneО"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Zobrazi╩ / Skry╩ prМlohy"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Zobrazi╩ _prМlohy"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Zobrazi╩ prМlohy"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "PodpМsa╩ tЗto sprАvu k╣ЗХom PGP"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:37
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "PodpМsa╩ tЗto sprАvu podpisovЩm certifikАtor S/MIME"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Prepne, Хi mА by╩ zobrazenИ pole BCC"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the CC field is displayed"
 msgstr "Prepne, Хi mА by╩ zobrazenИ pole CC"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Prepne, Хi mА by╩ zobrazenИ pole pre vЩber odosielate╣a"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Prepne, Хi mА by╩ zobrazenИ pole Reply-to"
 
-#: ui/evolution-message-composer.xml.h:41
-msgid "_Attachment"
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
 msgstr "_PrМloha"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "Pole _BCC"
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "Pole _CC"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
 #: ui/evolution-signature-editor.xml.h:6
 msgid "_Debug"
 msgstr "_Ladi╩"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
 msgstr "_OdstrАni╩ v╧etky"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "Pole _Od"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:51
 #: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Vlo╬i╩"
 
-#: ui/evolution-message-composer.xml.h:51
-msgid "_Insert text file..."
-msgstr "_Vlo╬i╩ textovЩ sЗbor...."
-
 #: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Otvori╩..."
@@ -10866,6 +11015,10 @@ msgstr "Pole _Reply-To"
 msgid "_Security"
 msgstr "Za_bezpeХenie"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "_PomocnМk"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Prida╩ prieХinok do zoznamu prihlАsenЩch prieХinkov"
@@ -10907,40 +11060,41 @@ msgid "Re_fresh Task"
 msgstr "O_bnovi╩ Зlohu"
 
 #: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "KopМruje vybranЗ Зlohu"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "VytvorМ novЗ Зlohu"
 
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Vystihne vybranЗ Зlohu"
 
 #: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
+msgstr "OdstrАni╩ vybranИ Зlohy"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "NovА Зloha"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Paste task from the clipboard"
 msgstr "Vlo╬М Зlohu zo schrАnky"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Ulo╬i╩ Зlohu ako nieХo inИ"
 
-#: ui/evolution-tasks.xml.h:11
-msgid "Set task view preferences"
-msgstr "Nastavenie poh╣adu Зloh"
-
-#: ui/evolution-tasks.xml.h:12
-msgid "Tasks Preferences..."
-msgstr "Nastavenie Зloh..."
-
 #: ui/evolution-tasks.xml.h:13
-msgid "TasksPreferences"
-msgstr "Nastavenie Зloh"
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "Nastavenie _po╧ty..."
 
 #: ui/evolution-tasks.xml.h:19
 msgid "_Task"
@@ -11066,10 +11220,6 @@ msgstr "Pomocou _Po╧ty "
 msgid "View the selected folder"
 msgstr "Zobrazi╩ vybranЩ prieХinok"
 
-#: ui/evolution.xml.h:38
-msgid "Work Offline"
-msgstr "Pracova╩ off-line"
-
 #: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "O _Evolution..."
@@ -11110,6 +11260,10 @@ msgstr "_Posla╩ sprАvu"
 msgid "_Move..."
 msgstr "_PresunЗ╩..."
 
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_NovЩ"
+
 #: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "NovЩ _prieХinok"
@@ -11181,10 +11335,6 @@ msgstr "S kategСriou"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "Predbe╬nЩ"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "ZaneprАzdnenЩ"
@@ -11267,19 +11417,18 @@ msgstr "Definova╩ poh╣ady"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:427
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "PUS╘PSN"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1067 widgets/misc/e-calendar-item.c:2766
-msgid "%B %Y"
-msgstr "%B %Y"
-
 #: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Teraz"
 
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Dnes"
+
 #: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
@@ -11378,11 +11527,11 @@ msgstr "Ulo╬i╩ h╣adanie"
 msgid "Advanced Search"
 msgstr "PokroХilИ h╣adanie"
 
-#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Zobrazi╩ v╧etko"
 
-#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "PokroХilИ..."
 
@@ -11435,3 +11584,135 @@ msgstr "init_corba(): Nie je mo╬nИ inicializova╩ GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Nie je mo╬nИ inicializova╩ Bonobo"
 
+#~ msgid "Set task view preferences"
+#~ msgstr "Nastavenie poh╣adu Зloh"
+
+#~ msgid "TasksPreferences"
+#~ msgstr "Nastavenie Зloh"
+
+#~ msgid "(none)"
+#~ msgstr "(niХ)"
+
+#~ msgid "File not found"
+#~ msgstr "SЗbor nenАjdenЩ"
+
+#~ msgid "Open calendar"
+#~ msgstr "Otvori╩ kalendАr"
+
+#~ msgid "Save calendar"
+#~ msgstr "Ulo╬i╩ kalendАr"
+
+#~ msgid "Edit this task"
+#~ msgstr "Upravi╩ tЗto Зlohu"
+
+#~ msgid "Go to Today"
+#~ msgstr "Prejs╩ na dne╧nЩ dАtum"
+
+#~ msgid "Delete all Occurrences"
+#~ msgstr "OdstrАni╩ v╧etky vЩskyty"
+
+#~ msgid "Summary contains"
+#~ msgstr "SЗhrn obsahuje"
+
+#~ msgid "Description contains"
+#~ msgstr "Popis obsahuje"
+
+#~ msgid "Comment contains"
+#~ msgstr "KomentАr obsahuje"
+
+#~ msgid "Has category"
+#~ msgstr "MА kategСriu"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "PrechАdzam prieХinok IMAP"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Preda╩ Оalej na adresu"
+
+#~ msgid "[Fwd: No Subject]"
+#~ msgstr "[Fwd: ╬iadny predmet]"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "PredanА sprАva (bez predmetu)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----SprАva poslanА Оalej-----<br><b>Od:</b> %s<br><b>Komu:</b> "
+#~ "%s<br><b>Predmet:</b> %s<br>"
+
+#~ msgid "╟F"
+#~ msgstr "╟F"
+
+#~ msgid "╟C"
+#~ msgstr "╟C"
+
+#~ msgid "knots"
+#~ msgstr "uzlov"
+
+#~ msgid "kph"
+#~ msgstr "kph"
+
+#~ msgid "inHg"
+#~ msgstr "inHg"
+
+#~ msgid "mmHg"
+#~ msgstr "mmHg"
+
+#~ msgid "miles"
+#~ msgstr "mМ╣"
+
+#~ msgid "kilometers"
+#~ msgstr "kilometrov"
+
+#~ msgid "Wipe trackers"
+#~ msgstr "VyХisti╩ sledovaХe"
+
+#~ msgid "Work offline"
+#~ msgstr "Pracova╩ off-line"
+
+#~ msgid "5 Days"
+#~ msgstr "5 dnМ"
+
+#~ msgid "Alter preferences"
+#~ msgstr "Zmeni╩ nastavenie"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Vytvori╩ novЩ kalendАr"
+
+#~ msgid "Day"
+#~ msgstr "DeР"
+
+#~ msgid "Month"
+#~ msgstr "Mesiac"
+
+#~ msgid "New _Event"
+#~ msgstr "NovА _udalos╩"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Otvori╩ kalendАr"
+
+#~ msgid "Prev"
+#~ msgstr "Pred"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Ulo╬i╩ kalendАr ako nieХo inИ"
+
+#~ msgid "Settings..."
+#~ msgstr "Nastavenie..."
+
+#~ msgid "Week"
+#~ msgstr "TЩ╬deР"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Otvori╩ kalendАr"
+
+#~ msgid "Print message to the printer"
+#~ msgstr "TlaХi╩ sprАvu na tlaХiarni"
+
+#~ msgid "_Insert text file..."
+#~ msgstr "_Vlo╬i╩ textovЩ sЗbor...."
+
+#~ msgid "Tasks Preferences..."
+#~ msgstr "Nastavenie Зloh..."
diff --git a/po/sl.po b/po/sl.po
index 20cb147994..2739adea32 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-07-05 14:17+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2000-07-28 03:15+0200\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -13,11 +13,19 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3546
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr "Tovarna uvozov datotek eVizitk v Evolucijo."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr "Uvozi datoteke eVizitk v Evolucijo. "
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Vizitka: "
 
-#: addressbook/backend/ebook/e-card.c:3548
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +33,7 @@ msgstr ""
 "\n"
 "Ime: "
 
-#: addressbook/backend/ebook/e-card.c:3549
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,7 +41,7 @@ msgstr ""
 "\n"
 "  Predpona:   "
 
-#: addressbook/backend/ebook/e-card.c:3550
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -41,7 +49,7 @@ msgstr ""
 "\n"
 "  Dano:       "
 
-#: addressbook/backend/ebook/e-card.c:3551
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -49,7 +57,7 @@ msgstr ""
 "\n"
 "  Dodatno:    "
 
-#: addressbook/backend/ebook/e-card.c:3552
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -57,7 +65,7 @@ msgstr ""
 "\n"
 "  Dru╬insko:     "
 
-#: addressbook/backend/ebook/e-card.c:3553
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -65,7 +73,7 @@ msgstr ""
 "\n"
 "  Pripona:    "
 
-#: addressbook/backend/ebook/e-card.c:3567
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -73,7 +81,7 @@ msgstr ""
 "\n"
 "Datum rojstva: "
 
-#: addressbook/backend/ebook/e-card.c:3578
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -81,7 +89,7 @@ msgstr ""
 "\n"
 "Naslov:"
 
-#: addressbook/backend/ebook/e-card.c:3580
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -89,7 +97,7 @@ msgstr ""
 "\n"
 "  Po╧tni predal:  "
 
-#: addressbook/backend/ebook/e-card.c:3581
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -97,7 +105,7 @@ msgstr ""
 "\n"
 "  Interna:     "
 
-#: addressbook/backend/ebook/e-card.c:3582
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -105,7 +113,7 @@ msgstr ""
 "\n"
 "  Ulica:       "
 
-#: addressbook/backend/ebook/e-card.c:3583
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -113,7 +121,7 @@ msgstr ""
 "\n"
 "  Mesto:       "
 
-#: addressbook/backend/ebook/e-card.c:3584
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -121,7 +129,7 @@ msgstr ""
 "\n"
 "  Regija:      "
 
-#: addressbook/backend/ebook/e-card.c:3585
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -129,7 +137,7 @@ msgstr ""
 "\n"
 "  Po╧tna ╧tevilka: "
 
-#: addressbook/backend/ebook/e-card.c:3586
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -137,7 +145,7 @@ msgstr ""
 "\n"
 "  Dr╬ava:      "
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
@@ -145,7 +153,7 @@ msgstr ""
 "\n"
 "Dostavna oznaka: "
 
-#: addressbook/backend/ebook/e-card.c:3611
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -153,7 +161,7 @@ msgstr ""
 "\n"
 "Telefoni:\n"
 
-#: addressbook/backend/ebook/e-card.c:3614
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -161,7 +169,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3638
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -169,7 +177,7 @@ msgstr ""
 "\n"
 "E-naslov:\n"
 
-#: addressbook/backend/ebook/e-card.c:3641
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -177,7 +185,7 @@ msgstr ""
 "\n"
 "E-naslov:"
 
-#: addressbook/backend/ebook/e-card.c:3660
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -185,7 +193,7 @@ msgstr ""
 "\n"
 "Po╧tni program: "
 
-#: addressbook/backend/ebook/e-card.c:3666
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -193,7 +201,7 @@ msgstr ""
 "\n"
 "хasovni pas: "
 
-#: addressbook/backend/ebook/e-card.c:3674
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -201,7 +209,7 @@ msgstr ""
 "\n"
 "Geografski polo╬aj: "
 
-#: addressbook/backend/ebook/e-card.c:3678
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -209,7 +217,7 @@ msgstr ""
 "\n"
 "Poslovna vloga: "
 
-#: addressbook/backend/ebook/e-card.c:3690
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -217,7 +225,7 @@ msgstr ""
 "\n"
 "Organizacija: "
 
-#: addressbook/backend/ebook/e-card.c:3691
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -225,7 +233,7 @@ msgstr ""
 "\n"
 "  Ime:   "
 
-#: addressbook/backend/ebook/e-card.c:3692
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -233,7 +241,7 @@ msgstr ""
 "\n"
 "  Enota:  "
 
-#: addressbook/backend/ebook/e-card.c:3693
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -241,7 +249,7 @@ msgstr ""
 "\n"
 "  Enota2: "
 
-#: addressbook/backend/ebook/e-card.c:3694
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -249,7 +257,7 @@ msgstr ""
 "\n"
 "  Enota3: "
 
-#: addressbook/backend/ebook/e-card.c:3695
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -257,7 +265,7 @@ msgstr ""
 "\n"
 "  Enota4: "
 
-#: addressbook/backend/ebook/e-card.c:3699
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -265,7 +273,7 @@ msgstr ""
 "\n"
 "Kategorije: "
 
-#: addressbook/backend/ebook/e-card.c:3700
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -283,7 +291,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -291,7 +299,7 @@ msgstr ""
 "\n"
 "EnoliХen niz:  "
 
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -299,35 +307,23 @@ msgstr ""
 "\n"
 "Javni kljuХ: "
 
-#: addressbook/backend/ebook/e-card.c:3978
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr "VeХ eVizitk"
 
-#: addressbook/backend/ebook/e-card.c:3986
+#: addressbook/backend/ebook/e-card.c:4045
 #, c-format
 msgid "VCard for %s"
 msgstr "eVizitka za %s"
 
-#: addressbook/backend/ebook/e-destination.c:344
-msgid "???"
-msgstr "???"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "Tovarna uvozov datotek eVizitk v Evolucijo."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "Uvozi datoteke eVizitk v Evolucijo. "
-
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Nisem mogel inicializirati Bonoba"
@@ -341,14 +337,14 @@ msgid "EBook not loaded\n"
 msgstr "EKnjiga ni nalo╬ena\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Nisem mogel pognati stre╬nika wombat"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Nisem mogel pognati programa wombat"
 
@@ -357,264 +353,636 @@ msgstr "Nisem mogel pognati programa wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Nisem mogel prebrati Pilotovega adresarja"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr "Kontrola Bonobo za vznik naslova."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "Kontrola Bonobo za prikaz naslova."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "VzorХna kontrola Bonobo, ki prika╬e adresar."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Kontrola, ki prika╬e mini vizitko iz Evolucijinega adresarja."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "Evolucijina komponenta za urejanje stikov."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Tovarna za orodje mini vizitk adresarja"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Tovarna za prikazovalnik adresarjeve adrese"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr "Tovarna za Adresarjev vznik naslova"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr "Tovarna za Evolucijino komponento adresarja."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr "Tovarna za vzorХno kontrolo adresarja"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "Stre╬nik LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Datoteka"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Neznan tip adresarja"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "Brez (anonimni naХin)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Geslo"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Neznan naХin avtentifikacije"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "Osnovno"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "Ena"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "Poddrevo"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr "Neznan tip dosega"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr "Povezan z domeno:"
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr "FIXME Bind DN Help text here"
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Zapomni si geslo"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "Gostitelj:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr "FIXME Host help text here."
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "Kornsko ime domene:"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr "FIXME Root DN help text here."
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Vrata:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr "FIXME Port help text here."
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "Doseg iskanja:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Avtentifikacija:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr "Napredne mo╬nosti LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Pot:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr "FIXME Path help text here"
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "хe pot ne obstaja jo ustvari."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "Uredi adresar"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "Dodaj adresar"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+"Izberite tip adresarja, ki ga imate in vnestite potrebne podatke o njem."
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "Ime:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr "FIXME Name help text here"
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Opis:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr "FIXME Description help text here"
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "Dodaj"
+msgid "Addressbook Sources"
+msgstr "Viri adresarja"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Zbri╧i"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "Ime"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "_Uredi"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "Drugo stiki"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "Vpi╧ite geslo za %s"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Kliknite tu za odprtje adresarja"
+
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+"Ne morem odpreti tega adresarja. To pomeni, da \n"
+"ste vpisali neveljaven URI ali, da stre╬nik LDAP ne deluje"
+
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+"Ta razliХica Evolucije nima vgrajene podpore za LDAP.\n"
+"хe ╬elite v Evoluciji uporabljati LDAP, morate po tem,\n"
+"ko boste s spodnje povezave prenesli program OpenLDAP,\n"
+"Evolucijo prevesti iz izvorne kode CVS.\n"
+
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+"Nisem megel odpreti tega adresarja. Prosim preverite, ali \n"
+"pot obstaja in ali imate dovoljenje za dostop."
+
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
+msgstr "Katerokoli polje vsebuje"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "Ime vsebuje"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "E-naslov vsebuje"
+
+#: addressbook/gui/component/addressbook.c:557
+msgid "Category contains"
+msgstr "Kategorija vsebuje"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "URI, ki naj ga prika╬e brskalnik map"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "prvi e-naslov"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "E-naslov 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "E-naslov 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+msgid "Select an Action"
+msgstr "Izberi dejanje"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Ustvari nov stik \"%s\""
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Dodaj naslov k obstojeХemu stiku \"%s\""
+
+#: addressbook/gui/component/e-address-popup.c:859
+msgid "Querying Addressbook..."
+msgstr "Poizvedujem v adresarju..."
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "Uredi podatke stika"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "Dodaj k stikom"
+
+#: addressbook/gui/component/e-address-popup.c:989
+msgid "Merge E-Mail Address"
+msgstr "Zlij E-po╧tne naslove"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "IzkljuХi poizvedbe"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "VkljuХi poizvedbe (nevarno!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Evolucijin vmesnik za izibro imen iz adresarja."
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr "Tovarna Evolucijinih vmesnikov za izbiro imen iz adresarja"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Odstrani"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "Odstrani vse"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+msgid "Send HTML Mail?"
+msgstr "Po╧lji po╧to v obliki HTML?"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "Spremenjen stik:"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "Prejemniki sporoХila"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "Izberi imena"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+msgid "Select name from _folder:"
+msgstr "Izberi ime iz _mape:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "_Category:"
+msgstr "_Kategorija:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "I_skanje"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "Ob_letnica:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "V sl_u╬bi"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "Slu╬beni _faks"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "_Stiki..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 #: calendar/gui/dialogs/event-page.glade.h:2
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ka_tegorije..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Urejevalnik stikov"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
 #: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "Zavedi kot:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Splo╧no"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Nov tip telefona"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "Opom_be:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Organizacija:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Tipi telefonov"
 
-#: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:14
-#: addressbook/gui/contact-editor/e-contact-editor.c:1476
-msgid "Primary Email"
-msgstr "prvi e-naslov"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Wants to receive _HTML mail"
 msgstr "╝eli dobivati _HTML e-po╧to"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Naslov spletne strani:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:100
-msgid "_Add"
-msgstr "_Dodaj"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Address..."
 msgstr "_Naslov..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "_Ime pomoХnika:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "_Rojstni dan:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Slu╬beni"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "_Podjetje:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "_Stiki..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:1237 mail/mail-config.glade.h:101
-#: ui/evolution-mail-message.xml.h:78 ui/evolution-tasks.xml.h:15
-#: ui/evolution.xml.h:46
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Zbri╧i"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "O_ddelek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "_Polno Ime..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_Doma"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "Slu╬beni _naziv:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "Ime _managerja:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_Prenosni telefon"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "_Vzdevek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "Pi_sarna:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_Poklic:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "_Partner(ka):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "_To je po╧tni naslov"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:663
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Zbri╧i stik?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "Stik pripada sledeХim kategorijam:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1434
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "PomoХnik"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1435
-#: addressbook/gui/contact-editor/e-contact-editor.c:1502
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Slu╬ba"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1436
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Slu╬ba"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1437
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Slu╬beni faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1438
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Povratni klic"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1439
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Avto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1440
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Podjetje"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1441
-#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Doma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Doma 2"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1443
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "DomaХi faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1444
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1445
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Prenosni telefon"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1446
-#: addressbook/gui/contact-editor/e-contact-editor.c:1504
-#: mail/mail-config.glade.h:59
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "Drugo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1447
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "Drugi faks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1448
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Pozivnik"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1449
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Prvi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1450
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Radijo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1451
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1452
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1477
-#: addressbook/gui/widgets/e-addressbook-view.c:727
-msgid "Email 2"
-msgstr "E-naslov 2"
-
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1478
-#: addressbook/gui/widgets/e-addressbook-view.c:728
-msgid "Email 3"
-msgstr "E-naslov 3"
-
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Zbri╧i stik?"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Hitro dodaj stik"
@@ -624,7 +992,7 @@ msgid "Edit Full"
 msgstr "Uredi celoto"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Polno ime"
 
@@ -744,381 +1112,45 @@ msgstr "P_ripona:"
 msgid "_Title:"
 msgstr "_Naziv:"
 
-#: addressbook/gui/component/addressbook.c:345
-#, c-format
-msgid "Enter password for %s"
-msgstr "Vpi╧ite geslo za %s"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "Ime gostitelja:"
 
-#: addressbook/gui/component/addressbook.c:373
-msgid "Unable to open addressbook"
-msgstr "Kliknite tu za odprtje adresarja"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "december"
 
-#: addressbook/gui/component/addressbook.c:380
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or the LDAP server\n"
-"is down"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
-"Ne morem odpreti tega adresarja. To pomeni, da \n"
-"ste vpisali neveljaven URI ali, da stre╬nik LDAP ne deluje"
 
-#: addressbook/gui/component/addressbook.c:385
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
-"Ta razliХica Evolucije nima vgrajene podpore za LDAP.\n"
-"хe ╬elite v Evoluciji uporabljati LDAP, morate po tem,\n"
-"ko boste s spodnje povezave prenesli program OpenLDAP,\n"
-"Evolucijo prevesti iz izvorne kode CVS.\n"
 
-#: addressbook/gui/component/addressbook.c:393
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
-msgstr ""
-"Nisem megel odpreti tega adresarja. Prosim preverite, ali \n"
-"pot obstaja in ali imate dovoljenje za dostop."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+msgid "_Remove"
+msgstr "_Odstrani"
 
-#: addressbook/gui/component/addressbook.c:554 calendar/gui/gnome-cal.c:218
-msgid "Any field contains"
-msgstr "Katerokoli polje vsebuje"
-
-#: addressbook/gui/component/addressbook.c:555
-msgid "Name contains"
-msgstr "Ime vsebuje"
-
-#: addressbook/gui/component/addressbook.c:556
-msgid "Email contains"
-msgstr "E-naslov vsebuje"
-
-#: addressbook/gui/component/addressbook.c:557
-msgid "Category contains"
-msgstr "Kategorija vsebuje"
-
-#: addressbook/gui/component/addressbook.c:707
-msgid "The URI that the Folder Browser will display"
-msgstr "URI, ki naj ga prika╬e brskalnik map"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "Stre╬nik LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Datoteka"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Neznan tip adresarja"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "Brez (anonimni naХin)"
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:63
-msgid "Password"
-msgstr "Geslo"
-
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "Neznan naХin avtentifikacije"
-
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "Osnovno"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "Ena"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "Poddrevo"
-
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr "Neznan tip dosega"
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr "Povezan z domeno:"
-
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr "FIXME Bind DN Help text here"
-
-#: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:72
-msgid "Remember this password"
-msgstr "Zapomni si geslo"
-
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:42
-msgid "Host:"
-msgstr "Gostitelj:"
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr "FIXME Host help text here."
-
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "Kornsko ime domene:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr "FIXME Root DN help text here."
-
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "Vrata:"
-
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
-msgstr "FIXME Port help text here."
-
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
-msgstr "Doseg iskanja:"
-
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
-msgstr "Avtentifikacija:"
-
-#: addressbook/gui/component/addressbook-config.c:501
-msgid "Advanced LDAP Options"
-msgstr "Napredne mo╬nosti LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:64
-msgid "Path:"
-msgstr "Pot:"
-
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
-msgstr "FIXME Path help text here"
-
-#: addressbook/gui/component/addressbook-config.c:528
-msgid "Create path if it doesn't exist."
-msgstr "хe pot ne obstaja jo ustvari."
-
-#: addressbook/gui/component/addressbook-config.c:662
-msgid "Edit Addressbook"
-msgstr "Uredi adresar"
-
-#: addressbook/gui/component/addressbook-config.c:664
-msgid "Add Addressbook"
-msgstr "Dodaj adresar"
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"Izberite tip adresarja, ki ga imate in vnestite potrebne podatke o njem."
-
-#: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:53
-msgid "Name:"
-msgstr "Ime:"
-
-#: addressbook/gui/component/addressbook-config.c:689
-msgid "FIXME Name help text here"
-msgstr "FIXME Name help text here"
-
-#: addressbook/gui/component/addressbook-config.c:691
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Description:"
-msgstr "Opis:"
-
-#: addressbook/gui/component/addressbook-config.c:692
-msgid "FIXME Description help text here"
-msgstr "FIXME Description help text here"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Viri adresarja"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:606
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-#: calendar/gui/dialogs/recurrence-page.glade.h:5 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:27
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-mail-message.xml.h:16 ui/evolution-tasks.xml.h:5
-msgid "Delete"
-msgstr "Zbri╧i"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: filter/filter.glade.h:3 mail/mail-config.glade.h:33
-msgid "Edit"
-msgstr "Uredi"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "Ime"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
-msgstr "Drugo stiki"
-
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * card.
-#.
-#: addressbook/gui/component/e-address-popup.c:178
-msgid "(none)"
-msgstr "(brez)"
-
-#: addressbook/gui/component/e-address-popup.c:579
-msgid "Select an Action"
-msgstr "Izberi dejanje"
-
-#: addressbook/gui/component/e-address-popup.c:585
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Ustvari nov stik \"%s\""
-
-#: addressbook/gui/component/e-address-popup.c:597
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Dodaj naslov k obstojeХemu stiku \"%s\""
-
-#: addressbook/gui/component/e-address-popup.c:859
-msgid "Querying Addressbook..."
-msgstr "Poizvedujem v adresarju..."
-
-#: addressbook/gui/component/e-address-popup.c:916
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:276
-msgid "Edit Contact Info"
-msgstr "Uredi podatke stika"
-
-#: addressbook/gui/component/e-address-popup.c:946
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:342
-msgid "Add to Contacts"
-msgstr "Dodaj k stikom"
-
-#: addressbook/gui/component/e-address-popup.c:989
-msgid "Merge E-Mail Address"
-msgstr "Zlij E-po╧tne naslove"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "IzkljuХi poizvedbe"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "VkljuХi poizvedbe (nevarno!)"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Kontrola Bonobo za vznik naslova."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Kontrola Bonobo za prikaz naslova."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "VzorХna kontrola Bonobo, ki prika╬e adresar."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Kontrola, ki prika╬e mini vizitko iz Evolucijinega adresarja."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "Evolucijina komponenta za urejanje stikov."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Tovarna za orodje mini vizitk adresarja"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Tovarna za prikazovalnik adresarjeve adrese"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
-msgstr "Tovarna za Adresarjev vznik naslova"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "Tovarna za Evolucijino komponento adresarja."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
-msgstr "Tovarna za vzorХno kontrolo adresarja"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:156
-#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:267 shell/e-shortcuts-view.c:470
-msgid "Remove"
-msgstr "Odstrani"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:171
-msgid "Remove All"
-msgstr "Odstrani vse"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:195
-msgid "Send HTML Mail?"
-msgstr "Po╧lji po╧to v obliki HTML?"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Evolucijin vmesnik za izibro imen iz adresarja."
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Tovarna Evolucijinih vmesnikov za izbiro imen iz adresarja"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Message Recipients"
-msgstr "Prejemniki sporoХila"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Select Names"
-msgstr "Izberi imena"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select name from _folder:"
-msgstr "Izberi ime iz _mape:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "_Category:"
-msgstr "_Kategorija:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "Urejevalnik stikov"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "I_skanje"
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "Urejevalnik stikov"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Vseeno dodaj"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Duplicate Contact Detected"
 msgstr "Zaznan podvojen stik"
 
@@ -1139,18 +1171,14 @@ msgstr ""
 "Ga ╬elite vseeno dodati?"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
-msgid "Change Anyway"
-msgstr "Vseeno spremeni"
-
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Changed Contact:"
 msgstr "Spremenjen stik:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Conflicting Contact:"
 msgstr "Konfliktni stik:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -1158,8 +1186,13 @@ msgstr ""
 "Spremenjeno ime ali e-po╧tni naslov tega stika ╬e\n"
 "obstaja v tej mapi. Ga ╬elite vseeno dodati?"
 
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+#, fuzzy
+msgid "_Change Anyway"
+msgstr "Vseeno spremeni"
+
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:242
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Iskanje"
 
@@ -1290,9 +1323,9 @@ msgstr "Stiku po╧lji sporoХilo"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
 #: addressbook/gui/widgets/e-addressbook-view.c:604
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-mail-message.xml.h:53
-#: ui/evolution-tasks.xml.h:9 ui/my-evolution.xml.h:2
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Natisni"
 
@@ -1301,138 +1334,213 @@ msgstr "Natisni"
 msgid "Print Envelope"
 msgstr "Natisni kuverto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:700
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Zbri╧i"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+msgid "Error modifying card"
+msgstr "Napaka ob spreminjanju vizitke"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "Viri"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Neznana napaka"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "Delaj brez mre╬e"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "Nimate dovoljenja"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "Datoteke ni mogoХe najti"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Operacija ni podprta"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "preklicano"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "V/I napaka"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "Napaka ob nalaganju %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Napaka ob spreminjanju vizitke"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Napaka ob spreminjanju vizitke"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "Napaka ob odstranjevanju vizitke"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+msgid "Error removing card"
+msgstr "Napaka ob odstranjevanju vizitke"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* Kliknite tu za dodajo stika *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr "Zavedi kot"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "E-po╧ta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "Osnovni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr "Pomo╬ni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "Slu╬bebni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr "Povratni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "Telefon podjetja"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "DomaХ telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Organizacija"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "Slu╬beni naslov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "DomaХi naslov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "Prenosni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "Telefon v avtu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "Slu╬beni telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "DomaХ telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "Drug telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "Drug naslov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:729
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Spletna stran"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "Oddelek"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Pisarna"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "Naziv"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Poklic"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Upravljalec"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Vzdevek"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "Partner(ka)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Opomba"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr "URL zasedenosti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 msgid "Done."
 msgstr "Opravljeno."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
-msgid "Error removing card"
-msgstr "Napaka ob odstranjevanju vizitke"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1114
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
 msgid "Removing cards..."
 msgstr "Odstranjujem vizitke..."
 
-#: addressbook/gui/widgets/e-minicard.c:451
-msgid "Error modifying card"
-msgstr "Napaka ob spreminjanju vizitke"
-
 #: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Shranite v adresarju"
@@ -1480,7 +1588,8 @@ msgid "Dimensions:"
 msgstr "Mere:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Pisava..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1619,37 +1728,62 @@ msgstr "Tip:"
 msgid "Width:"
 msgstr "╘irina:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "Pisava..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Napaka ob komuniciranju s stre╬nikom koledarja"
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nisem mogel prebrati Pilotovega koledarja"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nisem mogel prebrati Pilotovega seznama opravil"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:623
-#: calendar/gui/alarm-notify/alarm-queue.c:922
-#: calendar/gui/alarm-notify/alarm-queue.c:978
-msgid "Reminder of your appointment at "
-msgstr "Opomin na zmenek ob "
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Kontrola Bonobo, ki prika╬e koledar."
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: calendar/gui/alarm-notify/alarm-queue.c:914
-msgid "Snooze"
-msgstr "Podalj╧ek spanja"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr "Evolucijina komponenta za povzetke."
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:927
-#: calendar/gui/alarm-notify/alarm-queue.c:982
-msgid "Ok"
-msgstr "V redu"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolucijin pregledovalnik iTip/iMip"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr "Komponenta Evolucije za urejanje koledarja."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr "Tovarna komponent za povzetke koledarja."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr "Tovarna komponent Evolucije za urejanje koledarja."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr "Tvoarna za orodje koledarja iTip"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr "VzorХna tovarna za kontrolo koledarja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Tovarna komponent Evolucije za urejanje koledarja."
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1659,87 +1793,88 @@ msgstr "Storitev opozorilnega alarma"
 msgid "Factory for the alarm notification service"
 msgstr "Tovarna za storitev opozorlinega alarma"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:153
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
 #, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr "Obvestilo o va╧em zmenku, ki se zaХne ob %s in konХa ob %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:157
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
 #, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr "Obvestilo o va╧em zmenku, ki se zaХne ob %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:162
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
 #, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr "Obvestilo o va╧em zmenku, ki se konХa ob %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:166
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
 msgid "Notification about your appointment"
 msgstr "Obvestilo o va╧em zmenku"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:173
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
 #, c-format
 msgid "Notification about your task starting on %s and ending on %s"
 msgstr "Obvestilo o va╧em opravilu, ki se konХa ob %s in konХa ob %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:177
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
 #, c-format
 msgid "Notification about your task starting on %s"
 msgstr "Obvestilo o va╧em opravilu, ki se zaХne ob %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:182
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
 #, c-format
 msgid "Notification about your task ending on %s"
 msgstr "Obvestilo o va╧em opravilu, ki se konХa ob %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:186
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
 msgid "Notification about your task"
 msgstr "Obvestilo o va╧em opravilu"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:193
-#, c-format
-msgid "Notification about your journal entry starting on %s and ending on %s"
-msgstr "Obvestilo o va╧em dnevni╧kem vpisu, ki se zaХne ob %s in konХa ob %s"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:197
-#, c-format
-msgid "Notification about your journal entry starting on %s"
-msgstr "Obvestilo o va╧em dnevni╧kem vpisu, ki se zaХne ob %s"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:202
-#, c-format
-msgid "Notification about your journal entry ending on %s"
-msgstr "Obvestilo o va╧em dnevni╧kem vpisu, ki se konХa ob %s"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:206
-msgid "Notification about your journal entry"
-msgstr "Obvestilo o va╧em dnevni╧kem vpisu"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:285
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarm na %A %d %b %Y ob %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:301
-msgid "No summary available."
-msgstr "Povzetek ni na voljo."
-
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution.xml.h:5
-msgid "Close"
-msgstr "Zapri"
+#: ui/evolution-comp-editor.xml.h:1
+msgid "C_lose"
+msgstr "_Zapri"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Uredi zmenek"
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "Podalj╧ek spanja"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
 msgid "Snooze time (minutes)"
 msgstr "хas podalj╧ka spanja (minut)"
 
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "Uredi zmenek"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "Povzetek ni na voljo."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "Opomin na zmenek ob "
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "Podalj╧ek spanja"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "V redu"
+
 #: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
@@ -1760,128 +1895,151 @@ msgstr "Nisem mogel inicializirati gnome-vfs"
 msgid "Could not create the alarm notify service factory"
 msgstr "Nisem mogel ustvariti tovarne opozorilnega alrama"
 
-#: calendar/gui/calendar-commands.c:277
-msgid "File not found"
-msgstr "Datoteke ni mogoХe najti"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A, %e %B %Y"
 
-#: calendar/gui/calendar-commands.c:301
-msgid "Open calendar"
-msgstr "Odpri koledar"
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:343
-msgid "Save calendar"
-msgstr "Shrani koledar"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: calendar/gui/calendar-commands.c:545
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Nisem mogel ustvariti pogleda koledarja. Prosim preverite nastavitve ORBit-a "
 "in OAF-a."
 
-#: calendar/gui/calendar-model.c:379 calendar/gui/calendar-model.c:974
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "javno"
 
-#: calendar/gui/calendar-model.c:382 calendar/gui/calendar-model.c:976
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "osebno"
 
-#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:978
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "zaupno"
 
-#: calendar/gui/calendar-model.c:388 calendar/gui/dialogs/alarm-page.c:334
-#: calendar/gui/dialogs/alarm-page.c:370
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "neznano"
 
-#: calendar/gui/calendar-model.c:479
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:479
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:481
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:481
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:519 calendar/gui/calendar-model.c:1150
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
 #: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:448 mail/message-list.c:620
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "visoka"
 
-#: calendar/gui/calendar-model.c:521 calendar/gui/calendar-model.c:1152
-#: calendar/gui/calendar-model.c:1675
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:449 mail/message-list.c:619
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "obiХajna"
 
-#: calendar/gui/calendar-model.c:523 calendar/gui/calendar-model.c:1154
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:450 mail/message-list.c:618
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "nizka"
 
-#: calendar/gui/calendar-model.c:559 calendar/gui/calendar-model.c:1206
-#: calendar/gui/e-calendar-table.c:502
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Prozorno"
 
-#: calendar/gui/calendar-model.c:562 calendar/gui/calendar-model.c:1208
-#: calendar/gui/e-calendar-table.c:501
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Prosojno"
 
-#: calendar/gui/calendar-model.c:711 calendar/gui/calendar-model.c:1260
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
 #: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:522
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "ni priХeto"
 
-#: calendar/gui/calendar-model.c:714 calendar/gui/calendar-model.c:1262
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
 #: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:523
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "v teku"
 
-#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1264
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:524
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "konХano"
 
-#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1266
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
 #: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:525 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "preklicano"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:870 e-util/e-time-utils.c:267
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:873 e-util/e-time-utils.c:276
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:878
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1892,23 +2050,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:958
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr "Uvrstitev mora biti 'Javno', 'Zastebno', 'Zaupno' ali 'Brez'"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:972 calendar/gui/calendar-model.c:1204
-#: calendar/gui/calendar-model.c:1258 calendar/gui/e-calendar-table.c:425
-#: calendar/gui/e-calendar-table.c:500 mail/mail-account-gui.c:1295
-#: mail/mail-accounts.c:129 mail/mail-accounts.c:380
-#: mail/mail-config.glade.h:56 shell/e-shell-view.c:1397
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:439
-#: widgets/misc/e-dateedit.c:1369 widgets/misc/e-dateedit.c:1484
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "brez"
 
-#: calendar/gui/calendar-model.c:1054
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1918,158 +2080,253 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1094
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Vrednost v procentih mora biti med vkljuХno 0 in 100"
 
-#: calendar/gui/calendar-model.c:1135
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "Prioriteta mora biti 'Visoka', 'ObiХajna', 'Nizka' ali 'Nedefinirana'."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1148
+#: calendar/gui/calendar-model.c:1181
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:451
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "ni definirana"
 
-#: calendar/gui/calendar-model.c:1189
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "Prosojnost mora biti 'Prozorno', 'Prosojno' ali 'Brez'."
 
-#: calendar/gui/calendar-model.c:1677
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "Ponovi se"
 
-#: calendar/gui/calendar-model.c:1679
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "DoloХena"
 
-#: calendar/gui/calendar-model.c:1685
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Da"
 
-#: calendar/gui/calendar-model.c:1685
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Ne"
 
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+msgid "Day View"
+msgstr "Dnevni pogled"
+
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+msgid "Work Week View"
+msgstr "Pogled delavnega tedna"
+
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+msgid "Week View"
+msgstr "Tedenski pogled"
+
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+msgid "Month View"
+msgstr "MeseХni pogled"
+
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "URI, ki naj ga prika╬e brskalnik map"
 
-#: calendar/gui/dialogs/alarm-page.c:269
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "ZvoХni alarmi"
+
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "Prejemniki sporoХila"
+
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "Poka╬i mo╬nosti"
+
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.c:390
+#, fuzzy
+msgid "Unknown Alarm Options"
+msgstr "Neznane padavine"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+#, fuzzy
+msgid "Alarm Repeat"
+msgstr "Lastnosti alarma"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "Prikaz _sporoХila"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Predvajaj zvok"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "Po╬eni program"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "dni"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+#, fuzzy
+msgid "extra times every"
+msgstr "Posodobi vsakih"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "ur"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "minut"
+
+#: calendar/gui/dialogs/alarm-page.c:284
 #, c-format
 msgid "%d days"
 msgstr "%d dni"
 
-#: calendar/gui/dialogs/alarm-page.c:271
+#: calendar/gui/dialogs/alarm-page.c:286
 msgid "1 day"
 msgstr "1 dan"
 
-#: calendar/gui/dialogs/alarm-page.c:274
+#: calendar/gui/dialogs/alarm-page.c:289
 #, c-format
 msgid "%d weeks"
 msgstr "%d tednov"
 
-#: calendar/gui/dialogs/alarm-page.c:276
+#: calendar/gui/dialogs/alarm-page.c:291
 msgid "1 week"
 msgstr "1 teden"
 
-#: calendar/gui/dialogs/alarm-page.c:279
+#: calendar/gui/dialogs/alarm-page.c:294
 #, c-format
 msgid "%d hours"
 msgstr "%d ur"
 
-#: calendar/gui/dialogs/alarm-page.c:281
+#: calendar/gui/dialogs/alarm-page.c:296
 msgid "1 hour"
 msgstr "1 ura"
 
-#: calendar/gui/dialogs/alarm-page.c:284
+#: calendar/gui/dialogs/alarm-page.c:299
 #, c-format
 msgid "%d minutes"
 msgstr "%d minut"
 
-#: calendar/gui/dialogs/alarm-page.c:286
+#: calendar/gui/dialogs/alarm-page.c:301
 msgid "1 minute"
 msgstr "1 minuta"
 
-#: calendar/gui/dialogs/alarm-page.c:289
+#: calendar/gui/dialogs/alarm-page.c:304
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:291
+#: calendar/gui/dialogs/alarm-page.c:306
 msgid "1 second"
 msgstr "1 sekunda"
 
-#: calendar/gui/dialogs/alarm-page.c:316
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Predvajaj zvok"
 
-#: calendar/gui/dialogs/alarm-page.c:320
-msgid "Show a dialog"
-msgstr "Ka╬i dialog"
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+msgid "Display a message"
+msgstr "Ka╬i sporoХilo"
 
-#: calendar/gui/dialogs/alarm-page.c:324
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
 msgstr "Po╧lji e-po╧to"
 
-#: calendar/gui/dialogs/alarm-page.c:328
-#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Po╬eni program"
 
-#: calendar/gui/dialogs/alarm-page.c:346
-msgid " before start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
 msgstr " pred priХetkom zmenka"
 
-#: calendar/gui/dialogs/alarm-page.c:349
-msgid " after start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
 msgstr " po priХetku zmenka"
 
-#: calendar/gui/dialogs/alarm-page.c:359
-msgid " before end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
 msgstr " pred koncem zmenka"
 
-#: calendar/gui/dialogs/alarm-page.c:362
-msgid " after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
 msgstr " po koncu zmenka"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #: calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "Basics"
 msgstr "Osnove"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-itip-control.c:293
+#: calendar/gui/e-itip-control.c:298
 msgid "Date/Time:"
 msgstr "Datum/ura:"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:5
-msgid "Display a message"
-msgstr "Ka╬i sporoХilo"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Options..."
-msgstr "Mo╬nosti..."
-
-#: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Reminders"
 msgstr "Opozorila"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-itip-control.c:282 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Povzetek:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "Mo╬nosti..."
+
 #. Automatically generated. Do not edit.
 #: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
 msgid "after"
@@ -2092,7 +2349,7 @@ msgstr "konec zmenka"
 msgid "hour(s)"
 msgstr "ur"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
 msgid "minute(s)"
 msgstr "minut"
 
@@ -2132,8 +2389,8 @@ msgstr "60 minut"
 msgid "Beep when alarm windows appear."
 msgstr "Pozvoni, ko se poka╬ejo okna alarmov."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9 shell/e-shortcuts.c:1001
-#: ui/evolution-calendar.xml.h:4
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Koledar"
 
@@ -2166,7 +2423,7 @@ msgid "Defaults"
 msgstr "Privzeto"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:30
 msgid "Display"
 msgstr "Prikaz"
 
@@ -2183,7 +2440,7 @@ msgid "Fri"
 msgstr "pet"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "petek"
 
@@ -2192,7 +2449,7 @@ msgid "Mon"
 msgstr "pon"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "ponedeljek"
 
@@ -2213,7 +2470,7 @@ msgid "Sat"
 msgstr "sob"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "sobota"
 
@@ -2234,7 +2491,7 @@ msgid "Sun"
 msgstr "ned"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "nedeljo"
 
@@ -2251,7 +2508,7 @@ msgid "Thu"
 msgstr "Хet"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:962
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Хetrtek"
 
@@ -2276,7 +2533,7 @@ msgid "Tue"
 msgstr "tor"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:960
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "torek"
 
@@ -2285,7 +2542,7 @@ msgid "Wed"
 msgstr "sre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:961
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "sreda"
 
@@ -2297,6 +2554,142 @@ msgstr "Delavni teden"
 msgid "minutes before they occur."
 msgstr "minut preden se zgodijo."
 
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "Ste prepriХani, da ╬elite zbrisati ta raХun?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "Ste prepriХani, da ╬elite zbrisati %d opravil?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "Ste prepriХani, da ╬elite zbrisati dnevni╧ki vpis `%s'?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+#, fuzzy
+msgid "This task has been deleted."
+msgstr "To je zahtevek po sreХanju."
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+#, fuzzy
+msgid "This task has been changed."
+msgstr "To je preklic dogodka."
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr " do "
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+msgid " (Completed "
+msgstr " (KonХano "
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+msgid "Completed "
+msgstr "konХano "
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr " (Rok "
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+msgid "Due "
+msgstr "Rok"
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "Uredi zmenek"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "Zmenek - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "Naloga - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Vpis v dnevniku - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Ni povzetka"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "Prepi╧i datoteko?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Datoteka z enakim imenom ╬e obstaja.\n"
+"Naj jo prepi╧em?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "Shrani kot..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
 #: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -2339,20 +2732,44 @@ msgstr "Ste prepriХani, da ╬elite zbrisati %d opravil?"
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Ste prepriХani, da ╬elite zbrisati %d dnevni╧kih vpisov?"
 
-#: calendar/gui/dialogs/event-editor.c:136
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Izberi datoteko"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Sekcije:"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"хasovni pas: "
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:154
 msgid "Appointment"
 msgstr "Zmenek"
 
-#: calendar/gui/dialogs/event-editor.c:141
+#: calendar/gui/dialogs/event-editor.c:159
 msgid "Reminder"
 msgstr "Opozorilo"
 
-#: calendar/gui/dialogs/event-editor.c:146
+#: calendar/gui/dialogs/event-editor.c:164
 msgid "Recurrence"
 msgstr "Ponovitev"
 
-#: calendar/gui/dialogs/event-editor.c:151
-#: calendar/gui/dialogs/event-editor.c:223
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
 msgid "Meeting"
 msgstr "SreХanje"
 
@@ -2362,7 +2779,7 @@ msgstr "_Celodnevni dogodek"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:248
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Uvrstitev"
 
@@ -2391,11 +2808,6 @@ msgstr "_Povzetek:"
 msgid "_Confidential"
 msgstr "_Zaupno"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:20
-msgid "_Contacts..."
-msgstr "_Stiki..."
-
 #: calendar/gui/dialogs/event-page.glade.h:10
 msgid "_End time:"
 msgstr "_хas konca:"
@@ -2404,38 +2816,271 @@ msgstr "_хas konca:"
 msgid "_Start time:"
 msgstr "_хas priХetka:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Skupina %i"
+
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "Viri:"
+
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr "Stol"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+msgid "Required Participant"
+msgstr "Potrebni udele╬enci"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr "Mo╬ni sodelujoХi"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr "Ne-sodelujoХi"
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Izberi dejanje"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+#, fuzzy
+msgid "Accepted"
+msgstr " Sprejmi "
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr " Zavrni "
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Poskusno"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Zbrisano"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "v teku"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Telefon v avtu"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Potrebni udele╬enci"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Mo╬ni sodelujoХi"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Ne-sodelujoХi"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "Poslano"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "Delegirano komu:"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+msgid "Attendee"
+msgstr "Udele╬en"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
+msgstr "Datum zakljuХka"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "Delegirano od:"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "Delegirano komu:"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "Upravljalec"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "december"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+msgid "Role"
+msgstr "Vloga"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Stanje"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Vrsta"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizator:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Organizator:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "_Povabi ostale..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Organizator:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%a %d %b %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Ta zmenek vsebuje pojavitve, ki jih Evolucija ne zna urejati."
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr "na"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "dan"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr "na"
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr "4."
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr "pojavitve"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Custom recurrence"
 msgstr "Ponovitev po meri"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Vsak"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Exceptions"
 msgstr "Izjeme"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "Modify"
-msgstr "Spremeni"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "No recurrence"
 msgstr "Ni ponovitev"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Preview"
 msgstr "Predogled"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "Recurrence Rule"
 msgstr "Pravilo ponovitev"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "Simple recurrence"
 msgstr "Enostavna ponovitev"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "Spremeni"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "za"
@@ -2460,39 +3105,22 @@ msgstr "tednov"
 msgid "year(s)"
 msgstr "let"
 
-#: calendar/gui/dialogs/recurrence-page.c:412 calendar/gui/print.c:1978
-#: calendar/gui/print.c:1980 calendar/gui/print.c:1981
-msgid "%a %b %d %Y"
-msgstr "%a %d %b %Y"
-
-#: calendar/gui/dialogs/recurrence-page.c:560
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Ta zmenek vsebuje pojavitve, ki jih Evolucija ne zna urejati."
-
-#: calendar/gui/dialogs/recurrence-page.c:932
-msgid "on"
-msgstr "na"
-
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:81
-msgid "day"
-msgstr "dan"
-
-#: calendar/gui/dialogs/recurrence-page.c:1088
-msgid "on the"
-msgstr "na"
-
-#: calendar/gui/dialogs/recurrence-page.c:1096
-msgid "th"
-msgstr "4."
-
-#: calendar/gui/dialogs/recurrence-page.c:1266
-msgid "occurrences"
-msgstr "pojavitve"
-
 #: calendar/gui/dialogs/save-comp.c:51
 msgid "Do you want to save changes?"
 msgstr "╝elite shraniti spremembe"
 
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "Date Completed:"
 msgstr "KonХano dne:"
@@ -2509,12 +3137,8 @@ msgstr "Delegirano komu:"
 msgid "No one"
 msgstr "Nikomur"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizator:"
-
 #: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
@@ -2547,329 +3171,317 @@ msgstr "_Prioriteta:"
 msgid "_Status:"
 msgstr "_Stanje:"
 
-#: calendar/gui/e-calendar-table.c:247
-msgid "Categories"
-msgstr "kategorije"
-
-#: calendar/gui/e-calendar-table.c:249
-msgid "Completion Date"
-msgstr "Datum zakljuХka"
-
-#: calendar/gui/e-calendar-table.c:250
-msgid "End Date"
-msgstr "Datum konca"
-
-#: calendar/gui/e-calendar-table.c:251
-msgid "Start Date"
-msgstr "Datum priХetka"
-
-#: calendar/gui/e-calendar-table.c:252
-msgid "Due Date"
-msgstr "Do datuma"
-
-#: calendar/gui/e-calendar-table.c:253
-msgid "Geographical Position"
-msgstr "Zemljepisna lega"
-
-#: calendar/gui/e-calendar-table.c:254
-msgid "Percent complete"
-msgstr "Procentov opravljeno"
-
-#: calendar/gui/e-calendar-table.c:255
-msgid "Priority"
-msgstr "Prioriteta"
-
-#: calendar/gui/e-calendar-table.c:256
-msgid "Summary"
-msgstr "Povzetek"
-
-#: calendar/gui/e-calendar-table.c:257
-msgid "Transparency"
-msgstr "Prosojnost"
-
-#: calendar/gui/e-calendar-table.c:258
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:259
-msgid "Alarms"
-msgstr "Alarmi"
-
-#: calendar/gui/e-calendar-table.c:260
-msgid "Click here to add a task"
-msgstr "Kliknite tu za dodajo opravila"
-
-#: calendar/gui/e-calendar-table.c:470
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:472
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:473
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:474
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:475
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:477
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:478
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:479
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:480
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:957
-msgid "Edit this task"
-msgstr "Uredi to opravilo"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "_Odpri"
 
-#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-calendar-table.c:968
-#: calendar/gui/e-day-view.c:3315 calendar/gui/e-week-view.c:3158
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-calendar.xml.h:10
-#: ui/evolution-mail-list.xml.h:4
-msgid "Cut"
-msgstr "Izre╬i"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "_Izre╬i"
 
-#: calendar/gui/e-calendar-table.c:959 calendar/gui/e-calendar-table.c:969
-#: calendar/gui/e-day-view.c:3317 calendar/gui/e-week-view.c:3160
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-calendar.xml.h:5
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:5
-msgid "Copy"
-msgstr "Kopiraj"
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Kopiraj"
 
-#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-calendar-table.c:970
-#: calendar/gui/e-day-view.c:3290 calendar/gui/e-day-view.c:3319
-#: calendar/gui/e-week-view.c:3134 calendar/gui/e-week-view.c:3162
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:26
-#: ui/evolution-mail-list.xml.h:12
-msgid "Paste"
-msgstr "Prilepi"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "_Prilepi"
 
-#: calendar/gui/e-calendar-table.c:962
-msgid "Mark as complete"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
 msgstr "OznaХi kot opravljeno"
 
-#: calendar/gui/e-calendar-table.c:963
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Zbri╧i to nalogo"
 
-#: calendar/gui/e-calendar-table.c:972
-msgid "Mark tasks as complete"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
 msgstr "OznaХi opravila kot opravljena"
 
-#: calendar/gui/e-calendar-table.c:973 ui/evolution-tasks.xml.h:6
-msgid "Delete selected tasks"
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Zbri╧i izbrana opravila"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:574 calendar/gui/e-week-view.c:307
-#: calendar/gui/print.c:785
-msgid "am"
-msgstr "dop"
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "Kliknite tu za dodajo opravila"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:577 calendar/gui/e-week-view.c:310
-#: calendar/gui/print.c:787
-msgid "pm"
-msgstr "pop"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% konХa_no:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Alarmi"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "kategorije"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "KonХano"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "Datum zakljuХka"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "Do datuma"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Datum konca"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "Zemljepisna lega"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Prioriteta"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Datum priХetka"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "Povzetek"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "Seznam nalog"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "Prosojnost"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i deljenj minute"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1327
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1602
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:289 calendar/gui/e-day-view.c:1341
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1354
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:3295 ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "dop"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "pop"
+
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Nov zmenek"
 
-#: calendar/gui/e-day-view.c:3297 calendar/gui/e-week-view.c:3141
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "Nov celodnevni dogodek"
 
-#: calendar/gui/e-day-view.c:3302 calendar/gui/e-week-view.c:3146
-msgid "Go to Today"
-msgstr "Pojdi na danes"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "Pojdi na _danes"
 
-#: calendar/gui/e-day-view.c:3304 calendar/gui/e-week-view.c:3148
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "Pojdi na datum..."
 
-#: calendar/gui/e-day-view.c:3311 calendar/gui/e-week-view.c:3154
-#: shell/e-shortcuts-view.c:463 ui/evolution-calendar.xml.h:24
-#: ui/evolution-message-composer.xml.h:12
-msgid "Open"
-msgstr "Odpri"
-
-#: calendar/gui/e-day-view.c:3313 calendar/gui/e-week-view.c:3156
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Zbri╧i ta zmenek"
 
-#: calendar/gui/e-day-view.c:3328 calendar/gui/e-week-view.c:3176
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Naredi to pojavitev prestavljivo"
 
-#: calendar/gui/e-day-view.c:3330 calendar/gui/e-week-view.c:3178
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "Zbri╧i to pojavitev"
 
-#: calendar/gui/e-day-view.c:3332
-msgid "Delete all Occurrences"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "Zbri╧i vse pojavitve"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i deljenj minute"
-
-#: calendar/gui/e-itip-control.c:546 calendar/gui/print.c:2237
-msgid " to "
-msgstr " do "
-
-#: calendar/gui/e-itip-control.c:550 calendar/gui/print.c:2241
-msgid " (Completed "
-msgstr " (KonХano "
-
-#: calendar/gui/e-itip-control.c:552 calendar/gui/print.c:2243
-msgid "Completed "
-msgstr "konХano "
-
-#: calendar/gui/e-itip-control.c:557 calendar/gui/print.c:2248
-msgid " (Due "
-msgstr " (Rok "
-
-#: calendar/gui/e-itip-control.c:559 calendar/gui/print.c:2250
-msgid "Due "
-msgstr "Rok"
-
-#: calendar/gui/e-itip-control.c:613
+#: calendar/gui/e-itip-control.c:694
 msgid "This is an event that can be added to your calendar."
 msgstr "To je dogodek, ki je lahko dodan va╧emu koledarju."
 
-#: calendar/gui/e-itip-control.c:616
+#: calendar/gui/e-itip-control.c:697
 msgid "This is a meeting request."
 msgstr "To je zahtevek po sreХanju."
 
-#: calendar/gui/e-itip-control.c:619
+#: calendar/gui/e-itip-control.c:700
 msgid "This is one or more additions to a current meeting."
 msgstr "To so en ali veХ dodatkov k trenutnemu sreХanju."
 
-#: calendar/gui/e-itip-control.c:622
+#: calendar/gui/e-itip-control.c:703
 msgid "This is a request for the latest event information."
 msgstr "To je zahtevek za sve╬e podatke o dogodku."
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:706
 msgid "This is a reply to a meeting request."
 msgstr "To je odgovor na zahtevek po sreХanju."
 
-#: calendar/gui/e-itip-control.c:628
+#: calendar/gui/e-itip-control.c:709
 msgid "This is an event cancellation."
 msgstr "To je preklic dogodka."
 
-#: calendar/gui/e-itip-control.c:631 calendar/gui/e-itip-control.c:670
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 msgid "The message is not understandable."
 msgstr "To sporoХilo ni razumljivo."
 
-#: calendar/gui/e-itip-control.c:655
+#: calendar/gui/e-itip-control.c:737
 msgid "This is an task that can be added to your calendar."
 msgstr "To je opravilo, ki je lahko dodano v va╧ koledar."
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:740
 msgid "This is a task request."
 msgstr "To je zahtevek po opravilu."
 
-#: calendar/gui/e-itip-control.c:661
+#: calendar/gui/e-itip-control.c:743
 msgid "This is a request for the latest task information."
 msgstr "To je zahtevek za sve╬e podatke o opravilu."
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:746
 msgid "This is a reply to a task request."
 msgstr "To je odgovor na zahtevek po opravilu."
 
-#: calendar/gui/e-itip-control.c:667
+#: calendar/gui/e-itip-control.c:749
 msgid "This is an task cancellation."
 msgstr "To je preklic opravila."
 
-#: calendar/gui/e-itip-control.c:689
+#: calendar/gui/e-itip-control.c:771
 msgid "This is freebusy information."
 msgstr "To je podatek o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:692
+#: calendar/gui/e-itip-control.c:774
 msgid "This is a request for freebusy information."
 msgstr "To je zahtevek za podatk o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:777
 msgid "This is a reply to a freebusy request."
 msgstr "To je odgovor na podatek o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:834
 msgid "The message does not appear to be properly formed"
 msgstr "Zdi se, da sporoХilo ni pravilno oblikovano"
 
-#: calendar/gui/e-itip-control.c:737
+#: calendar/gui/e-itip-control.c:853
 msgid "The message contains only unsupported requests."
 msgstr "To sporoХilo vsebuje le nepodprte zahtevke"
 
-#: calendar/gui/e-itip-control.c:753
+#: calendar/gui/e-itip-control.c:877
 msgid "The information contained in this attachment was not valid"
 msgstr "Podatki vsebovani v tej prilogi niso veljavni"
 
-#: calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:989
 msgid "I couldn't update your calendar file!\n"
 msgstr "Nisem mogel posodobiti va╧ege datoteeke koledarja!\n"
 
-#: calendar/gui/e-itip-control.c:894
+#: calendar/gui/e-itip-control.c:1015
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Nisem mogel odstraniti predmeta iz va╧e datoteke koledarja!\n"
 
@@ -2910,98 +3522,48 @@ msgstr "konХni-datum"
 msgid "date-start"
 msgstr "zaХetni-datum"
 
-#: calendar/gui/e-tasks.c:185 calendar/gui/e-tasks.c:522
-#: calendar/gui/e-tasks.c:555
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "Vse"
 
-#: calendar/gui/e-tasks.c:191
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "Kategorija:"
 
-#: calendar/gui/e-tasks.c:330
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nisem mogel nalo╬iti poslov v `%s'"
 
-#: calendar/gui/e-tasks.c:342
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Postopek potreben za nalo╬itev `%s' ni podprt"
 
-#: calendar/gui/e-week-view.c:3139 calendar/gui/e-week-view.c:3167
-msgid "New Appointment..."
-msgstr "Nov zmenek..."
-
-#: calendar/gui/e-week-view.c:3180
-msgid "Delete All Occurrences"
-msgstr "Zbri╧i vse pojavitve"
-
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1586
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/gnome-cal.c:219
-msgid "Summary contains"
-msgstr "Povzetek vsebuje"
-
-#: calendar/gui/gnome-cal.c:220
-msgid "Description contains"
-msgstr "Opis vsebuje"
-
-#: calendar/gui/gnome-cal.c:221
-msgid "Comment contains"
-msgstr "Komentar vsebuje"
-
-#: calendar/gui/gnome-cal.c:222
-msgid "Has category"
-msgstr "Ima kategorijo"
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "Nov zmenek..."
 
-#: calendar/gui/gnome-cal.c:1054
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nisem mogel odpreti imenika v `%s'"
 
-#: calendar/gui/gnome-cal.c:1065
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Postopek potreben za nalo╬itev `%s' ni podprt"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Kontrola Bonobo, ki prika╬e koledar."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr "Evolucijina komponenta za povzetke."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolucijin pregledovalnik iTip/iMip"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "Komponenta Evolucije za urejanje koledarja."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr "Tovarna komponent za povzetke koledarja."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "Tovarna komponent Evolucije za urejanje koledarja."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr "Tvoarna za orodje koledarja iTip"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr "VzorХna tovarna za kontrolo koledarja"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "april"
@@ -3023,246 +3585,255 @@ msgid "Go To Date"
 msgstr "Pojdi na datum"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Pojdi na danes"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "januar"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "julij"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "junij"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "marec"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "maj"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "november"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "oktober"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "Pojdi na danes"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "ne"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "po"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "to"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "sr"
 
-#: calendar/gui/print.c:517
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Хe"
 
-#: calendar/gui/print.c:517
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "pe"
 
-#: calendar/gui/print.c:517
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "so"
 
-#: calendar/gui/print.c:1847 shell/e-shortcuts.c:1002
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Naloge"
 
 #. Day
-#: calendar/gui/print.c:1954
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "Trenuten dan (%b %a %d %Y)"
 
-#: calendar/gui/print.c:1973 calendar/gui/print.c:1977
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1974
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1985
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Trenutni teden (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1993
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Trenutni mesec (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:2000
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Trenutno leto (%Y)"
 
-#: calendar/gui/print.c:2321
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Natisni koledar"
 
-#: calendar/gui/print.c:2409 calendar/gui/print.c:2501
-#: mail/mail-callbacks.c:1781 my-evolution/e-summary.c:452
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:31
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Predogled tiskanja"
 
-#: calendar/gui/print.c:2438
+#: calendar/gui/print.c:2317
 msgid "Print Item"
 msgstr "Natisni predmet"
 
-#: calendar/gui/print.c:2519
+#: calendar/gui/print.c:2398
 msgid "Print Setup"
 msgstr "Nastavitev tiskanja"
 
-#: calendar/gui/tasks-control.c:122
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "URI mape poslov, ki naj se ka╬e"
 
@@ -3308,99 +3879,6 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "NPTSхPS"
 
-#: calendar/pcs/query.c:218
-msgid "time-now expects 0 arguments"
-msgstr "time-now ne priХakuje argumentov"
-
-#: calendar/pcs/query.c:242
-msgid "make-time expects 1 argument"
-msgstr "make-time priХakuje 1 argument"
-
-#: calendar/pcs/query.c:247
-msgid "make-time expects argument 1 to be a string"
-msgstr "make-time priХakuje, da je 1. argument niz"
-
-#: calendar/pcs/query.c:255
-msgid "make-time argument 1 must be an ISO 8601 date/time string"
-msgstr "1. argument make-time mora biti niz ISO 8601 datuma/Хasa"
-
-#: calendar/pcs/query.c:281
-msgid "time-add-day expects 2 arguments"
-msgstr "time-add-day priХakuje 2 argumenta"
-
-#: calendar/pcs/query.c:286
-msgid "time-add-day expects argument 1 to be a time_t"
-msgstr "time-add-day priХakuje, da je 1. argument time_t"
-
-#: calendar/pcs/query.c:293
-msgid "time-add-day expects argument 2 to be an integer"
-msgstr "time-add-day priХakuje, da je 2. argument celo ╧tevilo (integer)"
-
-#: calendar/pcs/query.c:318
-msgid "time-day-begin expects 1 argument"
-msgstr "time-day-begin priХakuje 1 argument"
-
-#: calendar/pcs/query.c:323
-msgid "time-day-begin expects argument 1 to be a time_t"
-msgstr "time-day-begin priХakuje, da je 1. argument time_t"
-
-#: calendar/pcs/query.c:348
-msgid "time-day-end expects 1 argument"
-msgstr "time-day-end priХakuje 1 argument"
-
-#: calendar/pcs/query.c:353
-msgid "time-day-end expects argument 1 to be a time_t"
-msgstr "time-day-end priХakuje, da je 1. argument time_t"
-
-#: calendar/pcs/query.c:389
-msgid "get-vtype expects 0 arguments"
-msgstr "get-vtype ne priХakuje argumentov"
-
-#: calendar/pcs/query.c:485
-msgid "occur-in-time-range? expects 2 arguments"
-msgstr "occur-in-time-range? priХakuje 2 argumenta"
-
-#: calendar/pcs/query.c:490
-msgid "occur-in-time-range? expects argument 1 to be a time_t"
-msgstr "occur-in-time-range? priХakuje, da je 1. argument time_t"
-
-#: calendar/pcs/query.c:497
-msgid "occur-in-time-range? expects argument 2 to be a time_t"
-msgstr "occur-in-time-range? priХakuje, da je 2. argument time_t"
-
-#: calendar/pcs/query.c:627
-msgid "contains? expects 2 arguments"
-msgstr "contains? priХakuje 2 argumenta"
-
-#: calendar/pcs/query.c:632
-msgid "contains? expects argument 1 to be a string"
-msgstr "contains? priХakuje, da je 1. argument niz"
-
-#: calendar/pcs/query.c:639
-msgid "contains? expects argument 2 to be a string"
-msgstr "contains? priХakuje, da je 2. argument niz"
-
-#: calendar/pcs/query.c:656
-msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
-"\""
-msgstr ""
-"contains? priХakuje, da je 1. argument eden od \"any\" (karkoli), \"summary"
-"\" (povzetek), \"description\"(opis)"
-
-#: calendar/pcs/query.c:694
-msgid "has-categories? expects at least 1 argument"
-msgstr "has-categories? priХakuje vsaj 1 argument"
-
-#: calendar/pcs/query.c:700
-msgid "has-categories? expects all arguments to be strings"
-msgstr "has-categories? priХakuje, da so vsi argumenti nizi"
-
-#: calendar/pcs/query.c:948
-msgid "Evaluation of the search expression did not yield a boolean value"
-msgstr ""
-"IzraХun iskalnega izraza ni podal vrednosti resniХno/neresniХno (boolean)"
-
 #: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "Podpisovanje v tem kodirniku ni podprto"
@@ -3421,60 +3899,75 @@ msgstr "╘ifriranje v tem ╧ifrirniku ni podprto"
 msgid "Decryption is not supported by this cipher"
 msgstr "De╧ifriranje v tem ╧ifrirniku ni podprto"
 
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
 #: camel/camel-disco-store.c:305
 msgid "You must be working online to complete this operation"
 msgstr "Za dokonХanje te operacije morate delati z mre╬o"
 
-#: camel/camel-filter-driver.c:526 camel/camel-filter-driver.c:535
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "Uskljajujem mape"
 
-#: camel/camel-filter-driver.c:635
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr "Ne morem odpreti Хakalne mape"
 
-#: camel/camel-filter-driver.c:644
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr "Nisem mogel obdelati Хakalne mape"
 
-#: camel/camel-filter-driver.c:658
-#, c-format
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "Dobivam sporoХilo %d (%d%%)"
 
-#: camel/camel-filter-driver.c:662 camel/camel-filter-driver.c:672
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nauspeh ob sporoХilu %d"
 
-#: camel/camel-filter-driver.c:663
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "Ne morem dobiti sporoХila"
 
-#: camel/camel-filter-driver.c:683 camel/camel-filter-driver.c:794
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "Uskljajujem mapo"
 
-#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:799
-msgid "Complete"
-msgstr "KonХano"
-
-#: camel/camel-filter-driver.c:753
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Dobivam sporoХilo %d od %d"
 
-#: camel/camel-filter-driver.c:758 camel/camel-filter-driver.c:776
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Neuspeh pri sporoХilu %d od %d"
 
-#: camel/camel-filter-driver.c:876
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Napaka ob razХlenjanju filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:882
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Napaka ob izvajanju filtra: %s: %s"
@@ -3515,6 +4008,26 @@ msgstr "Opravljam poizvedbo na neznani glavi: %s"
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Neveljaven tip v body-contains, priХakovan niz"
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Nisem mogel ustvariti cevi: %s"
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Ne morem ustvariti kljuХavnice na mapi: %s: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "Nisem se mogel razvejiti: %s"
+
 #. well, this is really only a programatic error
 #: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
@@ -3538,108 +4051,108 @@ msgstr "Nisem uspel zakleniti s pomoХjo fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nisem uspel zakleniti s pomoХjo flock(2): %s"
 
-#: camel/camel-movemail.c:104
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Nisem mogel preverti po╧tne datoteke %s: %s"
 
-#: camel/camel-movemail.c:118
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Nisem mogel odpreti po╧tne datoteke %s: %s"
 
-#: camel/camel-movemail.c:126
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Nisem mogel odpreti zaХasne po╧tne datoteke %s: %s"
 
-#: camel/camel-movemail.c:151
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Napaka ob branju po╧tne datoteke: %s"
-
-#: camel/camel-movemail.c:162
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Napaka ob pisanju v zaХasno po╧tno datoteko: %s"
-
-#: camel/camel-movemail.c:181
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Nisem uspel shraniti po╧te v zaХasno datoteko %s: %s"
 
-#: camel/camel-movemail.c:211
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Nisem mogel ustvariti cevi: %s"
 
-#: camel/camel-movemail.c:223
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Nisem se mogel razvejiti: %s"
 
-#: camel/camel-movemail.c:261
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Program movemail ni uspel: %s"
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Neznana napaka)"
 
-#: camel/camel-movemail.c:492
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Napaka ob branju po╧tne datoteke: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Napaka ob pisanju v zaХasno po╧tno datoteko: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Napaka ob kopiranju zaХasne po╧tne datoteke: %s"
 
-#: camel/camel-pgp-context.c:190
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Prosim vpi╧ite svoje %s geslo za %s"
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Prosim vpi╧ite svoje %s geslo"
 
-#: camel/camel-pgp-context.c:511
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr "Ni besedila za podpis."
 
-#: camel/camel-pgp-context.c:518 camel/camel-pgp-context.c:690
-#: camel/camel-pgp-context.c:1057 camel/camel-pgp-context.c:1269
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Geslo ni bilo dano."
 
-#: camel/camel-pgp-context.c:524 camel/camel-pgp-context.c:696
-#: camel/camel-pgp-context.c:879 camel/camel-pgp-context.c:1064
-#: camel/camel-pgp-context.c:1276
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Nisem mogel ustvariti cevi do GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:683
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr "Ni besedila za Хisti podpis."
 
-#: camel/camel-pgp-context.c:873
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr "Ni besedila za preverbo."
 
-#: camel/camel-pgp-context.c:890
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Nisem mogel ustvariti zaХasne datoteke: %s"
 
-#: camel/camel-pgp-context.c:1047
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr "Ni besedila za ╧ifriranje."
 
-#: camel/camel-pgp-context.c:1073
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "Prejemniki niso navedeni"
 
-#: camel/camel-pgp-context.c:1261
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr "Ni ╧ifriranega besedila za de╧ifriranje."
 
@@ -3673,7 +4186,7 @@ msgid "Connection cancelled"
 msgstr "Povezava prekinjena"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:270
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nisem se mogel povezati z %s (vrata %d): %s"
@@ -3682,13 +4195,13 @@ msgstr "Nisem se mogel povezati z %s (vrata %d): %s"
 msgid "(unknown host)"
 msgstr "(neznan gostitelj)"
 
-#: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
-#: camel/camel-remote-store.c:470
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "Operacija razveljavljena"
 
-#: camel/camel-remote-store.c:476
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "Povezava s stre╬nikom je bila nepriХakovano prekinjena"
 
@@ -3766,8 +4279,8 @@ msgstr "Stre╬nikov izziv ni veljaven\n"
 #: camel/camel-sasl-digest-md5.c:825
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
-"Stre╬nikov izziv je vseboval neveljaven Хlen \"Quality of Protection"
-"\" (kvaliteta za╧Хite)\n"
+"Stre╬nikov izziv je vseboval neveljaven Хlen \"Quality of Protection\" "
+"(kvaliteta za╧Хite)\n"
 
 #: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
@@ -3800,7 +4313,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:438
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "Stre╬nik je sporoХil slab odgovor avtentifikaciji."
 
@@ -3869,7 +4382,7 @@ msgstr "Za branje po╧te kot poizvedbe po drugem sklopu map"
 msgid "No provider available for protocol `%s'"
 msgstr "Noben nuditelj za protokol '%s' ni dostopen"
 
-#: camel/camel-session.c:479
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3915,33 +4428,17 @@ msgstr "Nisem uspel de╧ifrirati sporoХila"
 msgid "Failed to verify certificates."
 msgstr "Nisem mogel preveriti certifikatov."
 
-#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:971 mail/mail-ops.c:978
-#: mail/mail-ops.c:996 mail/mail-ops.c:997
-msgid "Trash"
-msgstr "Smeti"
-
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
-"E-po╧ta: %s\n"
-"ObiХajno ime: %s\n"
-"Organizacijska enota: %s\n"
-"Organizacija: %s\n"
-"Krajevnost: %s\n"
-"Regija/Zvezna dr╬ava: %s\n"
-"Dr╬ava: %s"
+"Proizvedel: %s\n"
+"Zadeva: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:428 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3956,26 +4453,36 @@ msgstr ""
 "\n"
 "Ga ╬elite vseeno sprejeti?"
 
-#: camel/camel-tcp-stream-openssl.c:423
+#: camel/camel-tcp-stream-ssl.c:348
 #, c-format
 msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
 msgstr ""
-"Proizvedel: %s\n"
-"Zadeva: %s"
+"E-po╧ta: %s\n"
+"ObiХajno ime: %s\n"
+"Organizacijska enota: %s\n"
+"Organizacija: %s\n"
+"Krajevnost: %s\n"
+"Regija/Zvezna dr╬ava: %s\n"
+"Dr╬ava: %s"
 
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Ne morem odpreti razХleniti URLja '%s'"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Ni tak╧nega sporoХila %s v %s"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "Ni tak╧nega sporoХila: %s"
@@ -3984,35 +4491,26 @@ msgstr "Ni tak╧nega sporoХila: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Ne morete kopirati sporoХil iz te mape smeti."
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Nisem mogel odpreti predpomnilni╧kega imenika: %s"
-
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "NepriХakovan odgovor stre╬nika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ukaz ni uspel: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Neznana napaka"
-
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "Odgovor stre╬nika se je prehitro konХal."
 
-#: camel/providers/imap/camel-imap-command.c:489
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "odgovor IMAP stre╬nika ni vseboval podatkov %s"
 
-#: camel/providers/imap/camel-imap-command.c:526
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "NepriХakovan OK odgovor stre╬nika IMAP: %s"
@@ -4031,20 +4529,37 @@ msgstr "Nisem mogel nalo╬iti povzetka za %s"
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mapa je bila uniХena in na novo ustvarjena na stre╬niku."
 
-#: camel/providers/imap/camel-imap-folder.c:430
-msgid "Scanning IMAP folder"
-msgstr "Pregledujem mapo IMAP"
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "Shranjujem spremembe sporoХila..."
 
-#: camel/providers/imap/camel-imap-folder.c:1483
-#: camel/providers/imap/camel-imap-folder.c:1763
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "To sporoХilo trenutno ni na voljo"
 
-#: camel/providers/imap/camel-imap-folder.c:1796
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Shranjujem sporoХila"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "Nisem mogel najti telesa sporoХila v odgovoru FETCH."
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:16
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "Nisem mogel odpreti predpomnilni╧kega imenika: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "Preverjam za novo po╧to"
 
@@ -4052,7 +4567,7 @@ msgstr "Preverjam za novo po╧to"
 msgid "Check for new messages in all folders"
 msgstr "Preveri za nova sporoХila v vseh mapah"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:642
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Mape"
 
@@ -4084,28 +4599,28 @@ msgstr "Za branje in hranjenje po╧te na stre╬nikih IMAP."
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ta mo╬nost narekuje povezavo s stre╬nikom IMAP z ne╧ifriranim geslom."
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Stre╬nik IMAP %s ne podpira zahtevanega naХina avtentifikacije %s"
 
-#: camel/providers/imap/camel-imap-store.c:471
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ni podpore za naХin avtentifikacije %s"
 
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sProsim vpi╧ite geslo IMAP za %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:510
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "Nistve vpisali gesla."
 
-#: camel/providers/imap/camel-imap-store.c:536
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4116,11 +4631,15 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:825 mail/mail-local.c:325
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
 msgid "No such folder %s"
 msgstr "Ni tak╧ne mape %s"
 
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
+
 #: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "Po╧tni imeniki tipa MH"
@@ -4154,6 +4673,7 @@ msgid "For storing local mail in standard Unix spool directories"
 msgstr "Za shranjevanje krajevne po╧te v obiХajnih Unix spool imenikih"
 
 #: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Korenski imenik shrambe %s ni absolutna pot"
@@ -4193,7 +4713,8 @@ msgstr "Nisem mogel zbrisati datoteke povzetka mape `%s': %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nisem mogel zbrisati datoteke kazala mape `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ne morem dodati sporoХila k povzetku: razlog neznan"
 
@@ -4209,6 +4730,7 @@ msgstr "Ne morem dodati sporoХila v mapo tipa maildir: %s: %s"
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4220,6 +4742,7 @@ msgstr ""
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-mbox-folder.c:322
 #: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "Ni tak╧nega sporoХila"
 
@@ -4228,7 +4751,7 @@ msgstr "Ni tak╧nega sporoХila"
 msgid "Invalid message contents"
 msgstr "Neveljavna vsebina sporoХila"
 
-#: camel/providers/local/camel-maildir-store.c:101
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4238,14 +4761,14 @@ msgstr ""
 "Nisem mogel odpreti imenika `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mapa `%s' ne obstaja."
 
-#: camel/providers/local/camel-maildir-store.c:112
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4255,23 +4778,23 @@ msgstr ""
 "Nisem mogel ustvariti mape `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:127
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' ni imenik tipa maildir."
 
-#: camel/providers/local/camel-maildir-store.c:156
-#: camel/providers/local/camel-maildir-store.c:193
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nisem mogel zbrisati mape `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "ni imenik tipa maildir"
 
-#: camel/providers/local/camel-maildir-store.c:267
+#: camel/providers/local/camel-maildir-store.c:276
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nisem mogel prebrati mape `%s': %s"
@@ -4283,11 +4806,13 @@ msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Ne morem odpreti po╧tnega imenika maildir: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ne morem ustvariti kljuХavnice na mapi: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Ne morem odpreti po╧tnega predala: %s: %s\n"
@@ -4300,6 +4825,9 @@ msgstr "Ne morem pripeti sporoХila k datoteki tipa mbox: %s: %s"
 #: camel/providers/local/camel-mbox-folder.c:338
 #: camel/providers/local/camel-mbox-folder.c:370
 #: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4309,10 +4837,12 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Zdi se, da je mapa po╧kodovana in je ni mogoХe popraviti."
 
 #: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Konstrukcija sporoХila ni uspela: Naj pokvarim po╧tni predal?"
 
@@ -4358,36 +4888,45 @@ msgstr "Mapa `%s' ni prazna. Ni zbrisana."
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
 #: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "Delam povzetek mape"
 
 #: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "Nisem mogel odpreti mape: %s: povzetek delam od %ld dalje: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Usodna napaka razХlenjevanja po╧te na mestu %ld v mapi %s"
 
 #: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Ne morem narediti povzetka mape %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1445
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Uskljajujem mapo %s"
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Nisem mogel odpreti mape za izdelavo povzetka %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nisem mogel odpreti zaХasnega po╧tnega predala: %s"
@@ -4396,21 +4935,28 @@ msgstr "Nisem mogel odpreti zaХasnega po╧tnega predala: %s"
 #: camel/providers/local/camel-mbox-summary.c:557
 #: camel/providers/local/camel-mbox-summary.c:746
 #: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Povzetek se ne ujema z mapo, celo po uskladitvi"
 
 #: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Napaka ob pisanju v zaХasni po╧tni predal: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Pisanje v zaХasni po╧tni predal ni uspelo: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:635
 #: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nisem mogel zapreti izvorne mape %s: %s"
@@ -4425,7 +4971,9 @@ msgstr "Nisem mogel zapreti zaХasne mape: %s"
 msgid "Could not rename folder: %s"
 msgstr "Nisem mogel preimenovati mape: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Neznana napaka: %s"
@@ -4445,6 +4993,62 @@ msgstr "`%s' ni imenik."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Ne morem odpreti po╧tnega imenika MH: %s: %s"
 
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "Ne morem pripeti sporoХila k datoteki tipa mbox: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "`%s' ni obiХajna datoteka."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "Mapa `%s' ne obstaja."
+
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy
+msgid "Spool stores do not have an inbox"
+msgstr "Krajevno shrambe nimajo vhodnega predala"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Krajevna datoteka s po╧to %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+#, fuzzy
+msgid "Spool folders cannot be renamed"
+msgstr "Krajevnih map ni mogoХe gnezditi."
+
+#: camel/providers/local/camel-spool-store.c:230
+#, fuzzy
+msgid "Spool folders cannot be deleted"
+msgstr "Krajevnih map ni mogoХe gnezditi."
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "Nisem mogel odpreti zaХasne po╧tne datoteke %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "Nisem mogel prebrati mape `%s': %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -4467,17 +5071,17 @@ msgstr "Stre╬nik je zavrnil uporabni╧ko ime/geslo"
 msgid "Message %s not found."
 msgstr "SporoХilo %s ni bilo najdeno."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "Nisem mogel dobiti seznama skupin s stre╬nika."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:97
-#: camel/providers/nntp/camel-nntp-grouplist.c:106
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Nisem mogel nalo╬iti datoteke s seznamom skupin za %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:157
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Nisem mogel shraniti datoteke s seznamom skupin za %s: %s"
@@ -4490,25 +5094,25 @@ msgstr "USENET noviХke"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "To je nuditelj za branje in pisanje v noviХkarske skupine USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Nisem mogel odpreti imenika za noviХkarski stre╬nik: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "USNET NoviХke preko %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 "Ta mo╬nost se bo avtentificirala pri stre╬niku NNTP z ne╧ifriranim geslom."
 
-#: camel/providers/nntp/camel-nntp-store.c:323
-#: camel/providers/nntp/camel-nntp-store.c:485
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Ne morem odpreti ali ustvariti .newsrc datoteke za %s: %s"
@@ -4559,7 +5163,7 @@ msgstr "Pusti sporoХila na stre╬niku"
 msgid "Delete after %s day(s)"
 msgstr "Zbri╧i po %s dneh"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:62
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4654,7 +5258,7 @@ msgid "No such folder `%s'."
 msgstr "Ni tak╧ne mape `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Program sendmail"
 
@@ -4708,7 +5312,7 @@ msgstr "program sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Dostava po╧te preko programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:74
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4718,122 +5322,122 @@ msgstr ""
 "Za dostavo po╧te preko povezave z oddaljenim po╧tnim razdelilcem z uporabo "
 "SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "SintaktiХna napaka, ukaz ni prepoznan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "SintaktiХna napaka v parametrih ali argumentih"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Ukaz ni implementiran"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "Parameter ukaza ni implementiran"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr "Stanje sistema ali odgvor na pomoХ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "SporХilo pomoХi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Storitev pripravljena"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr "Storitev zapira kanal za prenos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr "Storitev ni na voljo, zapiram kanal za prenos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr "Zahtevano dejanje v redu, opravljeno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr "Uporabnik ni krajeven; bom posredoval na <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Zahtevano po╧tno dejanje ni bilo izvedeno: po╧tni predal ni na voljo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Zahtevano dejanje ni bilo izvedeno: po╧tni predal ni na voljo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr "Zahtevano dejanje preklicano: napaka ob obdelavi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr "Uporabnik ni krajeven; prosimo poskusite <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Zahtevano dejanje ni bilo izvedeno: premalo prostora na disku"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Zahtevano dejanje preklicano: prekoraХena obremenitev diska"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Zahtevano dejanje ni bilo izvedeno: ime po╧tnega predala ni dovoljeno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "ZaХni z vpisom po╧te; konХaj z <ENTER>.<ENTER>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "Transakcija ni uspela"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr "Potreben je prenos gesla"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "Mehanizem avtentifikacije je pre╧ibak"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Za zahtevan mehanizem avtentifikacije je potrebno ╧ifriranje"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "ZaХasna napaka avtentifikacije"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "Potrebna je avtentifikacija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:314
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Napaka pri pozdravu: %s: morda ni usodna"
 
-#: camel/providers/smtp/camel-smtp-transport.c:357
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "Stre╬nik SMTP %s ne podpira zahtevanega naХina avtentifikacije %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:396
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sProsim vpi╧ite geslo SMTP za %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:419
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4844,118 +5448,132 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:535
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "Stre╬nik SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:537
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Dostava po╧te s SMTP preko %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:562
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr "Ne morem poslati sporoХila: naslov po╧iljatelja ni naveden."
 
-#: camel/providers/smtp/camel-smtp-transport.c:569
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr "Ne morem poslati sporoХila: naslov po╧iljatelja ni veljaven."
 
-#: camel/providers/smtp/camel-smtp-transport.c:583
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "Po╧iljam sporoХilo"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "Ne morem poslati sporoХila: ni naslovnikov."
 
-#: camel/providers/smtp/camel-smtp-transport.c:677
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, fuzzy
+msgid "SMTP Greeting"
+msgstr "SreХanje"
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Zahtevek HELO je prekoraХil Хasovno omejitev: %s: ni usodno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Napaka v odgovoru na HELO: %s: ni usodno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:729
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr "Napak ob ustvarjanju avtentifikacijskega predmeta SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:744
-#: camel/providers/smtp/camel-smtp-transport.c:756
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Avtentifikacija"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Zahtevek AUTH je prekoraХil Хasovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:782
 msgid "AUTH request failed."
 msgstr "Zahtevek AUTH ni uspel"
 
-#: camel/providers/smtp/camel-smtp-transport.c:810
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr "Stre╬nik je sporoХil slab odgovor avtentifikacije.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:836
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 "Zahtevek MAIL FROM je prekoraХil Хasovno omejitev: %s: po╧ta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:855
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Napaka v ogovoru na MAIL FROM: %s: po╧ta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 "Zahtevek RCPT TO je prekoraХil Хasovno omejitev: %s: po╧ta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:899
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Napaka v ogovoru na RCPT TO: %s: po╧ta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
 "Zahtevek DATA je prekoraХil Хasovno omejitev: %s: po╧ta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Napaka v ogovoru na DATA: %s: po╧ta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:966
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Zahtevek DATA je prekoraХil Хasovno omejitev: konec sporoХila: %s: po╧ta ni "
 "bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1003
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Napaka v ogovoru na DATA: konec sporoХila: %s: po╧ta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1027
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Zahtevek RSET je prekoraХil Хasovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1046
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Napaka v odgovoru na RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Zahtevek QUIT je prekoraХil Хasovno omejitev: %s: ni usodno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Napaka v odgovoru na QUIT: %s: ni usodno"
@@ -4985,7 +5603,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:131
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "priloga"
 
@@ -5014,10 +5632,69 @@ msgid "MIME type:"
 msgstr "Tip MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
 msgid "Suggest automatic display of attachment"
 msgstr "Predlagan samodejen prikaz priloge"
 
-#: composer/e-msg-composer.c:667
+#: composer/e-msg-composer-hdrs.c:328
+msgid "Click here for the address book"
+msgstr "Kliknite tu za adresar"
+
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:359
+msgid "From:"
+msgstr "Od:"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:365
+msgid "Reply-To:"
+msgstr "Odgovori-na:"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:376
+msgid "Subject:"
+msgstr "Zadeva:"
+
+#: composer/e-msg-composer-hdrs.c:390
+msgid "To:"
+msgstr "Za:"
+
+#: composer/e-msg-composer-hdrs.c:391
+msgid "Enter the recipients of the message"
+msgstr "Vnesite prejemnike sporoХila"
+
+#: composer/e-msg-composer-hdrs.c:394
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:395
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Vnesite naslove, ki bodo prejeli, karbonske kopije sporoХila"
+
+#: composer/e-msg-composer-hdrs.c:398
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: composer/e-msg-composer-hdrs.c:399
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"Vnesite naslove, ki bodo prejeli karbonske kopije sporoХila, a  se ne bodo "
+"pojavili v seznamu prejemnikov sporoХila."
+
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Prilo╬i datoteko"
+
+#: composer/e-msg-composer.c:670
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -5026,7 +5703,7 @@ msgstr ""
 "Nisem mogel odpreti datoteke: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:680
+#: composer/e-msg-composer.c:683
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -5035,21 +5712,30 @@ msgstr ""
 "Napaka ob branju datoteke %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:865
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "Shrani kot..."
 
-#: composer/e-msg-composer.c:876
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "Opozorilo"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Napaka ob shranjevanju datoteke: %s"
 
-#: composer/e-msg-composer.c:896
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Napaka ob nalaganju datoteke %s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:997
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -5057,16 +5743,25 @@ msgstr ""
 "Ni mogoХe odpreti mape osnutkov za ta raХun.\n"
 "╝elite uporabiti privzeto mapo osnutkov?"
 
-#: composer/e-msg-composer.c:1015
-#, c-format
-msgid "Error opening file: %s"
-msgstr "Napaka ob odpiranju datoteke: %s"
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "Napaka ob shranjevanju datoteke: %s"
 
-#: composer/e-msg-composer.c:1023
+#: composer/e-msg-composer.c:1055
 msgid "Unable to retrieve message from editor"
 msgstr "Od urejevalnika nisem uspel dobiti sporoХila"
 
-#: composer/e-msg-composer.c:1029
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"Nisem mogel ustvariti izhodne datoteke: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1067
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -5075,7 +5770,7 @@ msgstr ""
 "Nisem mogel odsekati datoteke: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1038
+#: composer/e-msg-composer.c:1076
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -5084,20 +5779,16 @@ msgstr ""
 "Napaka ob samodejnem shranjevanju sporoХila: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1103
+#: composer/e-msg-composer.c:1173
+#, fuzzy
 msgid ""
-"Evolution has detected an editor buffer from a previous session.\n"
-"Would you like to recover this buffer?"
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
 msgstr ""
 "Evolucija je zaznala medpomnilnik urejevalnika iz prej╧nje seje.\n"
 "╝elite znova uporabiti ta medpomnilnik?"
 
-#: composer/e-msg-composer.c:1228 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:231
-msgid "Evolution"
-msgstr "Evolucija"
-
-#: composer/e-msg-composer.c:1234
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -5107,75 +5798,27 @@ msgstr ""
 "\n"
 "╝elite shraniti spremembe?"
 
-#: composer/e-msg-composer.c:1259
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolucija"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "Odpri datoteko"
 
-#: composer/e-msg-composer.c:1408
+#: composer/e-msg-composer.c:1500
 msgid "Insert File"
 msgstr "Vstavi datoteko"
 
-#: composer/e-msg-composer.c:1765 composer/e-msg-composer.c:2138
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Sestavi novo sporoХilo"
 
-#: composer/e-msg-composer.c:2232
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "Nisem mogel ustvariti okna skladatelja."
 
-#: composer/e-msg-composer-hdrs.c:325
-msgid "Click here for the address book"
-msgstr "Kliknite tu za adresar"
-
-#.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:356
-msgid "From:"
-msgstr "Od:"
-
-#.
-#. * Reply-To:
-#.
-#: composer/e-msg-composer-hdrs.c:362
-msgid "Reply-To:"
-msgstr "Odgovori-na:"
-
-#.
-#. * Subject:
-#.
-#: composer/e-msg-composer-hdrs.c:373
-msgid "Subject:"
-msgstr "Zadeva:"
-
-#: composer/e-msg-composer-hdrs.c:387
-msgid "To:"
-msgstr "Za:"
-
-#: composer/e-msg-composer-hdrs.c:388
-msgid "Enter the recipients of the message"
-msgstr "Vnesite prejemnike sporoХila"
-
-#: composer/e-msg-composer-hdrs.c:391
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:392
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Vnesite naslove, ki bodo prejeli, karbonske kopije sporoХila"
-
-#: composer/e-msg-composer-hdrs.c:395
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:396
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Vnesite naslove, ki bodo prejeli karbonske kopije sporoХila, a  se ne bodo "
-"pojavili v seznamu prejemnikov sporoХila."
-
 #: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -5201,40 +5844,56 @@ msgid "calendar information"
 msgstr "podatki o kodledarju"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:64 e-util/e-time-utils.c:106
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1312 widgets/misc/e-dateedit.c:1493
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:77 e-util/e-time-utils.c:187
-#: e-util/e-time-utils.c:312
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:80 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:304
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:83 e-util/e-time-utils.c:194
-#: e-util/e-time-utils.c:309 widgets/misc/e-dateedit.c:1290
-#: widgets/misc/e-dateedit.c:1349 widgets/misc/e-dateedit.c:1528
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
-#: e-util/e-time-utils.c:301 widgets/misc/e-dateedit.c:1287
-#: widgets/misc/e-dateedit.c:1346 widgets/misc/e-dateedit.c:1525
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
 msgid "%H:%M"
 msgstr "%H:%M"
 
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%a %d/%m/%Y"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
+
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:258
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -5242,77 +5901,65 @@ msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:263
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:272
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "leto"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "let"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "mesec"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "mesecev"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "teden"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "tedenov"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "dni"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "ura"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "ur"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "minuta"
 
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "minut"
-
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "sekunda"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr " sekund"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Opa. Pozabili ste izbrati datum."
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "Opa. Izbrali ste neveljaven datum."
 
-#: filter/filter-datespec.c:276
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -5322,7 +5969,7 @@ msgstr ""
 "Хasom ob katerem se bo pognal filter\n"
 "ali vmapa odprta."
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5330,7 +5977,7 @@ msgstr ""
 "Datum tega sporoХila bo primerjan s Хasom,\n"
 "ki ga navedete tu."
 
-#: filter/filter-datespec.c:339
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5341,28 +5988,37 @@ msgstr ""
 ".na primer \"teden dni nazaj\"."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "trenutni Хas"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "Хas, ki ga navedete"
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "Хas, relatievn trenutnemu"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "Primerjaj z"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "sedaj"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+#, fuzzy
+msgid " ago"
+msgstr "nazaj"
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr "nazaj"
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<kliknite tukaj za izbiro datuma>"
 
@@ -5387,8 +6043,8 @@ msgstr ""
 "Opa, pozabili ste izbrati mapo.\n"
 "Prosim pojdite nazaj in navedite veljavno mapo kamor naj se po╧ta dostavi."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:292
-#: mail/mail-account-gui.c:701
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Izberi mapo"
 
@@ -5400,46 +6056,6 @@ msgstr "Vnesite URI mape"
 msgid "<click here to select a folder>"
 msgstr "<kliknite tukaj za izbiro mape>"
 
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Uredi filtre"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "Uredi vMape"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Dohodna"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Odhodna"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr "Virtualne mape"
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr "le izbrane mape"
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr "Viri vMap"
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr "z vsemi aktivnimi oddaljenimi mapami"
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr "z vsemi krajevnimi in aktivnimi oddaljenimi mapami"
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr "z vsemi krajevnimi mapami"
-
 #: filter/filter-input.c:193
 #, c-format
 msgid ""
@@ -5461,36 +6077,88 @@ msgstr "Ime pravila: "
 msgid "Untitled"
 msgstr "Neimenovan"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "хe"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Izvr╧i dejanja"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "Хe je zado╧Хeno vsem pogojem"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "Хe je zado╧Хeno kateremukoli pogoju"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "Dodaj pogoj"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "dohodna"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "odhodna"
 
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Dodaj"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Uredi"
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Uredi filtre"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "Uredi vMape"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "Dohodna"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "Odhodna"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr "Virtualne mape"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr "le izbrane mape"
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "Viri vMap"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "z vsemi aktivnimi oddaljenimi mapami"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "z vsemi krajevnimi in aktivnimi oddaljenimi mapami"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "z vsemi krajevnimi mapami"
+
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
+#, fuzzy
+msgid "Assign Color"
 msgstr "Pripi╧i barvo"
 
 #: filter/libfilter-i18n.h:4
@@ -5566,128 +6234,120 @@ msgid "Expression"
 msgstr "Izraz"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "Posreduj na naslove"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "Pomembno"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "je"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "je veХje"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "je manj╧e"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "ni"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Dopisni seznam"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Jedro sporoХila"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Glava sporoХila"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "SporoХilo je bilo sprejeto"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "SporoХilo je bilo poslano"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Prestavi v mapo"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr "na ali po"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr "na ali pred"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Beri"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Prejemnik"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Regularni izraz"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Odgovorjeno na"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:6
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "ToХke"
 
-#: filter/libfilter-i18n.h:43 mail/mail-callbacks.c:1049
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "Po╧iljatelj"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Nastavi stanje"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:44
 msgid "Size (kB)"
 msgstr "Velikost (kB)"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "zveni kot"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:46
 msgid "Source Account"
 msgstr "Izvorni raХun"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr "DoloХena glava"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:48
 msgid "starts with"
 msgstr "se zaХne z"
 
-#: filter/libfilter-i18n.h:50 mail/message-list.etspec.h:8
-msgid "Status"
-msgstr "Stanje"
-
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Prenehaj z obdelavo"
 
-#: filter/libfilter-i18n.h:52 mail/mail-format.c:776
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Zadeva"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "je bilo po"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:53
 msgid "was before"
 msgstr "je bilo pred"
 
@@ -5707,29 +6367,23 @@ msgstr "Uredi pravilo"
 msgid "Score Rules"
 msgstr "ToХke pravil"
 
-#: importers/elm-importer.c:501 importers/evolution-gnomecard-importer.c:224
-#: importers/netscape-importer.c:769 importers/pine-importer.c:638
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
 #: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
 #: shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Uvozi"
 
-#: importers/elm-importer.c:506 importers/netscape-importer.c:774
-#: importers/pine-importer.c:643
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
 msgid "Mail"
 msgstr "Po╧ta"
 
-#: importers/elm-importer.c:510
-msgid "Elm Aliases"
-msgstr "Vzdevki programa Elm"
-
-#: importers/elm-importer.c:517 importers/evolution-gnomecard-importer.c:236
-#: importers/netscape-importer.c:796 importers/pine-importer.c:660
-#: shell/importer/intelligent.c:199
-msgid "Don't ask me again"
-msgstr "Ne spra╧uj me veХ"
-
-#: importers/elm-importer.c:550
+#: importers/elm-importer.c:498
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -5737,15 +6391,15 @@ msgstr ""
 "Evolucija je na╧la po╧tne datoteke programa Elm.\n"
 "Jih ╬elite uvoziti v Evolucijo?"
 
-#: importers/elm-importer.c:579
+#: importers/elm-importer.c:527
 msgid "Elm mail"
 msgstr "Po╧tni program Elm"
 
-#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:653
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
 msgid "Addressbook"
 msgstr "Adresar"
 
-#: importers/evolution-gnomecard-importer.c:261
+#: importers/evolution-gnomecard-importer.c:253
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5753,19 +6407,11 @@ msgstr ""
 "Evolucija je na╧la datoteke GnomeCard-a.\n"
 "Jih ╬elite uvoziti v Evolucijo?"
 
-#: importers/netscape-importer.c:779 importers/pine-importer.c:648
+#: importers/netscape-importer.c:824
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: importers/netscape-importer.c:784 mail/mail-callbacks.c:1693
-msgid "Filters"
-msgstr "Filtri"
-
-#: importers/netscape-importer.c:789
-msgid "Addressbooks"
-msgstr "Adresarji"
-
-#: importers/netscape-importer.c:836
+#: importers/netscape-importer.c:849
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5773,7 +6419,7 @@ msgstr ""
 "Evolucija je na╧la po╧tne datoteke programa Netscape.\n"
 "Jih ╬elite uvoziti v Evolucijo?"
 
-#: importers/pine-importer.c:697
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -5781,187 +6427,207 @@ msgstr ""
 "Evolucija je na╧la po╧tne datoteke programa Pine.\n"
 "Jih ╬elite uvoziti v Evolucijo?"
 
-#: importers/pine-importer.c:725
+#: importers/pine-importer.c:691
 msgid "Pine mail"
 msgstr "Po╧tni program Pine"
 
-#: mail/component-factory.c:666
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "Evolucijina komponenta za obravnavo po╧te."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr "Evolucijin setavljalnik po╧te."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr "Evolucijina komponenta za povzetke."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr "Evolucijina komponenta za po╧tne mape."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr "Evolucijina komponenta za tovarne po╧tnih map."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr "Tovarna za Evolucijinega skladatelja."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr "Tovarna za Evolucijino komponento po╧te."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr "Tovarna za komponento povzetka po╧te."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+msgid "Mail configuration interface"
+msgstr "Vmesnik za nastavitev po╧te"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "_Lastnosti..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Spremeni lastnosti datoteke"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne morem inicializirati Evolucijine komponente za po╧to."
 
-#: mail/component-factory.c:800
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr "Ne morem registrirati shrambe z lupino"
 
-#: mail/folder-browser.c:211 mail/mail-display.c:268
+#: mail/folder-browser-ui.c:254
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "Lastnosti za \"%s\""
+
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr "Lastnosti"
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nisem mogel ustvariti zaХasnega imenika: %s"
 
-#: mail/folder-browser.c:830
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "Shrani iskanje kot vMapo"
 
-#: mail/folder-browser.c:1173
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr "vMapa glede na p_redmet"
 
-#: mail/folder-browser.c:1176
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "vMapa glede na _po╧iljatelja"
 
-#: mail/folder-browser.c:1179
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "vMapa glede na pre_jemnike"
 
-#: mail/folder-browser.c:1182
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr "vMapa glede na po╧tni se_znam"
 
-#: mail/folder-browser.c:1188
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "Filter glede na za_devo"
 
-#: mail/folder-browser.c:1191
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "Filter glede na po╧ilja_telja"
 
-#: mail/folder-browser.c:1194
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "Filter glede na preje_mnike"
 
-#: mail/folder-browser.c:1197
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "Filter glede na p_o╧tni seznam"
 
-#: mail/folder-browser.c:1206
-msgid "_Open"
-msgstr "_Odpri"
-
-#: mail/folder-browser.c:1208
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Znova po╧lji"
 
-#: mail/folder-browser.c:1210 ui/evolution-calendar.xml.h:54
-#: ui/evolution-mail-message.xml.h:86 ui/evolution-tasks.xml.h:18
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "_Shrani kot..."
 
-#: mail/folder-browser.c:1212 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "Na_tisni"
 
-#: mail/folder-browser.c:1217 ui/evolution-mail-message.xml.h:85
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "_Odgovori po╧iljatelju"
 
-#: mail/folder-browser.c:1219 ui/evolution-mail-message.xml.h:61
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
 msgid "Reply to _List"
 msgstr "Odgovori na _seznam"
 
-#: mail/folder-browser.c:1221 ui/evolution-mail-message.xml.h:60
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: mail/folder-browser.c:1223
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "_Posreduj naprej"
 
-#: mail/folder-browser.c:1226
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "OznaХi kot _prebrano"
 
-#: mail/folder-browser.c:1228
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "OznaХi kot _neprebrano"
 
-#: mail/folder-browser.c:1233
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "OznaХi kot po_membno"
+
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "OznaХi kot po_membno"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "Prestavi v _mapo..."
 
-#: mail/folder-browser.c:1235
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj v mapo..."
 
-#: mail/folder-browser.c:1239 ui/evolution-mail-message.xml.h:87
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "O_dbri╧i"
 
-#: mail/folder-browser.c:1244
+#: mail/folder-browser.c:1313
 msgid "Add Sender to Address Book"
 msgstr "Po╧iljatelja dodaj v adresar"
 
-#: mail/folder-browser.c:1249
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Uveljavi filtre"
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "Iz sporoХila ustvari _pravilo"
 
-#: mail/folder-browser.c:1392
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "Filter glede na Po╧tni seznam"
 
-#: mail/folder-browser.c:1393
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "vMapa glede na Po╧tni seznam"
 
-#: mail/folder-browser.c:1395
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter glede na Po╧tni seznam (%s)"
 
-#: mail/folder-browser.c:1396
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "vMapa glede na Po╧tni seznam (%s)"
 
-#: mail/folder-browser-ui.c:252
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Lastnosti za \"%s\""
-
-#: mail/folder-browser-ui.c:254
-msgid "Properties"
-msgstr "Lastnosti"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "Evolucijina komponenta za obravnavo po╧te."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Evolucijin setavljalnik po╧te."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Evolucijina komponenta za povzetke."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Evolucijina komponenta za po╧tne mape."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Evolucijina komponenta za tovarne po╧tnih map."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Tovarna za Evolucijinega skladatelja."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Tovarna za Evolucijino komponento po╧te."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "Tovarna za komponento povzetka po╧te."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Mail configuration interface"
-msgstr "Vmesnik za nastavitev po╧te"
-
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr "Tovarna za uvoz mbox predalov v Evolucijo"
@@ -6012,20 +6678,26 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
 msgid "You have not filled in all of the required information."
 msgstr "Niste vpisali vseh potrebnih podatkov."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:154
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Urejevalnik Evolucijinih raХunov"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Urejevalnik Evolucijinih raХunov"
 
-#: mail/mail-account-gui.c:891
+#: mail/mail-account-gui.c:971
 msgid "Save signature"
 msgstr "Shrani podpis"
 
-#: mail/mail-account-gui.c:897
+#: mail/mail-account-gui.c:977
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -6035,28 +6707,38 @@ msgstr ""
 "\n"
 "╝elite shraniti spremembe?"
 
-#: mail/mail-accounts.c:130
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr " (privzeto)"
 
-#: mail/mail-accounts.c:169
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "IzkljuХi"
 
-#: mail/mail-accounts.c:171 mail/mail-config.glade.h:37
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "VkljuХi"
 
-#: mail/mail-accounts.c:259 mail/mail-accounts.c:263
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "Ste prepriХani, da ╬elite zbrisati ta raХun?"
 
-#: mail/mail-accounts.c:504 mail/mail-accounts.c:508
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Odbri╧i"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "Naj bo to moj privzet raХun"
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr "Ste prepriХani, ╬elite zbrisati ta noviХarski raХun?"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:697
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Upravljalnik Evolucijinih raХunov"
 
@@ -6132,8 +6814,8 @@ msgid ""
 "Send anyway?"
 msgstr ""
 "To sporoХilo vsebuje le prejemnike bcc.\n"
-"Mo╬no je, da po╧tni stre╬nik razkrije prejemnike z dodatkom glave Apparenlty-"
-"To (OХitno-za).\n"
+"Mo╬no je, da po╧tni stre╬nik razkrije prejemnike z dodatkom glave "
+"Apparenlty-To (OХitno-za).\n"
 "Vseeno po╧lji?"
 
 #: mail/mail-callbacks.c:359
@@ -6144,29 +6826,29 @@ msgstr "Navesti morate naslovnike, Хe ╬eliti poslati sporoХilo."
 msgid "You must configure an account before you can send this email."
 msgstr "Nastaviti morate raХun preden lahko po╧ljete to e-po╧to."
 
-#: mail/mail-callbacks.c:655
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr "Na %s, je %s zapisal(a):"
 
-#: mail/mail-callbacks.c:874
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Posredovano sporoХilo:\n"
 
-#: mail/mail-callbacks.c:968
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "Prestavi sporoХilo(a) v"
 
-#: mail/mail-callbacks.c:970
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "Kopiraj sporoХilo(a) v"
 
-#: mail/mail-callbacks.c:1325
+#: mail/mail-callbacks.c:1374
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Ste prepriХani, da ╬elite urediti vseh %d sporoХil?"
 
-#: mail/mail-callbacks.c:1347
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6174,7 +6856,7 @@ msgstr ""
 "Urejate lahko le sporoХila shranjena\n"
 "v mapi Osnutki."
 
-#: mail/mail-callbacks.c:1381
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6182,36 +6864,24 @@ msgstr ""
 "Znova lahko po╧ljete le sporoХila\n"
 " iz mape Poslano."
 
-#: mail/mail-callbacks.c:1393
+#: mail/mail-callbacks.c:1442
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Ste prepriХani, da ╬elite znova poslati vseh %d sporoХil?"
 
-#: mail/mail-callbacks.c:1414
+#: mail/mail-callbacks.c:1463
 msgid "No Message Selected"
 msgstr "Izbrano ni nilo nobeno sporoХilo"
 
-#: mail/mail-callbacks.c:1448 mail/mail-display.c:98
-msgid "Overwrite file?"
-msgstr "Prepi╧i datoteko?"
-
-#: mail/mail-callbacks.c:1452 mail/mail-display.c:102
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Datoteka z enakim imenom ╬e obstaja.\n"
-"Naj jo prepi╧em?"
-
-#: mail/mail-callbacks.c:1496
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Shrani sporoХilo kot..."
 
-#: mail/mail-callbacks.c:1498
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Shrani sporoХila kot..."
 
-#: mail/mail-callbacks.c:1683
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6220,23 +6890,23 @@ msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1741
+#: mail/mail-callbacks.c:1776
+msgid "Filters"
+msgstr "Filtri"
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Natisni sporoХilo"
 
-#: mail/mail-callbacks.c:1788
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "Tiskanje sporoХila ni uspelo"
 
-#: mail/mail-callbacks.c:1883
+#: mail/mail-callbacks.c:1966
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Ste prepriХani, ╬elite odpreti vseh %d sporoХil v loХenih oknih?"
 
-#: mail/mail-config.c:1561 mail/mail-config.c:1564
-msgid "Connecting to server..."
-msgstr "Vzpostavljam povezavo s stre╬nikom..."
-
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -6281,10 +6951,14 @@ msgstr ""
 "raХun. Ime bo uporabljeno le za prikaz."
 
 #. set window title
-#: mail/mail-config-druid.c:445
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr "Evolucijin Хarovnik za raХune"
 
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
+msgstr "Vzpostavljam povezavo s stre╬nikom..."
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr " Preveri za podprte tipe"
@@ -6294,58 +6968,63 @@ msgid " color"
 msgstr " barvo"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Podpisovanje v tem kodirniku ni podprto"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "RaХun"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Podatki o raХunu"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "Upravljanje z raХunom"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "RaХuni"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr "Kadar po╧iljam ╧ifrirano po╧to, vedno ╧ifriraj sebi"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr "Kadar po╧iljam ╧ifrirano po╧to, vedno ╧ifriraj sebi"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:11
 msgid "Always load images off the net"
 msgstr "Vedno nalo╬i slike s spleta"
 
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Priloga"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Avtentifikacija"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "NaХin avtentifikacije: "
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "Samodejno preveri za novo po╧to vsakih"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid "Certificate ID:"
 msgstr "ID certifikata:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:18
 msgid "Composer"
 msgstr "Skladatelj"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6361,244 +7040,273 @@ msgstr ""
 "\n"
 "Kliknite \"KonХaj\" za shranitev va╧ih nastavitev."
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "_Privzeto"
 
-#: mail/mail-config.glade.h:25
-msgid "Default \"Forward\" style is: "
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Default Forward style is: "
 msgstr "Privzet naХin \"Posreduj naprej\" je: "
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:27
 msgid "Default character set: "
 msgstr "Privzet nabor znakov: "
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr "Digitalni IDji..."
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "Opravljeno"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Osnutki"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Mapa osnutkov:"
 
-#: mail/mail-config.glade.h:34 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Uredi..."
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "E-po╧tni naslov:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:37
 msgid "Empty trash folders on exit"
 msgstr "Ob izhodu sprazni mapo smeti"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "VkljuХi"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Polno ime:"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Get Digital ID..."
 msgstr "Dobi digitalni ID..."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "HTML Signature:"
 msgstr "Podpis HTML:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Highlight citations with"
 msgstr "Osvetli citiranja z"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Identiteta"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "In HTML mail"
 msgstr "V po╧ti HTML"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "Inline"
 msgstr "Kot del sporoХila"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Load images if sender is in addressbook"
 msgstr "Nalo╬i slike, Хe je po╧iljatelj v adresarju"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "Nastavitev po╧te"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Tip po╧tnega predala"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "Naj bo to moj privzet raХun"
 
-#: mail/mail-config.glade.h:51
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "OznaХi sporoХila kot \"Prebrana\" po:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
 msgid "NNTP Server:"
 msgstr "Stre╬nik NNTP"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:59
 msgid "Never load images off the net"
 msgstr "Nikoli ne nalo╬i slik s spleta"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "Novice"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "Podatki po ╬elji"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Organizacija:"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:65
 msgid "PGP Key ID:"
 msgstr "ID kljuХa PGP:"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "Pot do izvr╧ljive datoteke PGP"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:70
 msgid "Pick a color"
 msgstr "Izberi barvo"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:71
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy (precej dobra zasebnost)"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Prompt when sending messages with an empty subject"
+msgstr "Dodajam sporoХilo brez navedene zadeve"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "Ne morem poslati sporoХila: ni naslovnikov."
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr "Po╧tni imenik Qmail"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:75
 msgid "Quoted"
 msgstr "Citirano"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "Sprejemam e-po╧to"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "Sprejemanje po╧te"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "Mo╬nosti sprejema"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "Potrebni podatki"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:83
 msgid "Secure MIME"
 msgstr "Varni MIME"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:84
 msgid "Security"
 msgstr "Varnost"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "Izberi datoteko PGP"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "Privzeto po╧lji po╧to v HTML obliki."
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "Po╧iljam e-po╧to"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "Po╧iljanje po╧te"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "Poslano"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr "Poslana sporoХila in osnutki"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "Mapa poslanih sporoХil:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Nastavitev stre╬nika"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Vrsta stre╬nika:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Stre╬nik zahteva avtentifikacijo"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Datoteka s podpisom:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:97
 msgid "Source"
 msgstr "Izvorna koda"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:98
 msgid "Source Information"
 msgstr "Podatki o izvorni kodi"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Viri"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "Posebne mape"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr "ObiХajnen Unix po╧tni predal"
 
-#: mail/mail-config.glade.h:94
-msgid "Type"
-msgstr "Vrsta"
-
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "Uporabi varno povezavo (SSL)"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Uporabni╧ko ime:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6608,226 +7316,228 @@ msgstr ""
 "\n"
 "Kliknite \"Naprej\" za zaХetek. "
 
-#: mail/mail-config.glade.h:102 ui/evolution-comp-editor.xml.h:20
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:47 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:47
-msgid "_Edit"
-msgstr "_Uredi"
-
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:112
 msgid "newswindow1"
 msgstr "oknonovic1"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:113
 msgid "placeholder"
 msgstr "dr╬alec mesta"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:114
 msgid "seconds."
 msgstr "sekund."
 
-#: mail/mail-crypto.c:59
+#: mail/mail-crypto.c:60
 msgid "Could not create a PGP signature context."
 msgstr "Nisem mogel ustvariti konteksta podpisovanja PGP."
 
-#: mail/mail-crypto.c:84
+#: mail/mail-crypto.c:86
 msgid "Could not create a PGP verification context."
 msgstr "Nisem mogel ustvariti konteksta preverjanja PGP."
 
-#: mail/mail-crypto.c:113
+#: mail/mail-crypto.c:116
 msgid "Could not create a PGP encryption context."
 msgstr "Nisem mogel ustvariti konteksta ╧ifiranja PGP."
 
-#: mail/mail-crypto.c:138
+#: mail/mail-crypto.c:142
 msgid "Could not create a PGP decryption context."
 msgstr "Nisem mogel ustvariti konteksta de╧ifriranja PGP."
 
-#: mail/mail-crypto.c:173
+#: mail/mail-crypto.c:177
 msgid "Could not create a S/MIME signature context."
 msgstr "Nisem mogel ustvariti konteksta podpisa S/MIME"
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:209
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Nisem mogel ustvariti konteksta certifikatov S/MIME."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:240
 msgid "Could not create a S/MIME encryption context."
 msgstr "Nisem mogel ustvariti konteksta ╧ifriranja S/MIME."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:271
 msgid "Could not create a S/MIME envelope context."
 msgstr "Nisem mogel ustvariti konteksta ovojnice S/MIME."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:301
 msgid "Could not create a S/MIME decode context."
 msgstr "Nisem mogel ustvariti konteksta de╧ifriranja S/MIME."
 
-#: mail/mail-display.c:220
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Shrani prilogo"
 
-#: mail/mail-display.c:330
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Shrani na disk..."
 
-#: mail/mail-display.c:332
-#, c-format
-msgid "Open in %s..."
-msgstr "Odpri v %s..."
-
-#: mail/mail-display.c:334
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "Poglej vsebino"
 
-#: mail/mail-display.c:369
-msgid "External Viewer"
-msgstr "zunanjem pregledovalniku"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "Odpri v %s..."
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Poglej vsebino (z %s)"
 
-#: mail/mail-display.c:396
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Skrij"
 
-#: mail/mail-display.c:1028
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "zunanjem pregledovalniku"
+
+#: mail/mail-display.c:1048
 msgid "Loading message content"
 msgstr "Nalagam vsebino sporoХila"
 
-#: mail/mail-display.c:1371
+#: mail/mail-display.c:1404
 msgid "Open Link in Browser"
 msgstr "Odpri povezavo v brskalniku"
 
-#: mail/mail-display.c:1373
+#: mail/mail-display.c:1406
 msgid "Copy Link Location"
 msgstr "Kopiraj lokacijo povezave"
 
-#: mail/mail-display.c:1375
+#: mail/mail-display.c:1408
 msgid "Save Link as (FIXME)"
 msgstr "Shrani povezavo kot"
 
-#: mail/mail-display.c:1377
-msgid "Save Image as"
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
 msgstr "Shrani sliko kot"
 
-#: mail/mail-format.c:532
+#: mail/mail-folder-cache.c:170
+#, fuzzy, c-format
+msgid "%d new"
+msgstr "%d minut"
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr "%d sekund"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s priloga"
 
-#: mail/mail-format.c:580
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nisem mogel razХleniti sporoХila MIME. Ka╬em izvorno besedilo."
 
-#: mail/mail-format.c:649 mail/message-list.etspec.h:2
+#: mail/mail-format.c:746
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:765 mail/message-list.etspec.h:4
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "E-po╧tni naslov:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:768
+#: mail/mail-format.c:867
 msgid "Reply-To"
 msgstr "Odgovori-na:"
 
-#: mail/mail-format.c:771 mail/message-list.etspec.h:10
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Za"
 
-#: mail/mail-format.c:774
+#: mail/mail-format.c:873
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:1096
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "Program GPG/PGP ni nastavljen."
 
-#: mail/mail-format.c:1111
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "╘ifrirano sporoХilo ni prikazano"
 
-#: mail/mail-format.c:1117
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "╘ifrirano sporoХilo"
 
-#: mail/mail-format.c:1118
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Kliknite ikono za de╧ifriranje."
 
-#: mail/mail-format.c:1174
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "To sporoХilo ima elektronski podpis in je ugotovljeno za avtentiХno."
 
-#: mail/mail-format.c:1182
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "To sporoХilo ima elektronski podpis, a se ne da dokazati, da je avtentiХno."
 
-#: mail/mail-format.c:1833
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Kazalec na FTP povezavo (%s)"
 
-#: mail/mail-format.c:1845
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Kazalec na krajevno datoteko (%s) veljaven na stre╬niku \"%s\""
 
-#: mail/mail-format.c:1849
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Kazalec na lokalno datoteko (%s)"
 
-#: mail/mail-format.c:1883
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Kazalec na FTP povezavo (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kazalec na neznane zunanje podatke (tip \"%s\")"
 
-#: mail/mail-format.c:1888
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr "NapaХno oblikovano dodatno telo sporoХila."
 
-#: mail/mail-local.c:455
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "Odpiram '%s'"
 
-#: mail/mail-local.c:755
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Spreminjam obliko zapisa mape iz \"%s\" v \"%s\""
 
-#: mail/mail-local.c:759
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Spremeni obliko zapisa mape iz \"%s\" v \"%s\""
-
-#: mail/mail-local.c:782
-msgid "Reconfiguring folder"
-msgstr "Prenastavljam mapo"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:811
-msgid "Closing current folder"
-msgstr "Zapiram trenutno mapo"
-
-#: mail/mail-local.c:838
-msgid "Renaming old folder and opening"
-msgstr "Preimenujem in odpiram staro mapo"
-
-#: mail/mail-local.c:856
-msgid "Creating new folder"
-msgstr "Ustvari novo mapo"
-
-#: mail/mail-local.c:870
-msgid "Copying messages"
-msgstr "Kopiram sporoХilo"
-
-#: mail/mail-local.c:887
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6836,7 +7546,7 @@ msgstr ""
 "Nisem mogel shraniti meta podatkov mape; verjetno ne boste veХ mogli odpreti "
 "te mape: %s"
 
-#: mail/mail-local.c:926
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6844,12 +7554,17 @@ msgstr ""
 "хe ne morete veХ odpreti tega po╧tnega predala, potem\n"
 "ga boste morda morali popraviti roХno."
 
-#: mail/mail-local.c:1012
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "Ne morete kopirati sporoХil iz te mape smeti."
+
+#: mail/mail-local.c:1011
 #, c-format
 msgid "Reconfigure %s"
 msgstr "Znova nastavi %s"
 
-#: mail/mail-mt.c:190
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6858,7 +7573,7 @@ msgstr ""
 "Napaka ob '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6867,110 +7582,104 @@ msgstr ""
 "Napaka ob opravljanju dejanja:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:885
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Delam"
 
-#: mail/mail-mt.c:867
-msgid "Evolution progress"
-msgstr "Napredek evolucije"
-
-#: mail/mail-ops.c:547
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Po╧iljam \"%s\""
 
-#: mail/mail-ops.c:551
-msgid "Sending message"
-msgstr "Po╧iljam sporoХilo"
-
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Po╧iljam sporoХilo %d od %d"
 
-#: mail/mail-ops.c:681
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Neuspeh pri sporoХilu %d od %d"
 
-#: mail/mail-ops.c:683 mail/mail-send-recv.c:492
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "KonХano."
 
-#: mail/mail-ops.c:768
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Shranjujem sporoХilo v mapo"
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Prestavljam sporoХila v %s"
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram sporoХia v %s"
 
-#: mail/mail-ops.c:863
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Prestavljam"
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Kopiram"
 
-#: mail/mail-ops.c:956
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Osve╬ujem mape v \"%s\""
 
-#: mail/mail-ops.c:1118
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "Smeti"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "Posredovana sporoХila"
 
-#: mail/mail-ops.c:1159 mail/mail-ops.c:1297
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "Odpiram mapo %s"
 
-#: mail/mail-ops.c:1226
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr "Odpiram shrambo %s"
 
-#: mail/mail-ops.c:1365
+#: mail/mail-ops.c:1436
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1497
+#: mail/mail-ops.c:1568
 msgid "Refreshing folder"
 msgstr "Osve╬ujem mapo"
 
-#: mail/mail-ops.c:1533
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "UniХujem mapo"
 
-#: mail/mail-ops.c:1582
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Prena╧am sporoХilo %s"
 
-#: mail/mail-ops.c:1649
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Prena╧am sporoХilo"
 
-#: mail/mail-ops.c:1659
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Prena╧am sporoХilo ╧tevilka %d od %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1733
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Shranjujem sporoХila"
 
-#: mail/mail-ops.c:1812
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6979,12 +7688,7 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1825
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Shranjujem sporoХilo %d od %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6993,11 +7697,11 @@ msgstr ""
 "Napaka ob shranjevanju sporoХil v: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1913
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "Shranjujem prilogo"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -7006,12 +7710,12 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1956
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: mail/mail-ops.c:2023
+#: mail/mail-ops.c:2101
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odklapljam se od %s"
@@ -7020,23 +7724,33 @@ msgstr "Odklapljam se od %s"
 msgid "(Untitled Message)"
 msgstr "(Neimenovano sporoХilo)"
 
-#: mail/mail-search.c:268
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Neimenovano sporoХilo)"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "Kopiraj sporoХilo"
+
+#: mail/mail-search.c:284
 msgid "Find in Message"
 msgstr "Poi╧Хi v sporoХilu"
 
-#: mail/mail-search.c:298
+#: mail/mail-search.c:314
 msgid "Case Sensitive"
 msgstr "Razlikuj velike in male Хrke"
 
-#: mail/mail-search.c:299
+#: mail/mail-search.c:315
 msgid "Search Forward"
 msgstr "I╧Хi naprej"
 
-#: mail/mail-search.c:316
+#: mail/mail-search.c:332
 msgid "Find:"
 msgstr "Poi╧Хi"
 
-#: mail/mail-search.c:319
+#: mail/mail-search.c:335
 msgid "Matches:"
 msgstr "Ustreza:"
 
@@ -7068,111 +7782,108 @@ msgstr "Po╧iljam"
 msgid "Cancelled."
 msgstr "Preklicano."
 
-#: mail/mail-tools.c:159
+#: mail/mail-session.c:171
+msgid "User canceled operation."
+msgstr "Uporabnik je dejanje preklical."
+
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Nisem mogel ustvariti zaХasnega po╧tnega predala `%s': %s"
 
-#: mail/mail-tools.c:207
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (posredovano sporoХilo)"
-
-#: mail/mail-tools.c:217
-msgid "Fwd: (no subject)"
-msgstr "Posreduj: (ni zadeve)"
-
-#: mail/mail-tools.c:234
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Posredovano sporoХilo %s"
 
-#: mail/mail-tools.c:236
-msgid "Forwarded message (no subject)"
-msgstr "Posredovano sporoХilo (brez navedene zadeve)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Posredovana sporoХila"
 
-#: mail/mail-tools.c:457
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
-"s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Posredovano sporoХilo-----<br><b>Od:</b> %s<br><b>Za:</b> %"
-"s<br><b>Predmet:</b> %s<br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Posredovana sporoХila"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "vMape"
 
-#: mail/mail-vfolder.c:438
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Nova vMapa"
 
-#: mail/message-list.c:608
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "Nevideno"
 
-#: mail/message-list.c:609
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "Videno"
 
-#: mail/message-list.c:610
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Odgovorjeno"
 
-#: mail/message-list.c:611
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "veХ nevidenih sporoХil"
 
-#: mail/message-list.c:612
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "VeХ sporoХil"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "najni╬ja"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "nizka"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "visoka"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "najvi╧ja"
 
-#: mail/message-list.c:872
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:879
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "Danes %l:%M %p"
 
-#: mail/message-list.c:888
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "VХeraj %l:%M %p"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/message-list.c:910
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.etspec.h:3
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Nitim seznam sporoХil"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "OznaХeno"
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "Sprejeto"
 
@@ -7180,10 +7891,6 @@ msgstr "Sprejeto"
 msgid "Size"
 msgstr "Velikost"
 
-#: mail/mail-session.c:170
-msgid "User canceled operation."
-msgstr "Uporabnik je dejanje preklical."
-
 #: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Mapa"
@@ -7228,43 +7935,87 @@ msgstr "Tovarna za Evolucijine komponente za povzetke."
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Ne morem inicializirati Evolucijine komponente za povzetke."
 
-#: my-evolution/e-summary-calendar.c:158 my-evolution/e-summary-calendar.c:176
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
 msgid "Appointments"
 msgstr "Zmeneki"
 
-#: my-evolution/e-summary-calendar.c:159
+#: my-evolution/e-summary-calendar.c:177
 msgid "No appointments"
 msgstr "Ni zmenkov"
 
-#: my-evolution/e-summary-calendar.c:203 my-evolution/e-summary-calendar.c:209
-msgid "%I:%M%p"
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
 msgstr "%I:%M%p"
 
-#: my-evolution/e-summary-mail.c:100
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%a %l:%M %p"
+
+#: my-evolution/e-summary-mail.c:104
 msgid "Mail summary"
 msgstr "Povzetek po╧te"
 
-#: my-evolution/e-summary-rdf.c:378 my-evolution/e-summary-rdf.c:404
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+#, fuzzy
+msgid "Add a news feed"
+msgstr "Dodaj noviХarski stre╬nik"
+
+#: my-evolution/e-summary-preferences.c:877
+#, fuzzy
+msgid "Enter the URL of the news feed you wish to add"
+msgstr "Vpi╧ite ime raХunalnika na katerem teХe noviХarski stre╬nik."
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "_Nastavive Moje Evolucije..."
+
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
+msgstr "Napaka ob nalaganju datoteke koledarja."
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Napaka ob prena╧anju RDF</b>"
 
-#: my-evolution/e-summary-weather.c:56
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "Nova naloga"
+
+#: my-evolution/e-summary-weather.c:57
 msgid "My Weather"
 msgstr "Moje vreme"
 
-#: my-evolution/e-summary-weather.c:296
-msgid "<b>Error downloading Metar</b>"
-msgstr "<b>Napaka ob prena╧anju Metar</b>"
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
 
-#: my-evolution/e-summary-weather.c:612
+#: my-evolution/e-summary-weather.c:643
 msgid "Regions"
 msgstr "ObmoХja"
 
-#: my-evolution/e-summary.c:413 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A, %e %B %Y"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 msgid "Print My Evolution"
 msgstr "Natisni Mojo evolucijo"
 
-#: my-evolution/e-summary.c:459
+#: my-evolution/e-summary.c:518
 msgid "Printing of My Evolution failed"
 msgstr "Tiskanje Moje evolucije ni uspelo"
 
@@ -7272,95 +8023,95 @@ msgstr "Tiskanje Moje evolucije ni uspelo"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Komponenta povzetka ni mogla inicializirati Bonoba.\n"
 
-#: my-evolution/metar.c:43
+#: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Jasno"
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 msgid "Broken clouds"
 msgstr "Prete╬no oblaХno"
 
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
 msgid "Scattered clouds"
 msgstr "Delno oblaХno"
 
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:47
 msgid "Few clouds"
 msgstr "Prete╬no jasno"
 
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
 msgid "Overcast"
 msgstr "OblaХno"
 
-#: my-evolution/metar.c:55 my-evolution/metar.c:73 my-evolution/metar.c:136
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
 msgid "Invalid"
 msgstr "Neveljavno"
 
-#: my-evolution/metar.c:62
+#: my-evolution/metar.c:63
 msgid "Variable"
 msgstr "Spremenljivo"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "North"
 msgstr "sever"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "North - NorthEast"
 msgstr "sever - severovzhod"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "Northeast"
 msgstr "severovzhod"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "East - NorthEast"
 msgstr "vzhod - severovzhod"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East"
 msgstr "vzhod"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - Southeast"
 msgstr "vzhod - jugovzhod"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "Southeast"
 msgstr "jugovzhod"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "South - Southeast"
 msgstr "jug - jugovzhod"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South"
 msgstr "jug"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southwest"
 msgstr "jug - jugozahod"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "Southwest"
 msgstr "jugozahod"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "West - Southwest"
 msgstr "zahod - jugozahod"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West"
 msgstr "zahod"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Northwest"
 msgstr "zahod - severozahod"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "Northwest"
 msgstr "severozahod"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "North - Northwest"
 msgstr "sever - severozahod"
 
@@ -7368,1062 +8119,1194 @@ msgstr "sever - severozahod"
 #. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
 #. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Drizzle"
 msgstr "Pr╧enje"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Drizzle in the vicinity"
 msgstr "Pr╧enje v okolici"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Light drizzle"
 msgstr "Rahlo pr╧enje"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Moderate drizzle"
 msgstr "Zmerno pr╧enje"
 
 # @ Hmmm...
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Heavy drizzle"
 msgstr "MoХno pr╧enje"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Shallow drizzle"
 msgstr "Plitvo pr╧enje"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Patches of drizzle"
 msgstr "Ponekod pr╧i"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Partial drizzle"
 msgstr "Pr╧i s presledki"
 
-#: my-evolution/metar.c:99 my-evolution/metar.c:100
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
 msgid "Thunderstorm"
 msgstr "Nevihta"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Windy drizzle"
 msgstr "Pr╧enje z vetrom"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Showers"
 msgstr "Plohe"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Drifting drizzle"
 msgstr "Pr╧enje v pasovih"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Freezing drizzle"
 msgstr "ZmrzujoХe pr╧enje"
 
 #. RAIN
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Rain"
 msgstr "De╬"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Rain in the vicinity"
 msgstr "De╬ v okolici"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Light rain"
 msgstr "Rahel de╬"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Moderate rain"
 msgstr "Zmeren de╬"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Heavy rain"
 msgstr "MoХan de╬"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Shallow rain"
 msgstr "Plitev de╬"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Patches of rain"
 msgstr "Ponekod de╬uje"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Partial rainfall"
 msgstr "De╬uje s presledki"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Blowing rainfall"
 msgstr "De╬ z vetrom"
 
 # @ Hmmm....
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Rain showers"
 msgstr "Plohe"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Drifting rain"
 msgstr "De╬ v pasovih"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Freezing rain"
 msgstr "ZmrzujoХ de╬"
 
 #. SNOW
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Snow"
 msgstr "Sne╬i"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Snow in the vicinity"
 msgstr "Sne╬i v okolici"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Light snow"
 msgstr "Rahlo sne╬i"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Moderate snow"
 msgstr "Zmerno sne╬i"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Heavy snow"
 msgstr "MoХno sne╬i"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Shallow snow"
 msgstr "Plitvo sne╬i"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Patches of snow"
 msgstr "Ponekod sne╬i"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Partial snowfall"
 msgstr "Sne╬i s presledki"
 
-#: my-evolution/metar.c:101 my-evolution/metar.c:102
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
 msgid "Snowstorm"
 msgstr "Sne╬na nevihta"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Blowing snowfall"
 msgstr "Sne╬i z vetrom"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Snow showers"
 msgstr "Sne╬ne plohe"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Drifting snow"
 msgstr "Sne╬i v pasovih"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Freezing snow"
 msgstr "ZmrzujoХe sne╬i"
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Snow grains"
 msgstr "Zrnat sneg"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Snow grains in the vicinity"
 msgstr "Zrnato sne╬i v okolici"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Light snow grains"
 msgstr "Rahlo zrnato sne╬i"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Moderate snow grains"
 msgstr "Zmerno zrnato sne╬i"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Heavy snow grains"
 msgstr "MoХno zrnato sne╬i"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Shallow snow grains"
 msgstr "Plitvo zrnato sne╬i"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Patches of snow grains"
 msgstr "Ponekod zrnato sne╬i"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Partial snow grains"
 msgstr "Zrnato sne╬i s presledki"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Blowing snow grains"
 msgstr "Zrnato sne╬i z vetrom"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Snow grain showers"
 msgstr "Plohe zrnatega snega"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Drifting snow grains"
 msgstr "Zrnato sne╬i v pasovih"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Freezing snow grains"
 msgstr "ZmrzujoХe zrnato sne╬i"
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Ice crystals"
 msgstr "Ledene iglice"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Ice crystals in the vicinity"
 msgstr "Ledene iglice v okolici"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Few ice crystals"
 msgstr "Malo ledenih iglic"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Moderate ice crystals"
 msgstr "Zmerne ledene iglice"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Heavy ice crystals"
 msgstr "MoХne ledene iglice"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Patches of ice crystals"
 msgstr "Ponekod ledene iglice"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Partial ice crystals"
 msgstr "Ledene iglice s presledki"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Ice crystal storm"
 msgstr "Nevihta ledenih iglic"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Blowing ice crystals"
 msgstr "Ledene iglice z vetrom"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Showers of ice crystals"
 msgstr "Plohe ledenih iglic"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Drifting ice crystals"
 msgstr "Ledene iglice v pasovih"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Freezing ice crystals"
 msgstr "ZmrzujoХe ledene iglice"
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Ice pellets"
 msgstr "Babje p╧eno"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Ice pellets in the vicinity"
 msgstr "Babje p╧eno v okolici"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Few ice pellets"
 msgstr "Nekaj babjega p╧ena"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Moderate ice pellets"
 msgstr "Zmerno babje p╧eno"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Heavy ice pellets"
 msgstr "MoХno babje p╧eno"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Shallow ice pellets"
 msgstr "Plitvo babje p╧eno"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Patches of ice pellets"
 msgstr "Ponekod babje p╧eno"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Partial ice pellets"
 msgstr "Babje p╧eno s presledki"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Ice pellet storm"
 msgstr "Nevihta babjega p╧ena"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Blowing ice pellets"
 msgstr "Babje p╧eno z vetrom"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Showers of ice pellets"
 msgstr "Plohe babjega p╧ena"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Drifting ice pellets"
 msgstr "Babje p╧eno v pasovih"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Freezing ice pellets"
 msgstr "ZmrzujoХe babje p╧eno"
 
 #. HAIL
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hail"
 msgstr "ToХa"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hail in the vicinity"
 msgstr "ToХa v okolici"
 
-#: my-evolution/metar.c:105 my-evolution/metar.c:106
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
 msgid "Light hail"
 msgstr "Rahla toХa"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Moderate hail"
 msgstr "Zmerna toХa"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Heavy hail"
 msgstr "MoХna toХa"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Shallow hail"
 msgstr "Plitva toХa"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Patches of hail"
 msgstr "Ponekod toХa"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Partial hail"
 msgstr "ToХa s presledki"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hailstorm"
 msgstr "Nevihta toХe"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Blowing hail"
 msgstr "ToХa z vetrom"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hail showers"
 msgstr "Ploha toХe"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Drifting hail"
 msgstr "ToХa v pasovih"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Freezing hail"
 msgstr "ZmrzujoХa toХa"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Small hail"
 msgstr "Sodra"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Small hail in the vicinity"
 msgstr "Sodra v okolici"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Moderate small hail"
 msgstr "Zmerna sodra"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Heavy small hail"
 msgstr "MoХna sodra"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Shallow small hail"
 msgstr "Plitva sodra"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Patches of small hail"
 msgstr "Ponekod sodra"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Partial small hail"
 msgstr "Sodra s presledki"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Small hailstorm"
 msgstr "Nevihta sodre"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Blowing small hail"
 msgstr "Sodra z vetrom"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Showers of small hail"
 msgstr "Ploha sodre"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Drifting small hail"
 msgstr "Sodra v pasovih"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Freezing small hail"
 msgstr "ZmrzujoХa sodra"
 
 #. PRECIPITATION
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Unknown precipitation"
 msgstr "Neznane padavine"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Precipitation in the vicinity"
 msgstr "Padavine v okolici"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Light precipitation"
 msgstr "Rahle padavine"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Moderate precipitation"
 msgstr "Zmerne padavine"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Heavy precipitation"
 msgstr "MoХne padavine"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Shallow precipitation"
 msgstr "Plitve padavine"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Patches of precipitation"
 msgstr "Ponekod padavine"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Partial precipitation"
 msgstr "Padavine s presledki"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Unknown thunderstorm"
 msgstr "Nevihta neznanih padavin"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Blowing precipitation"
 msgstr "Padavine z vetrom"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Showers, type unknown"
 msgstr "Ploha neznanih padavin"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Drifting precipitation"
 msgstr "Padavine v pasovih"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Freezing precipitation"
 msgstr "ZmrzujoХe padavine"
 
 #. MIST
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Mist"
 msgstr "Meglice"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Mist in the vicinity"
 msgstr "Meglice v okolici"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Light mist"
 msgstr "Rahle meglice"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Moderate mist"
 msgstr "Zmerne meglice"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Thick mist"
 msgstr "Goste meglice"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Shallow mist"
 msgstr "Plitve meglice"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Patches of mist"
 msgstr "Ponekod meglice"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Partial mist"
 msgstr "Meglice s presledki"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Mist with wind"
 msgstr "Meglice z vetrom"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Drifting mist"
 msgstr "Meglice v pasovih"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Freezing mist"
 msgstr "ZmrzujoХe meglice"
 
 #. FOG
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Fog"
 msgstr "Megla"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Fog in the vicinity"
 msgstr "Megla v okolici"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Light fog"
 msgstr "Rahla megla"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Moderate fog"
 msgstr "Zmerna megla"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Thick fog"
 msgstr "Gosta megla"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Shallow fog"
 msgstr "Plitva megla"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Patches of fog"
 msgstr "Ponekod megla"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Partial fog"
 msgstr "Megla s presledki"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Fog with wind"
 msgstr "Megla z vetrom"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Drifting fog"
 msgstr "Megla v pasovih"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Freezing fog"
 msgstr "ZmrzujoХa megla"
 
 #. SMOKE
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Smoke"
 msgstr "Dim"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Smoke in the vicinity"
 msgstr "Dim v okolici"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Thin smoke"
 msgstr "Redek dim"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Moderate smoke"
 msgstr "Zmeren dim"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Thick smoke"
 msgstr "Gost dim"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Shallow smoke"
 msgstr "Plitev dim"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Patches of smoke"
 msgstr "Ponekod dim"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Partial smoke"
 msgstr "Dim s presledki"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Smoke w/ thunders"
 msgstr "Dim z grmenjem"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Smoke with wind"
 msgstr "Dim z vetrom"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Drifting smoke"
 msgstr "Dim v pasovih"
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Volcanic ash"
 msgstr "Vulkanski pepel"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Volcanic ash in the vicinity"
 msgstr "Vulkanski pepel v okolici"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Moderate volcanic ash"
 msgstr "Zmeren vulkanski pepel"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Thick volcanic ash"
 msgstr "Gost vulkanski pepel"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Shallow volcanic ash"
 msgstr "Plitev vulkanski pepel"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Patches of volcanic ash"
 msgstr "Ponekod vulkanski dim"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Partial volcanic ash"
 msgstr "Vulkanski dim s presledki"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Volcanic ash w/ thunders"
 msgstr "Vulkanski dim z grmenjem"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Blowing volcanic ash"
 msgstr "Vulkanski dim z vetrom"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Showers of volcanic ash "
 msgstr "Plohe vulkanskega dima"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Drifting volcanic ash"
 msgstr "Vulkanski dim v pasovih"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Freezing volcanic ash"
 msgstr "ZmrzujoХ vulkanski dim"
 
 #. SAND
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Sand"
 msgstr "Pesek"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Sand in the vicinity"
 msgstr "Pesek v okolici"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Light sand"
 msgstr "Rahel pesek"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Moderate sand"
 msgstr "Zmeren pesek"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Heavy sand"
 msgstr "MoХan pesek"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Patches of sand"
 msgstr "Ponekod pesek"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Partial sand"
 msgstr "Pesek s presledki"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Blowing sand"
 msgstr "Pesek z vetrom"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Drifting sand"
 msgstr "Pesek v pasovih"
 
 #. HAZE
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Haze"
 msgstr "Suha motnost"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Haze in the vicinity"
 msgstr "Suha motnost v okolici"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Light haze"
 msgstr "Rahla suha motnost"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Moderate haze"
 msgstr "Zmerna suha motnost"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Thick haze"
 msgstr "Gosta suha motnost"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Shallow haze"
 msgstr "Plitva suha motnost"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Patches of haze"
 msgstr "Ponekod suha motnost"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Partial haze"
 msgstr "Suha motnost s presledki"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Haze with wind"
 msgstr "Suha motnost z vetrom"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Drifting haze"
 msgstr "Suhta motnost v pasovih"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Freezing haze"
 msgstr "ZmrzujoХa suha motnost"
 
 #. SPRAY
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Sprays"
 msgstr "Pr╧ec"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Sprays in the vicinity"
 msgstr "Pr╧ec v okolici"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Light sprays"
 msgstr "Rahel pr╧ec"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Moderate sprays"
 msgstr "Zmeren pr╧ec"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Heavy sprays"
 msgstr "MoХan pr╧ec"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Shallow sprays"
 msgstr "Plitev pr╧ec"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Patches of sprays"
 msgstr "Ponekod pr╧ec"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Partial sprays"
 msgstr "Pr╧ec s presledki"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Blowing sprays"
 msgstr "Pr╧ec z vetrom"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Drifting sprays"
 msgstr "Pr╧ec v pasovih"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Freezing sprays"
 msgstr "ZmrzujoХ pr╧ec"
 
 #. DUST
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Dust"
 msgstr "Prah"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Dust in the vicinity"
 msgstr "Prah v okolici"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Light dust"
 msgstr "Rahel prah"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Moderate dust"
 msgstr "Zmeren prah"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Heavy dust"
 msgstr "Gost prah"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Patches of dust"
 msgstr "Ponekod prah"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Partial dust"
 msgstr "Prah s presledki"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Blowing dust"
 msgstr "Prah z vetrom"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Drifting dust"
 msgstr "Prah v pasovih"
 
 #. SQUALL
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Squall"
 msgstr "Pi╧ vetra"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Squall in the vicinity"
 msgstr "Pi╧ vetra v okolici"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Light squall"
 msgstr "Rahel pi╧ vetra"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Moderate squall"
 msgstr "Zmeren pi╧ vetra"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Heavy squall"
 msgstr "MoХan pi╧ vetra"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Partial squall"
 msgstr "Pi╧ vetra s presledki"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Thunderous squall"
 msgstr "Pi╧ vetra z grmenjem"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Blowing squall"
 msgstr "NТ╧en pi╧ vetra"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Drifting squall"
 msgstr "Pi╧ vetra v pasovih"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Freezing squall"
 msgstr "ZmrzujoХ pi╧ vetra"
 
 #. SANDSTORM
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Sandstorm"
 msgstr "Pe╧Хeni vihar"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Sandstorm in the vicinity"
 msgstr "Pe╧Хeni vihar v okolici"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Light standstorm"
 msgstr "Rahel pe╧Хeni vihar"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Moderate sandstorm"
 msgstr "Zmeren pe╧Хeni vihar"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Heavy sandstorm"
 msgstr "MoХan pe╧Хeni vihar"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Shallow sandstorm"
 msgstr "Plitev pe╧Хeni vihar"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Partial sandstorm"
 msgstr "Pe╧Хeni vihar s presledki"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Thunderous sandstorm"
 msgstr "Pe╧Хeni vihar z grmenjem"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Blowing sandstorm"
 msgstr "NТsen pe╧Хeni vihar"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Drifting sandstorm"
 msgstr "Pe╧Хeni vihar v pasovih"
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Freezing sandstorm"
 msgstr "ZmrzujoХ pe╧Хeni vihar"
 
 #. DUSTSTORM
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Duststorm"
 msgstr "Pra╧ni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Duststorm in the vicinity"
 msgstr "Pra╧ni vihar v okolici"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Light duststorm"
 msgstr "Rahel pra╧ni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Moderate duststorm"
 msgstr "Zmeren pra╧ni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Heavy duststorm"
 msgstr "MoХan pra╧ni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Shallow duststorm"
 msgstr "Plitev pra╧ni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Partial duststorm"
 msgstr "Pra╧ni vihar s presledki"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Thunderous duststorm"
 msgstr "Pra╧ni vihar z grmenjem"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Blowing duststorm"
 msgstr "NТsen pra╧ni vihar"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Drifting duststorm"
 msgstr "Pra╧ni vihar v pasovih"
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Freezing duststorm"
 msgstr "ZmrzujoХ pra╧ni vihar"
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Funnel cloud"
 msgstr "Tromba"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Funnel cloud in the vicinity"
 msgstr "Tromba v okolici"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Light funnel cloud"
 msgstr "Rahla tromba"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Moderate funnel cloud"
 msgstr "Zmerna tromba"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Thick funnel cloud"
 msgstr "Gosta tromba"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Shallow funnel cloud"
 msgstr "Plitva tromba"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Patches of funnel clouds"
 msgstr "Ponekod trombe"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Partial funnel clouds"
 msgstr "Trombe s presledki"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Funnel cloud w/ wind"
 msgstr "Tromba z vetrom"
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Drifting funnel cloud"
 msgstr "Tromba v pasovih"
 
 #. TORNADO
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Tornado"
 msgstr "Tornado"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Tornado in the vicinity"
 msgstr "Tornado v okolici"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Moderate tornado"
 msgstr "Zmeren tornado"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Raging tornado"
 msgstr "Hud tornado"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Partial tornado"
 msgstr "Tornado s presledki"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Thunderous tornado"
 msgstr "Tornado z grmenjem"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Drifting tornado"
 msgstr "Tornado v pasovih"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Freezing tornado"
 msgstr "ZmrzujoХ tornado"
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Dust whirls"
 msgstr "Pra╧ni vrtinec"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Dust whirls in the vicinity"
 msgstr "Pra╧ni vrtinci v okolici"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Light dust whirls"
 msgstr "Rahli pra╧ni vrtinci"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Moderate dust whirls"
 msgstr "Zmerni pra╧ni vrtinci"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Heavy dust whirls"
 msgstr "MoХni pra╧ni vrtinci"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Shallow dust whirls"
 msgstr "Plitvi pra╧ni vrtinci"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Patches of dust whirls"
 msgstr "Ponekod pra╧ni vrtinci"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Partial dust whirls"
 msgstr "Pra╧ni vrtinci s presledki"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Blowing dust whirls"
 msgstr "Pra╧ni vrtinci z vetrom"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Drifting dust whirls"
 msgstr "Pra╧ni vrtinci v pasovih"
 
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "Dodaj noviХarski stre╬nik"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Vse mape"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "Vsi udele╬eni"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Prika╬i mape, ki se zaХnejo z:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "Poka╬i mo╬nosti"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "Prikaz"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "petek"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+#, fuzzy
+msgid "News Feed Settings"
+msgstr "Nastavitve"
+
+#: my-evolution/my-evolution.glade.h:14
+#, fuzzy
+msgid "News Feeds"
+msgstr "NoviХarski stre╬niki"
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "1 dan"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "mesec"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr "1 teden"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr ""
+"NaХrtuj\n"
+"Хas"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Ka╬i vse"
+
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "Ka╬i celotne _glave"
+
+#: my-evolution/my-evolution.glade.h:22
+msgid "Show today's tasks"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "Naloge"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
+msgstr ""
+"\n"
+"  Enota:  "
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Moje vreme"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "Preveri nastavitve"
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "april"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "Evolucijina lupina."
+
 #: shell/e-activity-handler.c:198
 msgid "Show Details"
 msgstr "Ka╬i podrobnosti"
@@ -8432,7 +9315,12 @@ msgstr "Ka╬i podrobnosti"
 msgid "Cancel Operation"
 msgstr "PrekliХi operacijo"
 
-#: shell/e-setup.c:125 shell/e-setup.c:198
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "Posebne mape"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Namestitev Evolucije"
 
@@ -8453,21 +9341,17 @@ msgstr ""
 msgid "Could not update files correctly"
 msgstr "Nisem mogel pravilno prenoviti datotek"
 
-#: shell/e-setup.c:173 shell/e-setup.c:241
-msgid "Evolution files successfully installed."
-msgstr "Evolucijine datoteke so se uspe╧no namestile."
-
-#: shell/e-setup.c:202
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Ka╬e, da je to va╧ prvi zagon Evolucije."
 
-#: shell/e-setup.c:203
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Prosim kliknite \"V redu\" za namestitev Evolucijinih uporabni╧kih datotek "
 "pod"
 
-#: shell/e-setup.c:222
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -8478,16 +9362,14 @@ msgstr ""
 "%s\n"
 "Napaka: %s"
 
-#: shell/e-setup.c:237
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
-"`%s'."
-msgstr ""
-"Ne morem kopirati datotek v\n"
+"An error occurred in copying files into\n"
 "`%s'."
+msgstr "Ob branju datoteke se je zgodila napaka."
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -8498,7 +9380,7 @@ msgstr ""
 "Prosim premestite jo, da se lahko namestitev\n"
 "Evolucijinih uporabni╧kih datotek nadaljuje."
 
-#: shell/e-setup.c:318
+#: shell/e-setup.c:322
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -8512,7 +9394,7 @@ msgstr ""
 "lahko Evolucija po╬ene.\n"
 "╝elite, da odstranim ta imenik?"
 
-#: shell/e-setup.c:343
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -8523,56 +9405,56 @@ msgstr ""
 "Prosim premestite jo, da se lahko namestitev\n"
 "Evolucijinih uporabni╧kih datotek nadaljuje."
 
-#: shell/e-shell.c:446
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Ne morem nastaviti krajevnega hranilnika -- %s"
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "Ne morem dobiti mape: %s: %s"
 
-#: shell/e-shell.c:1308
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"Ne morem kopirati datotek v\n"
+"`%s'."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
 msgstr ""
-"Opa!  Pogled `%s' je nepriХakovano umru.  :-(\n"
-"To verjetno pomeni, da se je komponenta %s sesula."
 
-#: shell/e-shell-folder-commands.c:242
+#: shell/e-shell-folder-commands.c:270
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Navedite mapo kamor naj se skopira mapa \"%s\":"
 
-#: shell/e-shell-folder-commands.c:247
+#: shell/e-shell-folder-commands.c:275
 msgid "Copy folder"
 msgstr "Kopiraj mapo"
 
-#: shell/e-shell-folder-commands.c:285
+#: shell/e-shell-folder-commands.c:313
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Navedite mapo, kamor naj se prestavi mapa \"%s\":"
 
-#: shell/e-shell-folder-commands.c:290
+#: shell/e-shell-folder-commands.c:318
 msgid "Move folder"
 msgstr "Prestavi mapo"
 
-#. Popup a dialog asking if they are sure they want to delete
-#. the folder
-#: shell/e-shell-folder-commands.c:324
+#: shell/e-shell-folder-commands.c:354
 #, c-format
 msgid "Delete folder '%s'"
 msgstr "Zbri╧i mapo '%s'"
 
-#: shell/e-shell-folder-commands.c:332
+#: shell/e-shell-folder-commands.c:363
 #, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "Ste prepriХani, da ╬elite zbrisati mapo '%s'?"
 
-#: shell/e-shell-folder-commands.c:390
+#: shell/e-shell-folder-commands.c:422
 #, c-format
 msgid "Rename folder '%s'"
 msgstr "Preimenuj mapo '%s'"
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -8581,11 +9463,11 @@ msgstr ""
 "Ne morem ustvariti izbrane mape:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "Izbrano ime mape ni veljavno."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolucija - Ustvar novo mapo"
 
@@ -8597,11 +9479,11 @@ msgstr ""
 "Tip izbrane mape ni veljaven za zahtevano\n"
 "operacijo."
 
-#: shell/e-shell-folder-selection-dialog.c:332
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Nova..."
 
-#: shell/e-shell-folder-title-bar.c:468 shell/e-shell-folder-title-bar.c:469
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Neimenovana)"
 
@@ -8710,51 +9592,19 @@ msgstr "Izberite ciljno mapo za uvoz teh podatkov"
 msgid "Closing connections..."
 msgstr "Prekinjam povezave..."
 
-#: shell/e-shell-view.c:173
-msgid "(No folder displayed)"
-msgstr "(Nobena mapa ni prikazana)"
-
-#. Special case for My Evolution
-#: shell/e-shell-view.c:1386 shell/e-storage-set-view.c:1441
-msgid "My Evolution"
-msgstr "Moja Evolucija"
-
-#: shell/e-shell-view.c:1403
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolucija %s"
-
-#: shell/e-shell-view.c:1405
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolucija %s [%s]"
-
-#: shell/e-shell-view.c:1443
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Evolucija je trenutno na mere╬i.  Kliknite na ta gumb za delo brez mre╬e."
-
-#: shell/e-shell-view.c:1450
-msgid "Evolution is in the process of going offline."
-msgstr "Evolucija je v procesu odklapljanja z mre╬e."
-
-#: shell/e-shell-view.c:1456
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr "Evolucija trenutno ni na mre╬i.  Kliknite ta gumb za delo z mre╬o."
-
-#: shell/e-shell-view-menu.c:182
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Program 'Bug buddy' ni bil najden v va╧i poti ($PATH)."
 
-#: shell/e-shell-view-menu.c:188
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Programa 'Bug buddy' ni bilo mogoХe pognati."
 
-#: shell/e-shell-view-menu.c:233
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Avtorske pravice pridr╬ane 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:235
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -8764,55 +9614,87 @@ msgstr ""
 "GNOME za delo v skupinah, za po╧to, koledar in \n"
 "urejanje stikov."
 
-#: shell/e-shell-view-menu.c:464
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Pojdi v mapo..."
 
-#: shell/e-shell-view-menu.c:465
+#: shell/e-shell-view-menu.c:438
 msgid "Select the folder that you want to open"
 msgstr "Izberite mapo, ki jo ╬elite odpreti"
 
-#: shell/e-shell-view-menu.c:610
+#: shell/e-shell-view-menu.c:583
 msgid "Create a new shortcut"
 msgstr "Ustvari novo bli╬njico"
 
-#: shell/e-shell-view-menu.c:611
+#: shell/e-shell-view-menu.c:584
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Izberite mapo na katero naj ka╬e bli╬njica:"
 
-#: shell/e-shell-view-menu.c:718
-msgid "Work online"
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
 msgstr "Delaj na mre╬i"
 
-#: shell/e-shell-view-menu.c:730 shell/e-shell-view-menu.c:742
-msgid "Work offline"
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
 msgstr "Delaj brez mre╬e"
 
-#: shell/e-shortcuts.c:601
-msgid "Error saving shortcuts."
-msgstr "Napaka ob shranjevanju bli╬njic."
+#: shell/e-shell-view.c:175
+msgid "(No folder displayed)"
+msgstr "(Nobena mapa ni prikazana)"
 
-#: shell/e-shortcuts.c:998
-msgid "Shortcuts"
-msgstr "Bli╬njice"
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+msgid "My Evolution"
+msgstr "Moja Evolucija"
 
-#: shell/e-shortcuts.c:1000
-msgid "Inbox"
-msgstr "Dohodna po╧ta"
+#: shell/e-shell-view.c:1411
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolucija %s"
 
-#: shell/e-shortcuts.c:1003
-msgid "Contacts"
-msgstr "Stik"
+#: shell/e-shell-view.c:1413
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolucija %s [%s]"
+
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Evolucija je trenutno na mere╬i.  Kliknite na ta gumb za delo brez mre╬e."
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr "Evolucija je v procesu odklapljanja z mre╬e."
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr "Evolucija trenutno ni na mre╬i.  Kliknite ta gumb za delo z mre╬o."
 
-#: shell/e-shortcuts-view.c:136
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Ne morem nastaviti krajevnega hranilnika -- %s"
+
+#: shell/e-shell.c:1311
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"Opa!  Pogled `%s' je nepriХakovano umru.  :-(\n"
+"To verjetno pomeni, da se je komponenta %s sesula."
+
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Ustvari novo skupino bli╬njic"
 
-#: shell/e-shortcuts-view.c:139
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Ime skupine:"
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -8821,156 +9703,191 @@ msgstr ""
 "Zares ╬elite odstraniti skupino\n"
 "`%s' iz vrstice bli╬njic?"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "Ne odstrani"
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:300
 msgid "Rename Shortcut Group"
 msgstr "Preimenuj skupino bli╬njic"
 
-#: shell/e-shortcuts-view.c:293
+#: shell/e-shortcuts-view.c:301
 msgid "Rename selected shortcut group to:"
 msgstr "Preimenuj izbrano skupino bli╬njic v:"
 
-#: shell/e-shortcuts-view.c:303
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "_Majhne ikone"
 
-#: shell/e-shortcuts-view.c:304
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Ka╬i bli╬njice kot majhne ikone"
 
-#: shell/e-shortcuts-view.c:306
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "_Velike ikone"
 
-#: shell/e-shortcuts-view.c:307
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Ka╬i bli╬njice kot velike ikone"
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "_Nova skupina..."
 
-#: shell/e-shortcuts-view.c:319
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Ustvari novo skupino bli╬njic"
 
-#: shell/e-shortcuts-view.c:321
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "_Odstrani to skupino..."
 
-#: shell/e-shortcuts-view.c:322
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Odstrani to skupino bli╬njic"
 
-#: shell/e-shortcuts-view.c:324
-msgid "Re_name This Group..."
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
 msgstr "_Preimenuj to skupino..."
 
-#: shell/e-shortcuts-view.c:325
+#: shell/e-shortcuts-view.c:336
 msgid "Rename this shortcut group"
 msgstr "Preimenuj to skupino bli╬njic"
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "_Skrij vrstico z bli╬njicami"
 
-#: shell/e-shortcuts-view.c:331
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "Skrij vrstico z bli╬njicami"
 
-#: shell/e-shortcuts-view.c:450
+#: shell/e-shortcuts-view.c:461
 msgid "Rename shortcut"
 msgstr "Preimenuj bli╬njico"
 
-#: shell/e-shortcuts-view.c:451
+#: shell/e-shortcuts-view.c:462
 msgid "Rename selected shortcut to:"
 msgstr "Preimenuj izbrano bli╬njico v:"
 
-#: shell/e-shortcuts-view.c:463
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Odpri"
+
+#: shell/e-shortcuts-view.c:474
 msgid "Open the folder linked to this shortcut"
 msgstr "Odpri mapo povezano s to bli╬njico"
 
-#: shell/e-shortcuts-view.c:465 ui/evolution.xml.h:24
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Odpri v novem oknu"
 
-#: shell/e-shortcuts-view.c:465
+#: shell/e-shortcuts-view.c:476
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Odpri mapo povezano s to bli╬njico v novem oknu"
 
-#: shell/e-shortcuts-view.c:468
+#: shell/e-shortcuts-view.c:479
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: shell/e-shortcuts-view.c:468
+#: shell/e-shortcuts-view.c:479
 msgid "Rename this shortcut"
 msgstr "Preimenuj to bli╬njico"
 
-#: shell/e-shortcuts-view.c:470
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstrani to bli╬njico iz vrstice bli╬njic"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:585
+msgid "Error saving shortcuts."
+msgstr "Napaka ob shranjevanju bli╬njic."
+
+#: shell/e-shortcuts.c:982
+msgid "Shortcuts"
+msgstr "Bli╬njice"
+
+#: shell/e-shortcuts.c:984
+msgid "Inbox"
+msgstr "Dohodna po╧ta"
+
+#: shell/e-shortcuts.c:987
+msgid "Contacts"
+msgstr "Stik"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Brez imena)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Brez napak"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "GeneriХna napaka"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "Mapa z enakim imenom ╬e obstaja"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "Izbran tip mape ni veljaven"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "V/I napaka"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "Ni dovolj prostora za ustvaritev mape"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "Izbrana mapa ni bila najdena"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "Funkcija ni implementirana v tem hranilniku"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "Nimate dovoljenja"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "Operacija ni podprta"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "Izbran tip ni podprt v tem hranilniku"
 
-#: shell/e-task-widget.c:167
+#: shell/e-task-widget.c:168
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:172
-#, c-format
+#: shell/e-task-widget.c:173
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% konХano)"
 
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "Prekinjam povezave..."
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "Gostitelj:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Ime mape:"
@@ -8983,10 +9900,6 @@ msgstr "Vrsta mape:"
 msgid "Specify where to create the folder:"
 msgstr "Navedi kje naj se ustvarimapa:"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "Evolucijina lupina."
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Kliknite \"Uvozi\" za priХetek uvoza datoteke v Evolucijo. "
@@ -9017,22 +9930,26 @@ msgstr "Uvozniki"
 msgid "Don't import"
 msgstr "Ne uvozi"
 
-#: shell/main.c:89
-#, no-c-format
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr "Ne spra╧uj me veХ"
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
@@ -9054,7 +9971,7 @@ msgstr ""
 "Upamo, da boste u╬ivali sadove na╧ega trdega dela in nestrpno\n"
 "priХakujemo va╧e prispevke!\n"
 
-#: shell/main.c:114
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -9062,28 +9979,28 @@ msgstr ""
 "Hvala,\n"
 "skupina Evolucije\n"
 
-#: shell/main.c:152
+#: shell/main.c:155
 msgid "Cannot access the Evolution shell."
 msgstr "Ne morem dostopati do lupine Evolucije."
 
-#: shell/main.c:212
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "IzkljuХi zaХetni zaslon"
 
-#: shell/main.c:213
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr "Po╧lji razhro╧Хevalna sporoХila vseh komponent v datoteko."
 
-#: shell/main.c:248
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne morem inicializirati komponentnega sistema Bonobo."
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:3
-#: ui/evolution-tasks.xml.h:1
-msgid "C_ut"
-msgstr "_Izre╬i"
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Kopiraj"
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:6
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
 msgstr "Kopiraj izbrano"
 
@@ -9095,7 +10012,11 @@ msgstr "Ustvari nov stik"
 msgid "Create new contact list"
 msgstr "Ustvari nov seznam stikov"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:11
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Izre╬i"
+
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
 msgid "Cut the selection"
 msgstr "Izre╬i izbrano"
 
@@ -9111,7 +10032,11 @@ msgstr "Nov stik"
 msgid "New list"
 msgstr "Nov seznam"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:27
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Prilepi"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Prilepi odlo╬i╧Хe"
 
@@ -9151,19 +10076,8 @@ msgstr "_Stik"
 msgid "_Contact Group"
 msgstr "Skupina _stikov"
 
-#: ui/evolution-addressbook.xml.h:25 ui/evolution-calendar.xml.h:47
-#: ui/evolution-tasks.xml.h:14
-msgid "_Copy"
-msgstr "_Kopiraj"
-
-#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:52
-#: ui/evolution-tasks.xml.h:16
-msgid "_Paste"
-msgstr "_Prilepi"
-
-#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:53
-#: ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13 ui/my-evolution.xml.h:5
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "Na_tisni..."
 
@@ -9175,171 +10089,132 @@ msgstr "_I╧Хi po kontaktih"
 msgid "_Select All"
 msgstr "_Izberi vse"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:55
-#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:64
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_Orodja"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 dni"
-
 #: ui/evolution-calendar.xml.h:2
-msgid "Alter preferences"
-msgstr "Alternativne nastavitve"
+#, fuzzy
+msgid "Configure the calendar's settings"
+msgstr "Nastavi veznik adresarja"
 
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new all day Event"
+#: ui/evolution-calendar.xml.h:4
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "Ustvari nov celodnevni dogodek"
 
-#: ui/evolution-calendar.xml.h:8
-msgid "Create a new appointment"
+#: ui/evolution-calendar.xml.h:5
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Ustvari nov zmenek"
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Create a new calendar"
-msgstr "Ustvari nov koledar"
+#: ui/evolution-calendar.xml.h:6
+msgid "Create a new appointment"
+msgstr "Ustvari nov zmenek"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr "Dan"
+#: ui/evolution-calendar.xml.h:7
+#, fuzzy
+msgid "Create an event for the whole day"
+msgstr "Ustvari nov zmenek za danes"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Pojdi na"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Pojdi po Хasu nazaj"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Pojdi po Хasu naprej"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "Pojdi na _datum"
 
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to _Today"
-msgstr "Pojdi na _danes"
-
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Pojdi na doloХen datum"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Pojdi na sedanjost"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Month"
-msgstr "Mesec"
-
-#: ui/evolution-calendar.xml.h:22
-msgid "New _Event"
-msgstr "Nov _dogodek"
-
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail-message.xml.h:48
-msgid "Next"
-msgstr "Naslednje"
-
-#: ui/evolution-calendar.xml.h:25
-msgid "Open Calendar"
-msgstr "Odpri koledar"
-
-#: ui/evolution-calendar.xml.h:28
-msgid "Prev"
-msgstr "Nazaj"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Nov zmenek"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Predogled koledarja, ki bo natisnjen"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Natisni koledar"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Natisni ta koledar"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy Information"
 msgstr "Objavi podatek o zasedenosti"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:23
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Objavi podatek o zasedenosti za ta koledar"
 
-#: ui/evolution-calendar.xml.h:36 ui/evolution-message-composer.xml.h:19
-msgid "Save As"
-msgstr "Shrani kot"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "Save calendar as something else"
-msgstr "Shrani koledar kot nekaj drugega"
-
-#: ui/evolution-calendar.xml.h:38
-msgid "Settings..."
-msgstr "Nastavitve..."
-
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Ka╬i en dan"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Ka╬i en mesec"
 
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Ka╬i en teden"
 
-#: ui/evolution-calendar.xml.h:42
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Poka╬i delavni teden"
 
-#: ui/evolution-calendar.xml.h:43 widgets/misc/e-cell-date-edit.c:232
-#: widgets/misc/e-dateedit.c:431
-msgid "Today"
-msgstr "Danes"
-
-#: ui/evolution-calendar.xml.h:44
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "_Delavni teden"
 
-#: ui/evolution-calendar.xml.h:45
-msgid "Week"
-msgstr "Teden"
-
-#: ui/evolution-calendar.xml.h:46
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "_Zmenek"
 
-#: ui/evolution-calendar.xml.h:48
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "_Nastavive po╧te..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "_Dan"
 
-#: ui/evolution-calendar.xml.h:49
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "_Mesec"
 
-#: ui/evolution-calendar.xml.h:50 ui/evolution.xml.h:57
-msgid "_New"
-msgstr "_Nova"
-
-#: ui/evolution-calendar.xml.h:51
-msgid "_Open Calendar"
-msgstr "Odpri ko_ledar"
-
-#: ui/evolution-calendar.xml.h:56
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "_Teden"
 
-#: ui/evolution-comp-editor.xml.h:1
-msgid "C_lose"
-msgstr "_Zapri"
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Zapri"
 
 #: ui/evolution-comp-editor.xml.h:3
 msgid "Close this appointment"
@@ -9350,7 +10225,7 @@ msgid "Delete this appointment"
 msgstr "Zbri╧i ta zmenek"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:21
 msgid "Main toolbar"
 msgstr "Glavna orodna vrstica"
 
@@ -9358,7 +10233,7 @@ msgstr "Glavna orodna vrstica"
 msgid "Preview the printed item"
 msgstr "Predogled natisnjenega predmeta"
 
-#: ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
 msgid "Print Pre_view"
 msgstr "Predogled _tiskanja"
 
@@ -9367,22 +10242,15 @@ msgid "Print S_etup"
 msgstr "Nastavitev t_iskanja"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
-#: ui/evolution-contact-list-editor.xml.h:5
 msgid "Print this item"
 msgstr "Natisni ta predmet"
 
 #: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:6
 msgid "Print..."
 msgstr "Natisni..."
 
-#: ui/evolution-comp-editor.xml.h:14 widgets/misc/e-filter-bar.h:94
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "Shrani kot..."
-
 #: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:5
 msgid "Save and Close"
 msgstr "Shrani in zapri"
 
@@ -9402,18 +10270,15 @@ msgstr "Nastavi lastnosti strani za va╧ trenutni tiskalnik"
 msgid "_Action"
 msgstr "_Dejanje"
 
-#: ui/evolution-comp-editor.xml.h:21 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
 #: ui/evolution-mail-messagedisplay.xml.h:10
-#: ui/evolution-message-composer.xml.h:48 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:48
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ui/evolution-comp-editor.xml.h:22 ui/evolution.xml.h:52
-msgid "_Help"
-msgstr "_PomoХ"
-
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Zbri╧i ta predmet"
@@ -9428,13 +10293,12 @@ msgid "Help"
 msgstr "PomoХ"
 
 #: ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-contact-list-editor.xml.h:4
 msgid "Print En_velope..."
 msgstr "Natisni kuverto..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:7
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Shrani _kot..."
 
@@ -9455,26 +10319,31 @@ msgid "Send _message to contact..."
 msgstr "Po╧lji _sporoХilo stiku..."
 
 #: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:10
 #: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Shrani"
 
 #: ui/evolution-contact-list-editor.xml.h:2
-msgid "Delete this group"
-msgstr "Zbri╧i to skupino"
+#, fuzzy
+msgid "Delete this list"
+msgstr "Zbri╧i ta predmet"
 
-#: ui/evolution-contact-list-editor.xml.h:9
-msgid "Save the group and close the dialog box"
-msgstr "Shrani skupino in zapri pogovorno okno"
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "Shrani stik in zapri dialog"
 
-#: ui/evolution-contact-list-editor.xml.h:10
-msgid "Se_nd group to other..."
-msgstr "_Po╧lji skupino drugim..."
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "Po╧lji stik drugim..."
 
-#: ui/evolution-contact-list-editor.xml.h:11
-msgid "Send _message to group..."
-msgstr "Po╧lji _sporoХilo skupini..."
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "Po╧lji _sporoХilo stiku..."
 
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
@@ -9509,7 +10378,7 @@ msgid "Schedule a meeting for this item"
 msgstr "NaХrtuj sestanek za ta predmet"
 
 #: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:41
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Actions"
 msgstr "_Dejanja"
 
@@ -9530,78 +10399,83 @@ msgid "Compose"
 msgstr "Sestavi"
 
 #: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Sestavi novo sporoХilo"
+
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit mail accounts and other preferences"
 msgstr "Ustvari ali uredi po╧tne raХune in ostale nastavitve"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
 msgstr "Ustvari ali uredi pravila za filtriranje nove po╧te"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:7
 msgid "Create or edit virtual folder definitions"
 msgstr "Ustvari ali uredi doloХitve navideznih map"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
 msgstr "Sprazni _smeti"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget _Passwords"
 msgstr "Pozabi _gesla"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:10
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Pozabi pomnjena gesla tako, da boste zanje znova vpra╧ani"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:11
 msgid "Manage _Subscriptions..."
 msgstr "Uredi _naroХnine..."
 
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:12
 msgid "Open a window for composing a mail message"
 msgstr "Odpri okno za sestavljanje novega po╧tnega sporoХila"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:13
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Trajno odstrani vsa zbrisana sporoХila iz vseh map"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send / Receive"
 msgstr "Oddaja / sprejem"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Send queued mail and retrieve new mail"
 msgstr "Po╧lji po╧to v vrsti in sprejmi novo po╧to"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "Ka╬i okno predogleda sporoХila"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:17
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "NaroХi se ali prekliХi naroХnino na mape z oddaljenih stre╬nikov"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "Virtual Folder _Editor..."
 msgstr "Urejevalnik _virtualnih map..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Filters..."
 msgstr "_Filtri..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:20
 msgid "_Mail Message"
 msgstr "_Po╧lji sporoХilo"
 
-#: ui/evolution-mail-global.xml.h:20
+#: ui/evolution-mail-global.xml.h:21
 msgid "_Mail Settings..."
 msgstr "_Nastavive po╧te..."
 
-#: ui/evolution-mail-global.xml.h:21
+#: ui/evolution-mail-global.xml.h:22
 msgid "_Preview Pane"
 msgstr "Pano _predogleda"
 
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:23
 msgid "_Send / Receive"
 msgstr "_Oddaja / sprejem"
 
@@ -9626,7 +10500,8 @@ msgid "Hide _Deleted Messages"
 msgstr "Skrij _zbrisana sporoХila"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide _Read messages"
+#, fuzzy
+msgid "Hide _Read Messages"
 msgstr "Skrij _prebrana sporoХila"
 
 #: ui/evolution-mail-list.xml.h:9
@@ -9694,7 +10569,7 @@ msgstr "Niten seznam sporoХil"
 msgid "_Expunge"
 msgstr "_UniХi"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:49
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
 msgid "_Folder"
 msgstr "_Mapa"
 
@@ -9702,7 +10577,7 @@ msgstr "_Mapa"
 msgid "_Invert Selection"
 msgstr "_Obrni izbor"
 
-#: ui/evolution-mail-list.xml.h:28 ui/evolution.xml.h:59
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Properties..."
 msgstr "_Lastnosti..."
 
@@ -9795,19 +10670,23 @@ msgid "Display the previous unread message"
 msgstr "Ka╬i prej╧nje neprebrano sporoХilo"
 
 #: ui/evolution-mail-message.xml.h:24
-msgid "Filter on Mailing _List"
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "Filter glede na p_o╧tni seznam"
 
 #: ui/evolution-mail-message.xml.h:25
-msgid "Filter on Se_nder"
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "Filter glede na po╧ilja_telja"
 
 #: ui/evolution-mail-message.xml.h:26
-msgid "Filter on _Recipients"
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "Filter glede na preje_mnike"
 
 #: ui/evolution-mail-message.xml.h:27
-msgid "Filter on _Subject"
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "Filter glede na za_devo"
 
 #: ui/evolution-mail-message.xml.h:28
@@ -9850,198 +10729,238 @@ msgstr "Nekomu posreduj izbrano sporoХilo"
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Nekomu posreduj izbrano sporoХilo kot prilogo"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 msgid "Load _Images"
 msgstr "Nalo╬i _slike"
 
-#: ui/evolution-mail-message.xml.h:39
-msgid "Mar_k As Read"
-msgstr "OznaХi _kot prebrano"
-
-#: ui/evolution-mail-message.xml.h:40
-msgid "Mark As I_mportant"
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
 msgstr "OznaХi kot po_membno"
 
-#: ui/evolution-mail-message.xml.h:41
-msgid "Mark As U_nread"
-msgstr "OznaХi kot _neprebrano"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
+msgstr "OznaХi kot po_membno"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "OznaХi izbrana sporoХila kot prebrana"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark the selected messages as important"
 msgstr "OznaХi izbrana sporoХila kot pomembna"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "OznaХi izbrana sporoХila kot neprebrana"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "OznaХi izbrana sporoХila kot pomembna"
+
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages for deletion"
 msgstr "OznaХi izbrana sporoХila za brisanje"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Prestavi"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "Prestavi izbrana sporoХila v drugo mapo"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "Naslednje"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Naslednje sporoХilo"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Naslednje sporoХilo"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Izberi ni_t"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Naslednje sporoХilo"
+
+#: ui/evolution-mail-message.xml.h:56
 msgid "Open the selected message in a new window"
 msgstr "Odpri izbrano sporoХilo v novem oknu"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:57
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Odpri izbrano sporoХilo v skladatelju za vnoviХno po╧iljanje"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:58
 msgid "Previews the message to be printed"
 msgstr "Predogled sporoХika, ki bo natisnjeno"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:59
 msgid "Previous"
 msgstr "Prej╧nje"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Prej╧nje sporoХilo"
+
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Prej╧nje sporoХilo"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Prej╧nje sporoХilo"
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Print Message..."
 msgstr "Natisni sporoХilo..."
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:65
 msgid "Print Preview..."
 msgstr "Predogled tiskanja..."
 
-#: ui/evolution-mail-message.xml.h:56
-msgid "Print message to the printer"
-msgstr "Natisni sporoХilo na tiskalniku"
-
-#: ui/evolution-mail-message.xml.h:57
-msgid "Redirect (FIXME: implement me)"
-msgstr "Preusmeri (FIXME: implementiraj me)"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "Natisni sporoХilo"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply"
 msgstr "Odgovori"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:68
 msgid "Reply to All"
 msgstr "Odgovori vsem"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:71
 msgid "S_earch Message"
 msgstr "_I╧Хi v sporoХilu"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:72
 msgid "Save the message as a text file"
 msgstr "Shrani sporoХilo kot datoteko z besedilom"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:73
 msgid "Search for text in the body of the displayed message"
 msgstr "I╧Хi besedilo v telesu prikazanega sporoХila"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "Ka╬i _izvor po╧te"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:75
 msgid "Show Full _Headers"
 msgstr "Ka╬i celotne _glave"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:76
 msgid "Show message in the normal style"
 msgstr "Ka╬i sporoХila v obiХajnem slogu"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:77
 msgid "Show message with all email headers"
 msgstr "Ka╬i sporoХila s celotnimi glavami"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:78
 msgid "Show the raw email source of the message"
 msgstr "Ka╬i neposredno izvorno kodo sporoХila"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "Odbri╧i izbrana sporoХila"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:80
 msgid "VFolder on Mailing _List..."
 msgstr "vMapa glede na po╧tni se_znam..."
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:81
 msgid "VFolder on Se_nder..."
 msgstr "vMapa glede na _po╧iljatelja..."
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:82
 msgid "VFolder on _Recipients..."
 msgstr "vMapa glede na pre_jemnike..."
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:83
 msgid "VFolder on _Subject..."
 msgstr "vMapa glede na p_redmet"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_Uveljavi filtre"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Copy to Folder"
 msgstr "_Kopiraj v mapo"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "Iz sporoХila _ustvari filter"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:88
 msgid "_Forward Message"
 msgstr "SporoХilo _posreduj naprej"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:89
 msgid "_Message Display"
 msgstr "Prikaz _sporoХila"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Move to Folder"
 msgstr "_Prestavi v mapo"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Normal Display"
 msgstr "_ObiХajen prikaz"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Open Message"
 msgstr "_Odpri sporoХilo"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Re-send Message"
 msgstr "_Znova po╧lji sporoХilo"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Zapri to okno"
 
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
 msgid "Customi_ze Toolbars..."
 msgstr "_Prilagodi orodne vrstice..."
 
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:12
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
 msgid "Customize"
 msgstr "Prilagodi"
 
-#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:13
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
 msgid "Customize toolbars"
 msgstr "Prliagodi orodne vrstice"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
 msgid "_Close"
 msgstr "_Zapri"
 
 #: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:65
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
 msgid "_View"
 msgstr "Po_gled"
 
@@ -10049,11 +10968,7 @@ msgstr "Po_gled"
 msgid "Attach"
 msgstr "Prilo╬i"
 
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Prilo╬i datoteko"
-
-#: ui/evolution-message-composer.xml.h:4
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Zapri trenutno datoteko"
 
@@ -10078,50 +10993,57 @@ msgid "HTML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "Vstavi datoteko z besedilom..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Vstavi datoteko v sporoХilo kot besedilo"
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Vstavi datoteko z besedilom..."
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Odpri datoteko"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "╘ifriraj s PGP"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "Podpis s PGP"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
 msgstr "╘ifriraj z S/MIME"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr "Podpis z S/MIME"
 
-#: ui/evolution-message-composer.xml.h:18 widgets/misc/e-filter-bar.c:240
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
 msgid "Save"
 msgstr "Shrani"
 
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save _Draft"
-msgstr "Shrani _osnutek"
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Shrani kot"
 
 #: ui/evolution-message-composer.xml.h:22
-msgid "Save in _folder... (FIXME)"
-msgstr "Shrani v _mapo... (FIXME)"
+msgid "Save _Draft"
+msgstr "Shrani _osnutek"
 
 #: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Shrani v mapo..."
 
 #: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save the current file"
 msgstr "Shrani trenutno datoteko"
 
@@ -10194,33 +11116,36 @@ msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Preklopi prikaz polja Odgovori na"
 
 #: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "_Priloga"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "Polje _bcc"
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "Polje _cc"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
 msgid "_Debug"
 msgstr "_Razhro╧Хuj"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
 msgstr "_Zbri╧i vse"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "Polje _od"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Vstavi"
 
-#: ui/evolution-message-composer.xml.h:51
-msgid "_Insert text file..."
-msgstr "_Vstavi datoteko z besedilom..."
-
 #: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_Odpri..."
@@ -10233,6 +11158,10 @@ msgstr "Polje _Odgovori-na:"
 msgid "_Security"
 msgstr "_Varnost"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "_PomoХ"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Dodaj mapo na seznam naroХenih map"
@@ -10274,40 +11203,42 @@ msgid "Re_fresh Task"
 msgstr "Osve╬i opravilo"
 
 #: ui/evolution-tasks.xml.h:2
+#, fuzzy
+msgid "Configure the task view's settings"
+msgstr "Nastavi veznik adresarja"
+
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopiraj izbrano opravilo"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Ustvari nov posel"
 
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Izre╬i izbrano opravilo"
 
 #: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
+msgstr "Zbri╧i izbrana opravila"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Nova naloga"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Paste task from the clipboard"
 msgstr "Prilepi opravilo z odlo╬i╧Хa"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Shrani posel kot nekaj drugega"
 
-#: ui/evolution-tasks.xml.h:11
-msgid "Set task view preferences"
-msgstr "Nastavi pogled opravila"
-
-#: ui/evolution-tasks.xml.h:12
-msgid "Tasks Preferences..."
-msgstr "Nastavitve poslov..."
-
 #: ui/evolution-tasks.xml.h:13
-msgid "TasksPreferences"
-msgstr "Nastavitve opravil..."
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "_Nastavive po╧te..."
 
 #: ui/evolution-tasks.xml.h:19
 msgid "_Task"
@@ -10325,183 +11256,179 @@ msgstr "Dodaj v vrstico z _bli╬njicami"
 msgid "Change the name of this folder"
 msgstr "Spremeni ime te mape"
 
-#: ui/evolution.xml.h:4
-msgid "Change the properties for this folder"
-msgstr "Spremeni lastnosti te mape"
-
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:6
 msgid "Copy this folder"
 msgstr "Kopiraj mapo"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:7
 msgid "Create _New Folder..."
 msgstr "Ustvari _novo mapo..."
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:8
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Ustvari bli╬njico na to mapo v vrstici bli╬njic"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:9
 msgid "Create a new folder"
 msgstr "Ustvari novo mapo"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Zbri╧i to mapo"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Poka╬i drugo mapo"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "Iz_hod"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:16
 msgid "Evolution _FAQ"
 msgstr "_Pogosto zastavljena vpra╧anja"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "_Okno Evolucije"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Izhod iz programa"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "Kako _zaХeti"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Uvozi datoteko zunanje oblike"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:22
 msgid "Move this folder to another place"
 msgstr "Prestavi to mapo na drugo mesto"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Odpri v novem _oknu"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Odpri to mapo v drugem oknu"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Ka╬i podatke o Evoluciji"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Po╧lji poroХilo o hro╧Хu"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "_Po╧lji poroХilo o hro╧Хu"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "Po╧lji poroХilo o hro╧Хu z uporabo progama Bug buddy."
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:30
 msgid "Toggle"
 msgstr "Preklopi"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Preklopi prikaz vrstice z mapami"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Preklopi prikaz vrstice z bli╬njicami"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Preklopi delo z mre╬o"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "Uporaba upravljalnika _stikov"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "Uporaba _koledarja"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "Uporaba _po╧te"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:37
 msgid "View the selected folder"
 msgstr "Poglej izbrane mape"
 
 #: ui/evolution.xml.h:39
-msgid "Work Offline"
-msgstr "Delaj brez mre╬e"
-
-#: ui/evolution.xml.h:40
 msgid "_About Evolution..."
 msgstr "_O Evoluciji..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:41
 msgid "_Appointment (FIXME)"
 msgstr "_Zmenek (FIXME)"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:43
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt (FIXME)"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "_Kopiraj..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "_Vrstica map"
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "Pojdi v _mapo..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "_Uvozi datoteko..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "_Kazalo"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "_Po╧lji sporoХilo"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:55
 msgid "_Move..."
 msgstr "_Prestavi..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Nova"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "_Nova mapa"
 
-#: ui/evolution.xml.h:60
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Shortcut"
 msgstr "_Bli╬njica"
 
-#: ui/evolution.xml.h:62
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "_Vrstica z bli╬njicami"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Task (FIXME)"
 msgstr "_Naloga (FIXME)"
 
-#: ui/evolution.xml.h:66
+#: ui/evolution.xml.h:64
 msgid "_Work Offline"
 msgstr "_Delaj brez mre╬e"
 
@@ -10525,22 +11452,6 @@ msgstr "Po podjetju"
 msgid "Phone List"
 msgstr "Seznam telefonov"
 
-#: views/calendar/galview.xml.h:1
-msgid "Day View"
-msgstr "Dnevni pogled"
-
-#: views/calendar/galview.xml.h:2
-msgid "Month View"
-msgstr "MeseХni pogled"
-
-#: views/calendar/galview.xml.h:3
-msgid "Week View"
-msgstr "Tedenski pogled"
-
-#: views/calendar/galview.xml.h:4
-msgid "Work Week View"
-msgstr "Pogled delavnega tedna"
-
 #: views/mail/galview.xml.h:1
 msgid "By Sender"
 msgstr "Po po╧iljatelju"
@@ -10561,9 +11472,12 @@ msgstr "SporoХila"
 msgid "With Category"
 msgstr "S kategorijo"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "Poskusno"
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B %Y"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
@@ -10637,13 +11551,6 @@ msgstr "хas zakljuХka sestanka:"
 msgid "All Attendees"
 msgstr "Vsi udele╬eni"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B %Y"
-
 #: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "_Trenutni pogled"
@@ -10654,19 +11561,18 @@ msgstr "DoloХi poglede"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:427
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "PTSхPSN"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1067 widgets/misc/e-calendar-item.c:2766
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:425
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Sedaj"
 
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "Danes"
+
 #: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "V redu"
@@ -10753,19 +11659,24 @@ msgstr "Nabor znakov"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:167
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Urejevalnik stikov"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "Shrani iskanje"
 
-#: widgets/misc/e-filter-bar.c:238
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "Napredno iskanje"
 
-#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Ka╬i vse"
 
-#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Napredno..."
 
@@ -10818,6 +11729,278 @@ msgstr "init_corba(): nisem mogel inicializirati GNOMEa"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 
+#~ msgid "Set task view preferences"
+#~ msgstr "Nastavi pogled opravila"
+
+#~ msgid "TasksPreferences"
+#~ msgstr "Nastavitve opravil..."
+
+#~ msgid "???"
+#~ msgstr "???"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "_Stiki..."
+
+#~ msgid "_Company:"
+#~ msgstr "_Podjetje:"
+
+#~ msgid "(none)"
+#~ msgstr "(brez)"
+
+#~ msgid ""
+#~ "Notification about your journal entry starting on %s and ending on %s"
+#~ msgstr ""
+#~ "Obvestilo o va╧em dnevni╧kem vpisu, ki se zaХne ob %s in konХa ob %s"
+
+#~ msgid "Notification about your journal entry starting on %s"
+#~ msgstr "Obvestilo o va╧em dnevni╧kem vpisu, ki se zaХne ob %s"
+
+#~ msgid "Notification about your journal entry ending on %s"
+#~ msgstr "Obvestilo o va╧em dnevni╧kem vpisu, ki se konХa ob %s"
+
+#~ msgid "Notification about your journal entry"
+#~ msgstr "Obvestilo o va╧em dnevni╧kem vpisu"
+
+#~ msgid "Open calendar"
+#~ msgstr "Odpri koledar"
+
+#~ msgid "Save calendar"
+#~ msgstr "Shrani koledar"
+
+#~ msgid "Show a dialog"
+#~ msgstr "Ka╬i dialog"
+
+#~ msgid "Percent complete"
+#~ msgstr "Procentov opravljeno"
+
+#~ msgid "Edit this task"
+#~ msgstr "Uredi to opravilo"
+
+#~ msgid "Go to Today"
+#~ msgstr "Pojdi na danes"
+
+#~ msgid "Delete all Occurrences"
+#~ msgstr "Zbri╧i vse pojavitve"
+
+#~ msgid "Summary contains"
+#~ msgstr "Povzetek vsebuje"
+
+#~ msgid "Description contains"
+#~ msgstr "Opis vsebuje"
+
+#~ msgid "Comment contains"
+#~ msgstr "Komentar vsebuje"
+
+#~ msgid "Has category"
+#~ msgstr "Ima kategorijo"
+
+#~ msgid "time-now expects 0 arguments"
+#~ msgstr "time-now ne priХakuje argumentov"
+
+#~ msgid "make-time expects 1 argument"
+#~ msgstr "make-time priХakuje 1 argument"
+
+#~ msgid "make-time expects argument 1 to be a string"
+#~ msgstr "make-time priХakuje, da je 1. argument niz"
+
+#~ msgid "make-time argument 1 must be an ISO 8601 date/time string"
+#~ msgstr "1. argument make-time mora biti niz ISO 8601 datuma/Хasa"
+
+#~ msgid "time-add-day expects 2 arguments"
+#~ msgstr "time-add-day priХakuje 2 argumenta"
+
+#~ msgid "time-add-day expects argument 1 to be a time_t"
+#~ msgstr "time-add-day priХakuje, da je 1. argument time_t"
+
+#~ msgid "time-add-day expects argument 2 to be an integer"
+#~ msgstr "time-add-day priХakuje, da je 2. argument celo ╧tevilo (integer)"
+
+#~ msgid "time-day-begin expects 1 argument"
+#~ msgstr "time-day-begin priХakuje 1 argument"
+
+#~ msgid "time-day-begin expects argument 1 to be a time_t"
+#~ msgstr "time-day-begin priХakuje, da je 1. argument time_t"
+
+#~ msgid "time-day-end expects 1 argument"
+#~ msgstr "time-day-end priХakuje 1 argument"
+
+#~ msgid "time-day-end expects argument 1 to be a time_t"
+#~ msgstr "time-day-end priХakuje, da je 1. argument time_t"
+
+#~ msgid "get-vtype expects 0 arguments"
+#~ msgstr "get-vtype ne priХakuje argumentov"
+
+#~ msgid "occur-in-time-range? expects 2 arguments"
+#~ msgstr "occur-in-time-range? priХakuje 2 argumenta"
+
+#~ msgid "occur-in-time-range? expects argument 1 to be a time_t"
+#~ msgstr "occur-in-time-range? priХakuje, da je 1. argument time_t"
+
+#~ msgid "occur-in-time-range? expects argument 2 to be a time_t"
+#~ msgstr "occur-in-time-range? priХakuje, da je 2. argument time_t"
+
+#~ msgid "contains? expects 2 arguments"
+#~ msgstr "contains? priХakuje 2 argumenta"
+
+#~ msgid "contains? expects argument 1 to be a string"
+#~ msgstr "contains? priХakuje, da je 1. argument niz"
+
+#~ msgid "contains? expects argument 2 to be a string"
+#~ msgstr "contains? priХakuje, da je 2. argument niz"
+
+#~ msgid ""
+#~ "contains? expects argument 1 to be one of \"any\", \"summary\", "
+#~ "\"description\""
+#~ msgstr ""
+#~ "contains? priХakuje, da je 1. argument eden od \"any\" (karkoli), "
+#~ "\"summary\" (povzetek), \"description\"(opis)"
+
+#~ msgid "has-categories? expects at least 1 argument"
+#~ msgstr "has-categories? priХakuje vsaj 1 argument"
+
+#~ msgid "has-categories? expects all arguments to be strings"
+#~ msgstr "has-categories? priХakuje, da so vsi argumenti nizi"
+
+#~ msgid "Evaluation of the search expression did not yield a boolean value"
+#~ msgstr ""
+#~ "IzraХun iskalnega izraza ni podal vrednosti resniХno/neresniХno (boolean)"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Pregledujem mapo IMAP"
+
+#~ msgid "Error opening file: %s"
+#~ msgstr "Napaka ob odpiranju datoteke: %s"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Posreduj na naslove"
+
+#~ msgid "Elm Aliases"
+#~ msgstr "Vzdevki programa Elm"
+
+#~ msgid "Addressbooks"
+#~ msgstr "Adresarji"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "Spremeni obliko zapisa mape iz \"%s\" v \"%s\""
+
+#~ msgid "Reconfiguring folder"
+#~ msgstr "Prenastavljam mapo"
+
+#~ msgid "Closing current folder"
+#~ msgstr "Zapiram trenutno mapo"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Preimenujem in odpiram staro mapo"
+
+#~ msgid "Creating new folder"
+#~ msgstr "Ustvari novo mapo"
+
+#~ msgid "Copying messages"
+#~ msgstr "Kopiram sporoХilo"
+
+#~ msgid "Evolution progress"
+#~ msgstr "Napredek evolucije"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Prena╧am sporoХilo ╧tevilka %d od %d (uid \"%s\")"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Shranjujem sporoХilo %d od %d (uid \"%s\")"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (posredovano sporoХilo)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Posreduj: (ni zadeve)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Posredovano sporoХilo (brez navedene zadeve)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Posredovano sporoХilo-----<br><b>Od:</b> %s<br><b>Za:</b> "
+#~ "%s<br><b>Predmet:</b> %s<br>"
+
+#~ msgid "<b>Error downloading Metar</b>"
+#~ msgstr "<b>Napaka ob prena╧anju Metar</b>"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Evolucijine datoteke so se uspe╧no namestile."
+
+#~ msgid "5 Days"
+#~ msgstr "5 dni"
+
+#~ msgid "Alter preferences"
+#~ msgstr "Alternativne nastavitve"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Ustvari nov koledar"
+
+#~ msgid "Day"
+#~ msgstr "Dan"
+
+#~ msgid "Month"
+#~ msgstr "Mesec"
+
+#~ msgid "New _Event"
+#~ msgstr "Nov _dogodek"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Odpri koledar"
+
+#~ msgid "Prev"
+#~ msgstr "Nazaj"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Shrani koledar kot nekaj drugega"
+
+#~ msgid "Settings..."
+#~ msgstr "Nastavitve..."
+
+#~ msgid "Week"
+#~ msgstr "Teden"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "Odpri ko_ledar"
+
+#~ msgid "Delete this group"
+#~ msgstr "Zbri╧i to skupino"
+
+#~ msgid "Save the group and close the dialog box"
+#~ msgstr "Shrani skupino in zapri pogovorno okno"
+
+#~ msgid "Se_nd group to other..."
+#~ msgstr "_Po╧lji skupino drugim..."
+
+#~ msgid "Send _message to group..."
+#~ msgstr "Po╧lji _sporoХilo skupini..."
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "OznaХi _kot prebrano"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "OznaХi kot _neprebrano"
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Natisni sporoХilo na tiskalniku"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "Preusmeri (FIXME: implementiraj me)"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Shrani v _mapo... (FIXME)"
+
+#~ msgid "_Insert text file..."
+#~ msgstr "_Vstavi datoteko z besedilom..."
+
+#~ msgid "Tasks Preferences..."
+#~ msgstr "Nastavitve poslov..."
+
+#~ msgid "Change the properties for this folder"
+#~ msgstr "Spremeni lastnosti te mape"
+
 #~ msgid "As _Minicards"
 #~ msgstr "Kot _minivizitke"
 
@@ -10827,24 +12010,15 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Find..."
 #~ msgstr "Poi╧Хi..."
 
-#~ msgid "%A, %e %B %Y"
-#~ msgstr "%A, %e %B %Y"
-
 #~ msgid "<b>Error loading calendar:<br>Method not supported"
 #~ msgstr "<b>Napaka ob nalaganju koledarja: <br>Postopek ni podprt"
 
 #~ msgid "Alarms timeout after"
 #~ msgstr "Alarmi preteХejo Хez"
 
-#~ msgid "Audio Alarms"
-#~ msgstr "ZvoХni alarmi"
-
 #~ msgid "Colors"
 #~ msgstr "Barve"
 
-#~ msgid "Display options"
-#~ msgstr "Poka╬i mo╬nosti"
-
 #~ msgid "Enable snoozing for"
 #~ msgstr "OmogoХi podalj╧anje spanja za"
 
@@ -10878,18 +12052,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Edit Task"
 #~ msgstr "Uredi nalogo"
 
-#~ msgid "Appointment - %s"
-#~ msgstr "Zmenek - %s"
-
-#~ msgid "Task - %s"
-#~ msgstr "Naloga - %s"
-
-#~ msgid "Journal entry - %s"
-#~ msgstr "Vpis v dnevniku - %s"
-
-#~ msgid "No summary"
-#~ msgstr "Ni povzetka"
-
 #~ msgid "Mark Complete"
 #~ msgstr "OznaХi kot opravljeno"
 
@@ -10902,9 +12064,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Component successfully updated."
 #~ msgstr "Komponenta je bila uspe╧no posodobljena."
 
-#~ msgid "There was an error loading the calendar file."
-#~ msgstr "Napaka ob nalaganju datoteke koledarja."
-
 #~ msgid "I couldn't open your calendar file!\n"
 #~ msgstr "Nisem mogel odpreti datoteke koledarja!\n"
 
@@ -10929,21 +12088,12 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Add to Calendar"
 #~ msgstr "Dodaj _koledarju"
 
-#~ msgid " Accept "
-#~ msgstr " Sprejmi "
-
-#~ msgid " Decline "
-#~ msgstr " Zavrni "
-
 #~ msgid " Tentative "
 #~ msgstr " Poskusno "
 
 #~ msgid "Update Calendar"
 #~ msgstr "Posodobi koledar"
 
-#~ msgid "Attendee"
-#~ msgstr "Udele╬en"
-
 #~ msgid "Attendee address"
 #~ msgstr "Naslov udele╬enca"
 
@@ -10957,15 +12107,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "PrekliХi\n"
 #~ "sestanek"
 
-#~ msgid "Chair"
-#~ msgstr "Stol"
-
-#~ msgid "Non-Participant"
-#~ msgstr "Ne-sodelujoХi"
-
-#~ msgid "Optional Participant"
-#~ msgstr "Mo╬ni sodelujoХi"
-
 #~ msgid "Organizer: "
 #~ msgstr "Organizator: "
 
@@ -10976,25 +12117,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Objavi\n"
 #~ "dogodek"
 
-#~ msgid "RSVP"
-#~ msgstr "RSVP"
-
-#~ msgid "Required Participant"
-#~ msgstr "Potrebni udele╬enci"
-
-#~ msgid "Role"
-#~ msgstr "Vloga"
-
-#~ msgid ""
-#~ "Schedule\n"
-#~ "Time"
-#~ msgstr ""
-#~ "NaХrtuj\n"
-#~ "Хas"
-
-#~ msgid "Edit Appointment"
-#~ msgstr "Uredi zmenek"
-
 #~ msgid "Appointment Basics"
 #~ msgstr "Osnove zmenkov"
 
@@ -11083,9 +12205,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Datoteka je zelo velika (Хez 100K).\n"
 #~ "Ste prepriХani,da jo ╬elite vstaviti?"
 
-#~ msgid "An error occurred while reading the file."
-#~ msgstr "Ob branju datoteke se je zgodila napaka."
-
 #~ msgid "%I:%M:%S %p%n"
 #~ msgstr "%I:%M:%S %p%n"
 
@@ -11184,9 +12303,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Update automatically"
 #~ msgstr "Samodejno posodobi"
 
-#~ msgid "Update every "
-#~ msgstr "Posodobi vsakih"
-
 #~ msgid "PGP"
 #~ msgstr "PGP"
 
@@ -11205,12 +12321,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Delete this message"
 #~ msgstr "Zbri╧i to sporХilo"
 
-#~ msgid "Previous message"
-#~ msgstr "Prej╧nje sporoХilo"
-
-#~ msgid "Next message"
-#~ msgstr "Naslednje sporoХilo"
-
 #~ msgid "Activate"
 #~ msgstr "Aktiviraj"
 
@@ -11274,9 +12384,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "In_complete Task (FIXME)"
 #~ msgstr "Ne_popolna naloga (FIXME)"
 
-#~ msgid "Modify the file's properties"
-#~ msgstr "Spremeni lastnosti datoteke"
-
 #~ msgid "N_ext"
 #~ msgstr "Napr_ej"
 
@@ -11388,9 +12495,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Remove the selected folder"
 #~ msgstr "Odstrani izbrano mapo"
 
-#~ msgid "_Remove"
-#~ msgstr "_Odstrani"
-
 #~ msgid ""
 #~ "We were unable to open this addressbook.  This either\n"
 #~ "means you have entered an incorrect URI, or have tried\n"
@@ -11418,9 +12522,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Apply any new filters to the mail in this box"
 #~ msgstr "Uveljavi vse nove filtre po╧ti tega predala"
 
-#~ msgid "Compose a new message"
-#~ msgstr "Sestavi novo sporoХilo"
-
 #~ msgid "Configure Folder..."
 #~ msgstr "Nastavi mapo..."
 
@@ -11479,15 +12580,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Po╧lji ХakajoХo po╧to\n"
 #~ "    in sprejmi novo"
 
-#~ msgid "Undelete"
-#~ msgstr "Odbri╧i"
-
 #~ msgid "View Raw Message Source"
 #~ msgstr "Glej izvorno obliko sporoХila"
 
-#~ msgid "_Attachment"
-#~ msgstr "_Priloga"
-
 #~ msgid "_Reply"
 #~ msgstr "_Odgovori"
 
@@ -11552,8 +12647,8 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "хISTO"
 
 #~ msgid ""
-#~ "This option will connect to the server using a the PLAIN SASL mechanism "
-#~ "if the server supports it."
+#~ "This option will connect to the server using a the PLAIN SASL mechanism if "
+#~ "the server supports it."
 #~ msgstr ""
 #~ "Ta mo╬nost narekuje povezavo s stre╬nikom z uporabo хISTEGA SASL "
 #~ "mehanizma,Хe stre╬nik to podpira."
@@ -11574,23 +12669,23 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Varni POP"
 
 #~ msgid ""
-#~ "For connecting to POP servers over an SSL connection. The POP protocol "
-#~ "can also be used to retrieve mail from certain web mail providers and "
+#~ "For connecting to POP servers over an SSL connection. The POP protocol can "
+#~ "also be used to retrieve mail from certain web mail providers and "
 #~ "proprietary email systems."
 #~ msgstr ""
 #~ "Za povezovanje s stre╬niki POP preko povezave SSL. Protokol POP se lahko "
-#~ "uporabi tudi za prena╧anje po╧te iz nekaterih spletnih nuditeljev po╧te "
-#~ "in zaprtih sistemov e-po╧te."
+#~ "uporabi tudi za prena╧anje po╧te iz nekaterih spletnih nuditeljev po╧te in "
+#~ "zaprtih sistemov e-po╧te."
 
 #~ msgid "Secure SMTP"
 #~ msgstr "Varni SMTP"
 
 #~ msgid ""
-#~ "For delivering mail by connecting to a remote mailhub using SMTP over an "
-#~ "SSL connection.\n"
+#~ "For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+#~ "connection.\n"
 #~ msgstr ""
-#~ "Za dostavo po╧te preko povezave z oddaljenim po╧tnim razdelilcem z "
-#~ "uporabo SMTP preko povezave SSL.\n"
+#~ "Za dostavo po╧te preko povezave z oddaljenim po╧tnim razdelilcem z uporabo "
+#~ "SMTP preko povezave SSL.\n"
 
 #~ msgid ""
 #~ "One or more of your servers are not configured correctly.\n"
@@ -11605,18 +12700,12 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Advanced"
 #~ msgstr "Napredno"
 
-#~ msgid "Check settings"
-#~ msgstr "Preveri nastavitve"
-
 #~ msgid "Email address:"
 #~ msgstr "E-po╧tni naslov:"
 
 #~ msgid "Evolution Mail Configuration"
 #~ msgstr "Nastavitev Evolucijine po╧te"
 
-#~ msgid "Hostname:"
-#~ msgstr "Ime gostitelja:"
-
 #~ msgid "IMAP"
 #~ msgstr "IMAP"
 
@@ -11663,8 +12752,8 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Type the name by which you would like to refer to these servers. For "
 #~ "example: \"Work\" or \"Home\"."
 #~ msgstr ""
-#~ "Vpi╧ite ime s katerimi ╬elite nazivati te stre╬nike. Na primer:\"slu╬beni"
-#~ "\" ali \"domaХi\"."
+#~ "Vpi╧ite ime s katerimi ╬elite nazivati te stre╬nike. Na primer:\"slu╬beni\" "
+#~ "ali \"domaХi\"."
 
 #~ msgid "minutes."
 #~ msgstr "minut."
@@ -11745,9 +12834,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Ob prena╧anju seznama pilotov z gnome-pilot\n"
 #~ "daemona se je zgodila napaka"
 
-#~ msgid "Configure the address conduit"
-#~ msgstr "Nastavi veznik adresarja"
-
 #~ msgid "Evolution Address conduit "
 #~ msgstr "Evolucijin veznik adresarja "
 
@@ -11791,9 +12877,8 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "This option will connect to the SMTP server without using any kind of "
 #~ "authentication. This should be fine for connecting to most SMTP servers."
 #~ msgstr ""
-#~ "Ta mo╬nost narekuje povezavo s stre╬nikom SMTP brez uporabe "
-#~ "avtentifikacije. To bi moralo biti v redu za povezavo z veХino stre╬niki "
-#~ "SMTP."
+#~ "Ta mo╬nost narekuje povezavo s stre╬nikom SMTP brez uporabe avtentifikacije. "
+#~ "To bi moralo biti v redu za povezavo z veХino stre╬niki SMTP."
 
 #~ msgid "Edit Filter Rule"
 #~ msgstr "Uredi pravilo filtra"
@@ -11912,9 +12997,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Show the _Shortcut Bar"
 #~ msgstr "Ka╬i vrstico z bli╬njicami"
 
-#~ msgid "Saving changes to message..."
-#~ msgstr "Shranjujem spremembe sporoХila..."
-
 #~ msgid "Save changes to message..."
 #~ msgstr "Shranjujem spremembe sporoХila..."
 
@@ -11945,9 +13027,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Appending \"%s\""
 #~ msgstr "Dodajam \"%s\""
 
-#~ msgid "Appending a message without a subject"
-#~ msgstr "Dodajam sporoХilo brez navedene zadeve"
-
 #~ msgid "Moving messages from \"%s\" into \"%s\""
 #~ msgstr "Prestavljam sporoХila iz \"%s\" v \"%s\""
 
@@ -11998,9 +13077,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Unsubscribe from folder \"%s\""
 #~ msgstr "PrekliХi naroХnino na mapo \"%s\""
 
-#~ msgid "All Folders"
-#~ msgstr "Vse mape"
-
 #~ msgid "Display folders whose name contain:"
 #~ msgstr "Prika╬i mape, katerih ime vsebuje:"
 
@@ -12045,9 +13121,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Local stores do not have a default folder"
 #~ msgstr "Krajevno hranjenje nima privzete mape"
 
-#~ msgid "Local folders may not be nested."
-#~ msgstr "Krajevnih map ni mogoХe gnezditi."
-
 #~ msgid "Note: When converting between mailbox formats, a failure\n"
 #~ msgstr ""
 #~ "Opomba: Med pretvarjanjem med razliХnimi oblikami po╧tnih predalov\n"
@@ -12262,9 +13335,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "FIXME: _Note"
 #~ msgstr "FIXME: _Opomba"
 
-#~ msgid "Group %i"
-#~ msgstr "Skupina %i"
-
 #~ msgid "Failed to perform regex search on message header: %s"
 #~ msgstr ""
 #~ "Nisem uspel izvesti iskanja z regularnimi izrazi v glavah sporoХil: %s"
@@ -12348,8 +13418,8 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "However, the appointment will recur at the appropriate time and will be "
 #~ "displayed properly in the calendar views."
 #~ msgstr ""
-#~ "Ta zmenek ima pravila ponovitev po meri, ki ne morejo biti urejana "
-#~ "znotraj Evolucije.\n"
+#~ "Ta zmenek ima pravila ponovitev po meri, ki ne morejo biti urejana znotraj "
+#~ "Evolucije.\n"
 #~ "\n"
 #~ "Vendar se bo zmenek ponovil pravoХasno in bo  pravilno prikazan v pogledu "
 #~ "koledarja."
@@ -12441,9 +13511,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "twelfth"
 #~ msgstr "dvanajsti"
 
-#~ msgid "ago"
-#~ msgstr "nazaj"
-
 #~ msgid "Create to-do item"
 #~ msgstr "Ustvari opravilo"
 
@@ -12517,9 +13584,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Preferences"
 #~ msgstr "Nastavitve"
 
-#~ msgid "Alarm Properties"
-#~ msgstr "Lastnosti alarma"
-
 #~ msgid "Beep on display alarms"
 #~ msgstr "Piskaj ob zaslonskih alarmih"
 
@@ -12536,8 +13600,8 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "For reading mail delivered by the local system, and for storing mail on "
 #~ "local disk."
 #~ msgstr ""
-#~ "Za branje po╧te dostavljene na krajevni sistem in za shranjevanje po╧te "
-#~ "na krajevni disk."
+#~ "Za branje po╧te dostavljene na krajevni sistem in za shranjevanje po╧te na "
+#~ "krajevni disk."
 
 #~ msgid "Could not rename folder %s to %s: destination exists"
 #~ msgstr "Nisem mogel preimenovati mape %s v %s: cilj ╬e obstaja"
@@ -12567,20 +13631,17 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Custom search"
 #~ msgstr "Iskanje po meri"
 
-#~ msgid "Copy Message"
-#~ msgstr "Kopiraj sporoХilo"
-
 #~ msgid "You have no mail sources configured"
 #~ msgstr "Nimate nastavljenih izvorov po╧te"
 
 #~ msgid ""
-#~ "Enter your name and email address to be used in outgoing mail. You may "
-#~ "also, optionally, enter the name of your organization, and the name of a "
-#~ "file to read your signature from."
+#~ "Enter your name and email address to be used in outgoing mail. You may also, "
+#~ "optionally, enter the name of your organization, and the name of a file to "
+#~ "read your signature from."
 #~ msgstr ""
-#~ "Vnesite svoje ime in e-po╧tni naslov, ki naj se uporablja v izhodni po╧ti "
-#~ "Po ╬elji lahko vnesete tudi ime va╧e organizacije in ime datoteke iz "
-#~ "katere naj se prebere va╧ podpis."
+#~ "Vnesite svoje ime in e-po╧tni naslov, ki naj se uporablja v izhodni po╧ti Po "
+#~ "╬elji lahko vnesete tudi ime va╧e organizacije in ime datoteke iz katere naj "
+#~ "se prebere va╧ podpis."
 
 #~ msgid "Signature File"
 #~ msgstr "Datoteka s podpisom"
@@ -12589,11 +13650,11 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Tip izvora po╧te:"
 
 #~ msgid ""
-#~ "Select the kind of mail server you have, and enter the relevant "
-#~ "information about it.\n"
+#~ "Select the kind of mail server you have, and enter the relevant information "
+#~ "about it.\n"
 #~ "\n"
-#~ "If the server requires authentication, you can click the \"Detect "
-#~ "supported types...\" button after entering the other information."
+#~ "If the server requires authentication, you can click the \"Detect supported "
+#~ "types...\" button after entering the other information."
 #~ msgstr ""
 #~ "Izberite vrsto po╧tnega stre╬nika, ki ga uporabljate, in nastavite zanj  "
 #~ "potrebne podatke.\n"
@@ -12602,11 +13663,11 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "podprte tipe...\" potem, ko boste vnesli ostale podatke."
 
 #~ msgid ""
-#~ "Select the kind of news server you have, and enter the relevant "
-#~ "information about it.\n"
+#~ "Select the kind of news server you have, and enter the relevant information "
+#~ "about it.\n"
 #~ "\n"
-#~ "If the server requires authentication, you can click the \"Detect "
-#~ "supported types...\" button after entering the other information."
+#~ "If the server requires authentication, you can click the \"Detect supported "
+#~ "types...\" button after entering the other information."
 #~ msgstr ""
 #~ "Izberite vrsto po╧tnega stre╬nika, ki ga uporabljate, in nastavite zanj  "
 #~ "potrebne podatke.\n"
@@ -12626,9 +13687,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Edit Source"
 #~ msgstr "Uredi izbor"
 
-#~ msgid "Add News Server"
-#~ msgstr "Dodaj noviХarski stre╬nik"
-
 #~ msgid "Edit News Server"
 #~ msgstr "Uredi noviХarski stre╬nik"
 
@@ -12658,9 +13716,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Identities"
 #~ msgstr "Identitete"
 
-#~ msgid "News Servers"
-#~ msgstr "NoviХarski stre╬niki"
-
 #~ msgid "News Sources"
 #~ msgstr "Viri novic"
 
@@ -12704,11 +13759,10 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgstr "Posreduj sporoХilo \"%s\""
 
 #~ msgid ""
-#~ "Failed to generate mime part from message while generating forwarded "
-#~ "message."
+#~ "Failed to generate mime part from message while generating forwarded message."
 #~ msgstr ""
-#~ "Nisem uspel generirati mime dela iz sporoХila med generiranjem "
-#~ "posredovanega sporoХila."
+#~ "Nisem uspel generirati mime dela iz sporoХila med generiranjem posredovanega "
+#~ "sporoХila."
 
 #~ msgid "Loading \"%s\""
 #~ msgstr "Nalagam \"%s\""
@@ -12755,9 +13809,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Rebuild message view"
 #~ msgstr "Obnovi pogled sporoХil"
 
-#~ msgid "Threading message list"
-#~ msgstr "Nitim seznam sporoХil"
-
 #~ msgid "N_ew Directory Server"
 #~ msgstr "N_ov stre╬nik imenikov"
 
@@ -12830,9 +13881,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "New appointment for _today..."
 #~ msgstr "Nov zmenek za _danes..."
 
-#~ msgid "Create a new appointment for today"
-#~ msgstr "Ustvari nov zmenek za danes"
-
 #~ msgid "%s%s"
 #~ msgstr "%s%s"
 
@@ -12886,9 +13934,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "ObiХajna\n"
 #~ "Nizka\n"
 
-#~ msgid "Resources:"
-#~ msgstr "Viri:"
-
 #~ msgid "Last Modification Date"
 #~ msgstr "Datum zadnje spremembe"
 
@@ -13116,8 +14161,5 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Select the method you would like to use to deliver your mail."
 #~ msgstr "Izberite naХin na katerega ╬elite dostavljati va╧o po╧to."
 
-#~ msgid "Enter the hostname of the News Server you have."
-#~ msgstr "Vpi╧ite ime raХunalnika na katerem teХe noviХarski stre╬nik."
-
 #~ msgid "Cannot initialize the configuration system."
 #~ msgstr "Ne morem inicializirati nastavitvenega sistema."
diff --git a/po/sv.po b/po/sv.po
index a5b0398b64..2c9e373ca3 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,12 +5,12 @@
 # Christian Rose <menthos@menthos.com>, 2000, 2001.
 # Martin NorbДck <d95mback@dtek.chalmers.se>, 2001.
 #
-# $Id: sv.po,v 1.96 2001/07/30 19:33:37 menthos Exp $
+# $Id: sv.po,v 1.97 2001/07/31 19:28:47 ettore Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-07-30 21:30+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-07-30 21:31+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -327,8 +327,8 @@ msgstr "VCard fЖr %s"
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
 #: addressbook/gui/component/addressbook-factory.c:46
-#: calendar/conduits/calendar/calendar-conduit.c:1202
-#: calendar/conduits/todo/todo-conduit.c:1017
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Kunde inte initiera Bonobo"
@@ -342,14 +342,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook inte inlДst\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:776
-#: calendar/conduits/todo/todo-conduit.c:591
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Kunde inte starta wombat-server"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:777
-#: calendar/conduits/todo/todo-conduit.c:592
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Kunde inte starta wombat"
 
@@ -455,7 +455,7 @@ msgstr "FIXME Bind DN-hjДlptext hДr"
 
 #. Remember the password?
 #: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:80 mail/mail-mt.c:436
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
 msgid "Remember this password"
 msgstr "Kom ihЕg detta lЖsenord"
 
@@ -509,15 +509,15 @@ msgstr "FIXME SЖkvДgshjДlptext hДr"
 msgid "Create path if it doesn't exist."
 msgstr "Skapa sЖkvДgen om den inte finns."
 
-#: addressbook/gui/component/addressbook-config.c:662
+#: addressbook/gui/component/addressbook-config.c:663
 msgid "Edit Addressbook"
 msgstr "Redigera adressbok"
 
-#: addressbook/gui/component/addressbook-config.c:664
+#: addressbook/gui/component/addressbook-config.c:665
 msgid "Add Addressbook"
 msgstr "LДgg till adressbok"
 
-#: addressbook/gui/component/addressbook-config.c:682
+#: addressbook/gui/component/addressbook-config.c:683
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
@@ -525,22 +525,22 @@ msgstr ""
 "Markera den typ av adressbok du har och ange den relevanta informationen om "
 "den."
 
-#: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:894
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
 msgid "Name:"
 msgstr "Namn:"
 
-#: addressbook/gui/component/addressbook-config.c:689
+#: addressbook/gui/component/addressbook-config.c:692
 msgid "FIXME Name help text here"
 msgstr "FIXME NamnhjДlptext hДr"
 
-#: addressbook/gui/component/addressbook-config.c:691
+#: addressbook/gui/component/addressbook-config.c:694
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2
 msgid "Description:"
 msgstr "Beskrivning:"
 
-#: addressbook/gui/component/addressbook-config.c:692
+#: addressbook/gui/component/addressbook-config.c:695
 msgid "FIXME Description help text here"
 msgstr "FIXME BeskrivningshjДlptext hДr"
 
@@ -712,9 +712,9 @@ msgstr "Fabrik fЖr adressbokens namnvalsgrДnssnitt"
 #: addressbook/gui/component/select-names/e-select-names.c:630
 #: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
 #: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: my-evolution/e-summary-preferences.c:1181
-#: my-evolution/e-summary-preferences.c:1235
-#: my-evolution/e-summary-preferences.c:1296 shell/e-shortcuts-view.c:272
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
 #: shell/e-shortcuts-view.c:481
 msgid "Remove"
 msgstr "Ta bort"
@@ -842,8 +842,8 @@ msgstr "_Kontakter..."
 #: calendar/gui/dialogs/alarm-page.glade.h:10
 #: calendar/gui/dialogs/meeting-page.c:1447
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
-#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:79
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:45
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Ta bort"
 
@@ -1323,7 +1323,7 @@ msgstr "Skicka meddelande till kontakt"
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
 #: addressbook/gui/widgets/e-addressbook-view.c:604
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-mail-message.xml.h:55 ui/evolution-tasks.xml.h:9
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Skriv ut"
@@ -1338,7 +1338,7 @@ msgstr "Skriv ut kuvert"
 #: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
 #: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -1720,18 +1720,18 @@ msgstr "Bredd:"
 msgid "_Font..."
 msgstr "_Typsnitt..."
 
-#: calendar/conduits/calendar/calendar-conduit.c:733
-#: calendar/conduits/todo/todo-conduit.c:547
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Fel vid kommunikation med kalenderserver"
 
-#: calendar/conduits/calendar/calendar-conduit.c:837
-#: calendar/conduits/calendar/calendar-conduit.c:840
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunde inte lДsa pilotens kalenderprogramblock"
 
-#: calendar/conduits/todo/todo-conduit.c:652
-#: calendar/conduits/todo/todo-conduit.c:655
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunde inte lДsa pilotens att-gЖra-programblock"
 
@@ -1877,24 +1877,52 @@ msgstr "Kunde inte initiera gnome-vfs"
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunde inte skapa fabriken fЖr alarmaviseringstjДnsten"
 
-#: calendar/gui/calendar-commands.c:497
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A %d %B %Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Kunde inte skapa kalendervyn. Kontrollera din ORBit- och OAF-installation."
 
 #: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
-#: calendar/gui/e-calendar-table.c:306
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "Publikt"
 
 #: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
-#: calendar/gui/e-calendar-table.c:307
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "Privat"
 
 #: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Konfidentiellt"
 
@@ -1926,58 +1954,58 @@ msgstr "ж"
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1182
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
 #: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:625
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "HЖg"
 
-#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1184
-#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:624
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1186
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:623
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "LЕg"
 
-#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1238
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Genomskinlig"
 
-#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1240
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Ogenomskinlig"
 
-#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1292
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
 #: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:402
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Inte startad"
 
-#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1294
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
 #: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "PЕgЕr"
 
-#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1296
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
 #: calendar/gui/dialogs/meeting-page.c:648
 #: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "FДrdigt"
 
-#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1298
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
 #: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:405 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "Avbruten"
@@ -2011,12 +2039,12 @@ msgstr ""
 "eller \"Ingen\""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1236
-#: calendar/gui/calendar-model.c:1290
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
 #: calendar/gui/dialogs/e-timezone-dialog.c:202
 #: calendar/gui/dialogs/meeting-page.c:327
 #: calendar/gui/dialogs/meeting-page.glade.h:1
-#: calendar/gui/e-calendar-table.c:305 calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
 #: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
 #: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
 #: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
@@ -2025,7 +2053,7 @@ msgstr ""
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:1086
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -2035,44 +2063,44 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1126
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "ProcentvДrdet mЕste vara mellan 0 och 100"
 
-#: calendar/gui/calendar-model.c:1167
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 "Prioriteten mЕste vara \"HЖg\", \"Normal\", \"LЕg\" eller \"Odefinierad\"."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1180
+#: calendar/gui/calendar-model.c:1181
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Odefinierad"
 
-#: calendar/gui/calendar-model.c:1221
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 "Genomskinligheten mЕste vara \"Genomskinlig\", \"Ogenomskinlig\" eller "
 "\"Ingen\"."
 
-#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "еterkommande"
 
-#: calendar/gui/calendar-model.c:1711
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Tilldelad"
 
-#: calendar/gui/calendar-model.c:1717 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
 #: calendar/gui/dialogs/meeting-page.c:630
 #: calendar/gui/dialogs/meeting-page.c:1158
 #: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1717 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
 #: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Nej"
@@ -2384,7 +2412,7 @@ msgid "Fri"
 msgstr "fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:983
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "fredag"
 
@@ -2393,7 +2421,7 @@ msgid "Mon"
 msgstr "mЕn"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:979
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "mЕndag"
 
@@ -2414,7 +2442,7 @@ msgid "Sat"
 msgstr "lЖr"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:984
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "lЖrdag"
 
@@ -2435,7 +2463,7 @@ msgid "Sun"
 msgstr "sЖn"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:985
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "sЖndag"
 
@@ -2452,7 +2480,7 @@ msgid "Thu"
 msgstr "tor"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:982
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "torsdag"
 
@@ -2477,7 +2505,7 @@ msgid "Tue"
 msgstr "tis"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:980
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "tisdag"
 
@@ -2486,7 +2514,7 @@ msgid "Wed"
 msgstr "ons"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:981
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "onsdag"
 
@@ -2561,27 +2589,27 @@ msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har inte gjort nЕgra Дndringar, uppdatera redigeraren?"
 
 #: calendar/gui/dialogs/comp-editor-util.c:154
-#: calendar/gui/e-itip-control.c:619 calendar/gui/print.c:2116
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
 msgid " to "
 msgstr " till "
 
 #: calendar/gui/dialogs/comp-editor-util.c:158
-#: calendar/gui/e-itip-control.c:623 calendar/gui/print.c:2120
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
 msgid " (Completed "
 msgstr " (FДrdigt "
 
 #: calendar/gui/dialogs/comp-editor-util.c:160
-#: calendar/gui/e-itip-control.c:625 calendar/gui/print.c:2122
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
 msgid "Completed "
 msgstr "FДrdigt "
 
 #: calendar/gui/dialogs/comp-editor-util.c:165
-#: calendar/gui/e-itip-control.c:630 calendar/gui/print.c:2127
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
 msgid " (Due "
 msgstr " (Ska utfЖras "
 
 #: calendar/gui/dialogs/comp-editor-util.c:167
-#: calendar/gui/e-itip-control.c:632 calendar/gui/print.c:2129
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
 msgid "Due "
 msgstr "Ska utfЖras "
 
@@ -2908,7 +2936,7 @@ msgid "Role"
 msgstr "Roll"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:50
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
 #: mail/message-list.etspec.h:8
 msgid "Status"
 msgstr "Status"
@@ -2937,32 +2965,32 @@ msgstr "_Bjud in andra"
 msgid "_Other Organizer"
 msgstr "_Annan organisatЖr"
 
-#: calendar/gui/dialogs/recurrence-page.c:439 calendar/gui/print.c:1839
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
 #: calendar/gui/print.c:1841 calendar/gui/print.c:1842
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/dialogs/recurrence-page.c:587
+#: calendar/gui/dialogs/recurrence-page.c:584
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Detta mЖte har upprepningsregler som inte kan redigeras med Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:952
+#: calendar/gui/dialogs/recurrence-page.c:938
 msgid "on"
 msgstr "vid"
 
-#: calendar/gui/dialogs/recurrence-page.c:978 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1108
+#: calendar/gui/dialogs/recurrence-page.c:1094
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/dialogs/recurrence-page.c:1116
+#: calendar/gui/dialogs/recurrence-page.c:1102
 msgid "th"
 msgstr ":e"
 
-#: calendar/gui/dialogs/recurrence-page.c:1286
+#: calendar/gui/dialogs/recurrence-page.c:1274
 msgid "occurrences"
 msgstr "fЖrekomster"
 
@@ -3055,7 +3083,7 @@ msgid "No one"
 msgstr "Ingen"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: my-evolution/e-summary-preferences.c:902
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
@@ -3088,102 +3116,106 @@ msgstr "_Prioritet:"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/e-calendar-table.c:350
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:840
-msgid "Edit this task"
-msgstr "Redigera denna uppgift"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "_жppna"
 
-#: calendar/gui/e-calendar-table.c:841 calendar/gui/e-calendar-table.c:851
-#: calendar/gui/e-day-view.c:3331 calendar/gui/e-week-view.c:3168
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
-msgid "Cut"
-msgstr "Klipp ut"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "Klipp _ut"
 
-#: calendar/gui/e-calendar-table.c:842 calendar/gui/e-calendar-table.c:852
-#: calendar/gui/e-day-view.c:3333 calendar/gui/e-week-view.c:3170
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:5
-msgid "Copy"
-msgstr "Kopiera"
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Kopiera"
 
-#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-table.c:853
-#: calendar/gui/e-day-view.c:3306 calendar/gui/e-day-view.c:3335
-#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3172
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
-msgid "Paste"
-msgstr "Klistra in"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "Klistra _in"
 
-#: calendar/gui/e-calendar-table.c:845
-msgid "Mark as complete"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
 msgstr "Markera som fДrdig"
 
-#: calendar/gui/e-calendar-table.c:846
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Ta bort denna uppgift"
 
-#: calendar/gui/e-calendar-table.c:855
-msgid "Mark tasks as complete"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
 msgstr "Markera uppgifterna som fДrdiga"
 
-#: calendar/gui/e-calendar-table.c:856 ui/evolution-tasks.xml.h:6
-msgid "Delete selected tasks"
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Ta bort markerade uppgifter"
 
-#: calendar/gui/e-calendar-table.c:1122
+#: calendar/gui/e-calendar-table.c:1137
 msgid "Click here to add a task"
 msgstr "Klicka hДr fЖr att lДgga till en uppgift"
 
@@ -3257,13 +3289,6 @@ msgstr "%02i minutdivisioner"
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:289 calendar/gui/e-day-view.c:1344
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
 #: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
@@ -3283,121 +3308,124 @@ msgstr "fm"
 msgid "pm"
 msgstr "em"
 
-#: calendar/gui/e-day-view.c:3311 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Nytt mЖte"
 
-#: calendar/gui/e-day-view.c:3313 calendar/gui/e-week-view.c:3151
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "Nytt heldagsarrangemang"
 
 #: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
-msgid "Go to Today"
-msgstr "GЕ till idag"
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "GЕ till _idag"
 
 #: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
-msgid "Go to Date..."
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "GЕ till datum..."
 
-#: calendar/gui/e-day-view.c:3327 calendar/gui/e-week-view.c:3164
-#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "жppna"
-
 #: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
-msgid "Delete this Appointment"
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Ta bort detta mЖte"
 
-#: calendar/gui/e-day-view.c:3344 calendar/gui/e-week-view.c:3186
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "GЖr denna fЖrekomst flyttbar"
 
-#: calendar/gui/e-day-view.c:3346 calendar/gui/e-week-view.c:3188
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "Ta bort denna fЖrekomst"
 
-#: calendar/gui/e-day-view.c:3348
-msgid "Delete all Occurrences"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "Ta bort alla fЖrekomster"
 
-#: calendar/gui/e-itip-control.c:686
+#: calendar/gui/e-itip-control.c:694
 msgid "This is an event that can be added to your calendar."
 msgstr "Detta Дr ett evenemang som kan lДggas till i din kalender."
 
-#: calendar/gui/e-itip-control.c:689
+#: calendar/gui/e-itip-control.c:697
 msgid "This is a meeting request."
 msgstr "Detta Дr en mЖtesbegДran."
 
-#: calendar/gui/e-itip-control.c:692
+#: calendar/gui/e-itip-control.c:700
 msgid "This is one or more additions to a current meeting."
 msgstr "Detta Дr en eller flera tillДgg till ett aktuellt mЖte."
 
-#: calendar/gui/e-itip-control.c:695
+#: calendar/gui/e-itip-control.c:703
 msgid "This is a request for the latest event information."
 msgstr "Detta Дr en begДran av den senaste evenemangsinformationen."
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:706
 msgid "This is a reply to a meeting request."
 msgstr "Detta Дr ett svar pЕ en mЖtesbegДran."
 
-#: calendar/gui/e-itip-control.c:701
+#: calendar/gui/e-itip-control.c:709
 msgid "This is an event cancellation."
 msgstr "Detta Дr en evenemangsavbokning."
 
-#: calendar/gui/e-itip-control.c:704 calendar/gui/e-itip-control.c:744
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 msgid "The message is not understandable."
 msgstr "Detta meddelande kan inte fЖrstЕs."
 
-#: calendar/gui/e-itip-control.c:729
+#: calendar/gui/e-itip-control.c:737
 msgid "This is an task that can be added to your calendar."
 msgstr "Detta Дr en uppgift som kan lДggas till i din kalender."
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:740
 msgid "This is a task request."
 msgstr "Detta Дr en begДran om en uppgift."
 
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:743
 msgid "This is a request for the latest task information."
 msgstr "Detta Дr en begДran av den senaste uppgiftsinformationen."
 
-#: calendar/gui/e-itip-control.c:738
+#: calendar/gui/e-itip-control.c:746
 msgid "This is a reply to a task request."
 msgstr "Detta Дr ett svar pЕ en uppgiftsbegДran."
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:749
 msgid "This is an task cancellation."
 msgstr "Detta Дr en uppgiftsavbokning."
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:771
 msgid "This is freebusy information."
 msgstr "Detta Дr ledig-/upptageninformation."
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:774
 msgid "This is a request for freebusy information."
 msgstr "Detta Дr en begДran av ledig-/upptageninformation."
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:777
 msgid "This is a reply to a freebusy request."
 msgstr "Detta Дr ett svar pЕ en begДran av ledig-/upptageninformation."
 
-#: calendar/gui/e-itip-control.c:826
+#: calendar/gui/e-itip-control.c:834
 msgid "The message does not appear to be properly formed"
 msgstr "Meddelandet verkar inte vara korrekt utformat"
 
-#: calendar/gui/e-itip-control.c:845
+#: calendar/gui/e-itip-control.c:853
 msgid "The message contains only unsupported requests."
 msgstr "Meddelandet innehЕller typer av begДran som inte stЖds."
 
-#: calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:877
 msgid "The information contained in this attachment was not valid"
 msgstr "Informationen i denna bilaga var inte giltig"
 
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:989
 msgid "I couldn't update your calendar file!\n"
 msgstr "Jag kunde inte uppdatera din kalenderfil!\n"
 
-#: calendar/gui/e-itip-control.c:1007
+#: calendar/gui/e-itip-control.c:1015
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Jag kunde inte ta bort objektet frЕn din kalenderfil!\n"
 
@@ -3465,20 +3493,17 @@ msgstr "Metoden som krДvs fЖr att lДsa in \"%s\" stЖds inte"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/e-week-view.c:3149 calendar/gui/e-week-view.c:3177
-msgid "New Appointment..."
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
 msgstr "Nytt mЖte..."
 
-#: calendar/gui/e-week-view.c:3190
-msgid "Delete All Occurrences"
-msgstr "Ta bort alla fЖrekomster"
-
-#: calendar/gui/gnome-cal.c:969
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunde inte Жppna mappen i \"%s\""
 
-#: calendar/gui/gnome-cal.c:980
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden som krДvs fЖr att Жppna \"%s\" stЖds inte"
@@ -3748,7 +3773,7 @@ msgstr "Skriv ut objekt"
 msgid "Print Setup"
 msgstr "SkrivarinstДllningar"
 
-#: calendar/gui/tasks-control.c:122
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "URI:t som uppgiftsmappen ska visa"
 
@@ -5727,11 +5752,11 @@ msgstr "жppna fil"
 msgid "Insert File"
 msgstr "Infoga fil"
 
-#: composer/e-msg-composer.c:1856 composer/e-msg-composer.c:2252
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Skriv ett meddelande"
 
-#: composer/e-msg-composer.c:2346
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "Kunde inte skapa fЖnster fЖr meddelanderedigering."
 
@@ -6019,9 +6044,9 @@ msgid "outgoing"
 msgstr "utgЕende"
 
 #: filter/filter.glade.h:1 mail/mail-config.glade.h:8
-#: my-evolution/e-summary-preferences.c:1174
-#: my-evolution/e-summary-preferences.c:1226
-#: my-evolution/e-summary-preferences.c:1288
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
 msgid "Add"
 msgstr "LДgg till"
 
@@ -6146,124 +6171,120 @@ msgid "Expression"
 msgstr "Uttryck"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "Vidarebefordra till adress"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "Viktigt"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr "Дr"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "Дr stЖrre Дn"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "Дr mindre Дn"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "Дr inte"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "SДndlista"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Meddelandetext"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Meddelandehuvud"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Meddelandet mottogs"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Meddelandet skickades"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Flytta till mapp"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr "den eller efter"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr "den eller innan"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "LДs"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Mottagare"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "SЖkning med reguljДrt uttryck"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Svarade till"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "PoДng"
 
-#: filter/libfilter-i18n.h:43 mail/mail-callbacks.c:1091
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "AvsДndare"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "StДll in status"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:44
 msgid "Size (kB)"
 msgstr "Storlek (kB)"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "lЕter som"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:46
 msgid "Source Account"
 msgstr "KДllkonto"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr "Specifikt huvud"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:48
 msgid "starts with"
 msgstr "bЖrjar med"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Stoppa behandling"
 
-#: filter/libfilter-i18n.h:52 mail/mail-format.c:866
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "дmne"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "var efter"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:53
 msgid "was before"
 msgstr "var fЖre"
 
@@ -6453,32 +6474,28 @@ msgstr "Filtrera pЕ _mottagare"
 msgid "Filter on _Mailing List"
 msgstr "Filtrera pЕ sД_ndlista"
 
-#: mail/folder-browser.c:1271
-msgid "_Open"
-msgstr "_жppna"
-
 #: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Skicka om"
 
-#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:87
-#: ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "_Spara som..."
 
-#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:16
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "Skriv _ut"
 
-#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:86
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "Sva_ra till avsДndaren"
 
-#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:62
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
 msgid "Reply to _List"
 msgstr "Svara till _lista"
 
-#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:61
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
@@ -6486,11 +6503,11 @@ msgstr "Svara till _alla"
 msgid "_Forward"
 msgstr "Vidare_befordra"
 
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:39
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Mar_kera som lДst"
 
-#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:41
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Markera som _olДst"
 
@@ -6510,7 +6527,7 @@ msgstr "_Flytta till mapp..."
 msgid "_Copy to Folder..."
 msgstr "_Kopiera till mapp..."
 
-#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:88
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "_еngra borttagning"
 
@@ -7345,80 +7362,90 @@ msgstr "%d oskickade"
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/mail-format.c:608
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s-bilaga"
 
-#: mail/mail-format.c:657
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunde inte tolka MIME-meddelande. Visar som kДllkod."
 
-#: mail/mail-format.c:739
+#: mail/mail-format.c:746
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:855 mail/message-list.etspec.h:3
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "E-postadress:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "FrЕn"
 
-#: mail/mail-format.c:858
+#: mail/mail-format.c:867
 msgid "Reply-To"
 msgstr "Svara till"
 
-#: mail/mail-format.c:861 mail/message-list.etspec.h:10
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Till"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:873
 msgid "Cc"
 msgstr "Kopia"
 
-#: mail/mail-format.c:1283
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "Inget GPG/PGP-program Дr konfigurerat."
 
-#: mail/mail-format.c:1298
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "Krypterat meddelande visas inte"
 
-#: mail/mail-format.c:1304
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Krypterat meddelande"
 
-#: mail/mail-format.c:1305
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "Klicka pЕ ikonen fЖr att dekryptera."
 
-#: mail/mail-format.c:1361
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Detta meddelande Дr digitalt signerat och har befunnits Дkta."
 
-#: mail/mail-format.c:1369
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Detta meddelande Дr digitalt signerat men Дktheten kan inte bevisas."
 
-#: mail/mail-format.c:2023
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pekare till FTP-plats (%s)"
 
-#: mail/mail-format.c:2035
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pekare till lokal fil (%s) giltig pЕ platsen \"%s\""
 
-#: mail/mail-format.c:2039
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pekare till lokal fil (%s)"
 
-#: mail/mail-format.c:2073
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Pekare till FTP-plats (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pekare till okДnd extern data (typen \"%s\")"
 
-#: mail/mail-format.c:2078
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr "Felaktig del med extern meddelandetext."
 
@@ -7476,7 +7503,7 @@ msgstr ""
 "Fel vid utfЖrande av operation:\n"
 "%s"
 
-#: mail/mail-mt.c:785
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "Jobbar"
 
@@ -7674,36 +7701,29 @@ msgstr "Skickar"
 msgid "Cancelled."
 msgstr "Avbruten."
 
-#: mail/mail-session.c:170
+#: mail/mail-session.c:171
 msgid "User canceled operation."
 msgstr "AnvДndaren avbrЖt ЕtgДrden."
 
-#: mail/mail-tools.c:175
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Kunde inte skapa temporДrt meddelandefДlt \"%s\": %s"
 
-#: mail/mail-tools.c:228
-msgid "[Fwd: No Subject]"
-msgstr "[Fwd: Inget Дmne]"
-
-#: mail/mail-tools.c:243
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Vidarebefordrat meddelande - %s"
 
 #: mail/mail-tools.c:245
-msgid "Forwarded message (no subject)"
-msgstr "Vidarebefordrat meddelande (inget Дmne)"
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Vidarebefordrade meddelanden"
 
 #: mail/mail-tools.c:469
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Vidarebefordrat meddelande-----<br><b>Fr&aring;n:</b> "
-"%s<br><b>Till:</b> %s<br><b>&Auml;mne:</b> %s<br>"
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Vidarebefordrade meddelanden"
 
 #: mail/mail-vfolder.c:270
 msgid "VFolders"
@@ -7853,31 +7873,32 @@ msgstr "%a %H.%M"
 msgid "Mail summary"
 msgstr "E-postsammanfattning"
 
-#: my-evolution/e-summary-preferences.c:424
+#: my-evolution/e-summary-preferences.c:420
 msgid "Dictionary.com Word of the Day"
 msgstr "Dagens ord frЕn dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:446
+#: my-evolution/e-summary-preferences.c:442
 msgid "Quotes of the Day"
 msgstr "Dagens citat"
 
-#: my-evolution/e-summary-preferences.c:882
+#: my-evolution/e-summary-preferences.c:869
 msgid "Add a news feed"
 msgstr "LДgg till en diskussionsgruppskДlla"
 
-#: my-evolution/e-summary-preferences.c:890
+#: my-evolution/e-summary-preferences.c:877
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Ange URL:en till den diskussionsgruppskДlla som du vill lДgga till"
 
-#: my-evolution/e-summary-preferences.c:1425
+#: my-evolution/e-summary-preferences.c:1408
 msgid "My Evolution Settings"
 msgstr "InstДllningar fЖr Mitt Evolution"
 
-#: my-evolution/e-summary-rdf.c:311
-msgid "There was an error downloading news feed</b></dt>"
+#: my-evolution/e-summary-rdf.c:281
+#, fuzzy
+msgid "There was an error downloading news feed"
 msgstr "Ett fel uppstod nДr diskussionsgruppskДllan hДmtades</b></dt>"
 
-#: my-evolution/e-summary-rdf.c:393 my-evolution/e-summary-rdf.c:419
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>Fel vid hДmtning av RDF</b>"
 
@@ -9160,14 +9181,10 @@ msgid "Weather settings"
 msgstr "VДderinstДllningar"
 
 #: my-evolution/my-evolution.glade.h:27
-msgid "Wipe trackers"
-msgstr "Rensa spЕrare"
-
-#: my-evolution/my-evolution.glade.h:28
 msgid "imperial"
 msgstr "amerikanska"
 
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:28
 msgid "metric"
 msgstr "metriska"
 
@@ -9635,6 +9652,10 @@ msgstr "Byt namn pЕ genvДg"
 msgid "Rename selected shortcut to:"
 msgstr "Byt namn pЕ den markerade genvДgen till:"
 
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "жppna"
+
 #: shell/e-shortcuts-view.c:474
 msgid "Open the folder linked to this shortcut"
 msgstr "жppna mappen som Дr lДnkad till denna genvДg"
@@ -9849,10 +9870,10 @@ msgstr "Skicka felsЖkningsinformation frЕn alla komponenter till en fil."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan inte initiera Bonobo-komponentsystemet."
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
-msgid "C_ut"
-msgstr "Klipp _ut"
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Kopiera"
 
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
@@ -9866,6 +9887,10 @@ msgstr "Skapa ny kontakt"
 msgid "Create new contact list"
 msgstr "Skapa ny kontaktlista"
 
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Klipp ut"
+
 #: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
 msgid "Cut the selection"
 msgstr "Klipp ut markeringen"
@@ -9882,6 +9907,10 @@ msgstr "Ny kontakt"
 msgid "New list"
 msgstr "Ny lista"
 
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Klistra in"
+
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Klistra in frЕn urklipp"
@@ -9922,16 +9951,6 @@ msgstr "_Kontakt"
 msgid "_Contact Group"
 msgstr "_Kontaktgrupp"
 
-#: ui/evolution-addressbook.xml.h:25 ui/evolution-calendar.xml.h:31
-#: ui/evolution-tasks.xml.h:13
-msgid "_Copy"
-msgstr "_Kopiera"
-
-#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:34
-#: ui/evolution-tasks.xml.h:15
-msgid "_Paste"
-msgstr "Klistra _in"
-
 #: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
 #: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
@@ -9970,7 +9989,7 @@ msgstr "Skapa ett nytt mЖte"
 msgid "Create an event for the whole day"
 msgstr "Skapa en hДndelse som varar en hel dag"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "GЕ till"
 
@@ -9986,10 +10005,6 @@ msgstr "GЕ framЕt i tiden"
 msgid "Go to _Date"
 msgstr "GЕ till _datum"
 
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
-msgstr "GЕ till _idag"
-
 #: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "GЕ till ett specifikt datum"
@@ -9998,6 +10013,10 @@ msgstr "GЕ till ett specifikt datum"
 msgid "Go to present time"
 msgstr "GЕ till nuvarande tid"
 
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Nytt mЖte"
+
 #: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "FЖrhandsgranskar kalendern som ska skrivas ut"
@@ -10083,7 +10102,7 @@ msgstr "Huvudverktygsrad"
 msgid "Preview the printed item"
 msgstr "FЖrhandsgranska det utskrivna objektet"
 
-#: ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
 msgid "Print Pre_view"
 msgstr "FЖrhands_granska"
 
@@ -10571,171 +10590,206 @@ msgstr "Vidarebefordra det markerade meddelandet till nЕgon"
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Vidarebefordra det markerade meddelandet till nЕgon som en bilaga"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 msgid "Load _Images"
 msgstr "LДs in _bilder"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 msgid "Mark as I_mportant"
 msgstr "Markera som _viktigt"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:43
 msgid "Mark as Unimp_ortant"
 msgstr "Markera som ovi_ktigt"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "Markera de markerade meddelandena som lДsta"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark the selected messages as important"
 msgstr "Markera de markerade meddelandena som viktiga"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "Markera de markerade meddelandena som olДsta"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected messages as unimportant"
 msgstr "Markera de markerade meddelandena som oviktiga"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages for deletion"
 msgstr "Markera de markerade meddelandena fЖr borttagning"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Flytta"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "Flytta markerade meddelanden till en annan mapp"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Next"
 msgstr "NДsta"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "NДsta meddelande"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "NДsta meddelande"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Markera trЕ_d"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "NДsta meddelande"
+
+#: ui/evolution-mail-message.xml.h:56
 msgid "Open the selected message in a new window"
 msgstr "жppna det markerade meddelandet i ett nytt fЖnster"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:57
 msgid "Open the selected message in the composer to re-send it"
 msgstr "жppna det markerade meddelandet i redigeraren fЖr ЕtersДndning av det"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:58
 msgid "Previews the message to be printed"
 msgstr "FЖrhandsgranskar meddelandet som ska skrivas ut"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:59
 msgid "Previous"
 msgstr "FЖregЕende"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "FЖregЕende meddelande"
+
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "FЖregЕende meddelande"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "FЖregЕende meddelande"
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Print Message..."
 msgstr "Skriv ut meddelande..."
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:65
 msgid "Print Preview..."
 msgstr "FЖrhandsgranska..."
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print this message"
 msgstr "Skriv ut detta meddelande"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply"
 msgstr "Svara"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:68
 msgid "Reply to All"
 msgstr "Svara till alla"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:71
 msgid "S_earch Message"
 msgstr "S_Жk meddelande"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:72
 msgid "Save the message as a text file"
 msgstr "Spara meddelandet som en textfil"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:73
 msgid "Search for text in the body of the displayed message"
 msgstr "SЖk efter text i meddelandetexten pЕ det visade meddelandet"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "Visa e-post_kДllkod"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:75
 msgid "Show Full _Headers"
 msgstr "Visa fullstДndiga _huvuden"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:76
 msgid "Show message in the normal style"
 msgstr "Visa meddelanden i normal stil"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:77
 msgid "Show message with all email headers"
 msgstr "Visa meddelande med alla e-posthuvuden"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:78
 msgid "Show the raw email source of the message"
 msgstr "Visa den rЕa e-postkДllkoden till meddelandet"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "еngra borttagning av de markerade meddelandena"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:80
 msgid "VFolder on Mailing _List..."
 msgstr "Virtuell mapp pЕ _sДndlista..."
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:81
 msgid "VFolder on Se_nder..."
 msgstr "Virtuell mapp pЕ _avsДndare..."
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:82
 msgid "VFolder on _Recipients..."
 msgstr "Virtuell mapp pЕ _mottagare..."
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:83
 msgid "VFolder on _Subject..."
 msgstr "Virtuell mapp pЕ _Дmnesrad..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_TillДmpa filter"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Copy to Folder"
 msgstr "_Kopiera till mapp"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "_Skapa filter frЕn meddelande"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:88
 msgid "_Forward Message"
 msgstr "_Vidarebefordra meddelande"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:89
 msgid "_Message Display"
 msgstr "M_eddelandevisning"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Move to Folder"
 msgstr "_Flytta till mapp"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Open Message"
 msgstr "_жppna meddelande"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Re-send Message"
 msgstr "Skicka _om meddelande"
 
@@ -11004,45 +11058,47 @@ msgid "Re_fresh Task"
 msgstr "Upp_datera uppgift"
 
 #: ui/evolution-tasks.xml.h:2
+#, fuzzy
+msgid "Configure the task view's settings"
+msgstr "Konfigurera kalenderns instДllningar"
+
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopiera markerad uppgift"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Skapa en ny uppgift"
 
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Klipp ut markerad uppgift"
 
 #: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
+msgstr "Ta bort markerade uppgifter"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Ny uppgift"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Paste task from the clipboard"
 msgstr "Klistra in uppgift frЕn urklipp"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Spara uppgift som nЕgot annat"
 
-#: ui/evolution-tasks.xml.h:11
-msgid "Set task view preferences"
-msgstr "StДll in instДllningar fЖr uppgiftsvy"
-
-#: ui/evolution-tasks.xml.h:12
-msgid "TasksPreferences"
-msgstr "UppgiftsvyinstДllningar..."
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "_UppgiftsinstДllningar..."
 
-#: ui/evolution-tasks.xml.h:18
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_Uppgift"
 
-#: ui/evolution-tasks.xml.h:19
-msgid "_Tasks Settings..."
-msgstr "_UppgiftsinstДllningar..."
-
 #: ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "Om Evolution..."
@@ -11364,11 +11420,6 @@ msgstr "Definiera vyer"
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1068
-msgid "%B %Y"
-msgstr "%B %Y"
-
 #: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "Nu"
@@ -11532,6 +11583,40 @@ msgstr "init_corba(): kunde inte initiera GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunde inte initiera Bonobo"
 
+#~ msgid "Set task view preferences"
+#~ msgstr "StДll in instДllningar fЖr uppgiftsvy"
+
+#~ msgid "TasksPreferences"
+#~ msgstr "UppgiftsvyinstДllningar..."
+
+#~ msgid "Edit this task"
+#~ msgstr "Redigera denna uppgift"
+
+#~ msgid "Go to Today"
+#~ msgstr "GЕ till idag"
+
+#~ msgid "Delete all Occurrences"
+#~ msgstr "Ta bort alla fЖrekomster"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Vidarebefordra till adress"
+
+#~ msgid "[Fwd: No Subject]"
+#~ msgstr "[Fwd: Inget Дmne]"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Vidarebefordrat meddelande (inget Дmne)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Vidarebefordrat meddelande-----<br><b>Fr&aring;n:</b> "
+#~ "%s<br><b>Till:</b> %s<br><b>&Auml;mne:</b> %s<br>"
+
+#~ msgid "Wipe trackers"
+#~ msgstr "Rensa spЕrare"
+
 #~ msgid "File not found"
 #~ msgstr "Filen hittades inte"
 
@@ -12174,12 +12259,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Delete this message"
 #~ msgstr "Ta bort detta meddelande"
 
-#~ msgid "Previous message"
-#~ msgstr "FЖregЕende meddelande"
-
-#~ msgid "Next message"
-#~ msgstr "NДsta meddelande"
-
 #~ msgid "Select everything"
 #~ msgstr "Markera alltihop"
 
diff --git a/po/tr.po b/po/tr.po
index 9bb9ca3c6d..fe68ceaa21 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0\n"
-"POT-Creation-Date: 2001-07-02 09:25+0200\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2001-07-07 09:25+0200\n"
 "Last-Translator: GЖrkem гetin <gorkem@gelecek.com.tr>\n"
 "Language-Team: GNOME Turk <gnome-turk@gnome.org>\n"
@@ -12,11 +12,19 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3520
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr "VCard dosyalarЩnЩ Evolution'a aktarЩm mimarisi."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr "VCard dosyalarЩnЩ Evolution'a aktarЩr."
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Kart: "
 
-#: addressbook/backend/ebook/e-card.c:3522
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -24,7 +32,7 @@ msgstr ""
 "\n"
 "щsim: "
 
-#: addressbook/backend/ebook/e-card.c:3523
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -32,7 +40,7 @@ msgstr ""
 "\n"
 "  жnek:     "
 
-#: addressbook/backend/ebook/e-card.c:3524
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
@@ -40,7 +48,7 @@ msgstr ""
 "\n"
 "  Verilen:      "
 
-#: addressbook/backend/ebook/e-card.c:3525
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
@@ -48,7 +56,7 @@ msgstr ""
 "\n"
 "  Ek: "
 
-#: addressbook/backend/ebook/e-card.c:3526
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
@@ -56,7 +64,7 @@ msgstr ""
 "\n"
 "  Aile:     "
 
-#: addressbook/backend/ebook/e-card.c:3527
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
@@ -64,7 +72,7 @@ msgstr ""
 "\n"
 "  Sonek:     "
 
-#: addressbook/backend/ebook/e-card.c:3541
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -72,7 +80,7 @@ msgstr ""
 "\n"
 "DoПum GЭnЭ: "
 
-#: addressbook/backend/ebook/e-card.c:3552
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -80,7 +88,7 @@ msgstr ""
 "\n"
 "Adres:"
 
-#: addressbook/backend/ebook/e-card.c:3554
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -88,7 +96,7 @@ msgstr ""
 "\n"
 "  Posta Kutusu:  "
 
-#: addressbook/backend/ebook/e-card.c:3555
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
@@ -96,7 +104,7 @@ msgstr ""
 "\n"
 "  DiПer:         "
 
-#: addressbook/backend/ebook/e-card.c:3556
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -104,7 +112,7 @@ msgstr ""
 "\n"
 "  Cadde:      "
 
-#: addressbook/backend/ebook/e-card.c:3557
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -112,7 +120,7 @@ msgstr ""
 "\n"
 "  чehir:        "
 
-#: addressbook/backend/ebook/e-card.c:3558
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -120,7 +128,7 @@ msgstr ""
 "\n"
 "  BЖlge:      "
 
-#: addressbook/backend/ebook/e-card.c:3559
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -128,7 +136,7 @@ msgstr ""
 "\n"
 "  Posta Kodu: "
 
-#: addressbook/backend/ebook/e-card.c:3560
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -136,13 +144,13 @@ msgstr ""
 "\n"
 "  эlke:     "
 
-#: addressbook/backend/ebook/e-card.c:3573
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3585
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -150,7 +158,7 @@ msgstr ""
 "\n"
 "Telefonlar:\n"
 
-#: addressbook/backend/ebook/e-card.c:3588
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -158,7 +166,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3612
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -166,7 +174,7 @@ msgstr ""
 "\n"
 "E-posta:\n"
 
-#: addressbook/backend/ebook/e-card.c:3615
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -174,7 +182,7 @@ msgstr ""
 "\n"
 "E-posta:"
 
-#: addressbook/backend/ebook/e-card.c:3634
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -182,7 +190,7 @@ msgstr ""
 "\n"
 "PostalayЩcЩ: "
 
-#: addressbook/backend/ebook/e-card.c:3640
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -190,7 +198,7 @@ msgstr ""
 "\n"
 "Zaman Dilimi: "
 
-#: addressbook/backend/ebook/e-card.c:3648
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -198,7 +206,7 @@ msgstr ""
 "\n"
 "CoПrafi Konum: "
 
-#: addressbook/backend/ebook/e-card.c:3652
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -206,7 +214,7 @@ msgstr ""
 "\n"
 "Meslek: "
 
-#: addressbook/backend/ebook/e-card.c:3664
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -214,7 +222,7 @@ msgstr ""
 "\n"
 "Kurum: "
 
-#: addressbook/backend/ebook/e-card.c:3665
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -222,7 +230,7 @@ msgstr ""
 "\n"
 "  щsim:  "
 
-#: addressbook/backend/ebook/e-card.c:3666
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
@@ -230,7 +238,7 @@ msgstr ""
 "\n"
 "  эnite:  "
 
-#: addressbook/backend/ebook/e-card.c:3667
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
@@ -238,7 +246,7 @@ msgstr ""
 "\n"
 "  эnite2: "
 
-#: addressbook/backend/ebook/e-card.c:3668
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
@@ -246,7 +254,7 @@ msgstr ""
 "\n"
 "  эnite3: "
 
-#: addressbook/backend/ebook/e-card.c:3669
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
@@ -254,7 +262,7 @@ msgstr ""
 "\n"
 "  эnite5: "
 
-#: addressbook/backend/ebook/e-card.c:3673
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -262,7 +270,7 @@ msgstr ""
 "\n"
 "SЩnЩflar: "
 
-#: addressbook/backend/ebook/e-card.c:3674
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -280,7 +288,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3687
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
@@ -288,7 +296,7 @@ msgstr ""
 "\n"
 "жzel Dizi: "
 
-#: addressbook/backend/ebook/e-card.c:3690
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -296,34 +304,23 @@ msgstr ""
 "\n"
 "AГЩk Anahtar: "
 
-#: addressbook/backend/ebook/e-card.c:3952
+#: addressbook/backend/ebook/e-card.c:4037
 msgid "Multiple VCards"
 msgstr "гoklu VCard"
 
-#: addressbook/backend/ebook/e-card.c:3960
+#: addressbook/backend/ebook/e-card.c:4045
+#, c-format
 msgid "VCard for %s"
 msgstr "%s iГin VCard"
 
-#: addressbook/backend/ebook/e-destination.c:338
-msgid "???"
-msgstr "???"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr "VCard dosyalarЩnЩ Evolution'a aktarЩm mimarisi."
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr "VCard dosyalarЩnЩ Evolution'a aktarЩr."
-
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
 #: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo'yu baЧlatamadЩm"
@@ -337,14 +334,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook yЭklenmedi\n"
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "wombat sunucusu baЧlatЩlamadЩ"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Wombat baЧlatЩlamadЩ"
 
@@ -353,264 +350,635 @@ msgstr "Wombat baЧlatЩlamadЩ"
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot adres uygulama defteri okunamadЩ"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr "Adres menЭsЭ iГin Bonobo denetleyici"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr "Adres gЖsteren Жrnek bir Bonobo denetleyici"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr "Adres defteri gЖsteren Жrnek bir Bonobo denetleyici"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Evolution adres defteri mini kartЩnЩ gЖsteren denetleyici."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Evolution Adres Defteri mini kart gЖrЭntЭleyici"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "BaПlantЩlarЩ dЭzenleyen Evolution bileЧeni."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Adres defteri mini kart mimarisi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr "Adres defteri isim gЖsterim arayЭzЭ mimarisi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr "Adres defteri menЭsЭ mimarisi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Evolution addressbook component."
+msgstr "Evolution adres defteri bileЧen mimarisi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the sample Addressbook control"
+msgstr "жrnek adres defteri kontrol mimarisi"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "LDAP Sunucusu"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Dosya"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Bilinmeyen adres defteri tЭrЭ"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr "HiГbiri (anonim kipi)"
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Parola"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Bilinmeyen kimlik denetim tЭrЭ"
+
+#: addressbook/gui/component/addressbook-config.c:177
+msgid "Base"
+msgstr "Temel"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr "Biri"
+
+#: addressbook/gui/component/addressbook-config.c:181
+msgid "Subtree"
+msgstr "Alt AПaГ"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr "Bilinmeyen saha tЭrЭ"
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr "BaПlantЩ DN:"
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr "Bind DN yardЩm metni"
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Bu parolayЩ hatЩrla"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "Makina:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr "Makine yardЩm metni"
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr "KЖk DN:"
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr "Root DN yardЩm metni"
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Port:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr "Port yardЩm metni"
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr "Arama SahasЩ:"
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Kimlik Denetimi:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr "GeliЧmiЧ LDAP SeГenekleri"
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Yol:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr "Yol yardЩm metni"
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "EПer yoksa yol oluЧtur."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "Adres Defterini DЭzenle"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "Adres Defterine Ekle"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr "Sahip olduПunuz adres defterini seГin ve gerekli bilgileri girin."
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "щsim:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr "щsim yardЩm metni"
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "AГЩklama:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr "AГЩklama yardЩm metni"
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
-msgstr "Ekle"
+msgid "Addressbook Sources"
+msgstr "Adres Defteri KaynaklarЩ"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Sil"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "щsim"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
+msgstr "_Ekle"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "_DЭzenle"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "DiПer BaПlantЩlar"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "%s iГin parolayЩ girin"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Adres defterini aГamadЩm"
+
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+"Bu adres defteri aГЩlamadЩ. HatalЩ bir adres girilmiЧ,\n"
+"ya da LDAP sunucusu eriЧilemiyor olabilir."
+
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+"Evolution'Щn bu sЭrЭmЭnde LDAP desteПi bulunmuyor. \n"
+"EПer Evolution'Щ LDAP desteПi ile kullanmak istiyorsanЩz,\n"
+"programЩ CVS kaynaklarЩndan alacaПЩnЩz openLDAP desteПi\n"
+"ile kurmalЩsЩnЩz:\n"
+
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+"Bu adres defteri aГЩlamadЩ. Yeterli izin haklarЩna sahip olup\n"
+"olmadЩПЩnЩzЩ ve dosyanЩn yerini kontrol edin."
+
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
+msgstr "Herhangi bir alanЩn iГeriПi"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "щsim iГeriПi"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "E-posta iГeriПi"
+
+#: addressbook/gui/component/addressbook.c:557
+msgid "Category contains"
+msgstr "Kategori iГeriПi"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "Dizin tarayЩcЩsЩnЩn gЖstereceПi URI"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "Birincil E-posta Adresi"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "2. E-posta Adresi"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "3. E-posta Adresi"
+
+#: addressbook/gui/component/e-address-popup.c:579
+msgid "Select an Action"
+msgstr "Bir Eylem SeГin"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Yeni bir baПlantЩ yarat: \"%s\""
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "\"%s\" baПlantЩsЩna adres ekle"
+
+#: addressbook/gui/component/e-address-popup.c:859
+msgid "Querying Addressbook..."
+msgstr "Adres Defterini AraЧtЩrЩlЩyor..."
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "BaПlantЩ Bilgisini DЭzenle"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "BaПlantЩlara Ekle"
+
+#: addressbook/gui/component/e-address-popup.c:989
+msgid "Merge E-Mail Address"
+msgstr "E-posta Adresini BirleЧtir"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "AramalarЩ Kapat"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "AramalarЩ EtkinleЧtir (Tehlikeli!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Evolution adres defteri isim seГme arayЭzЭ."
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr "Adres defteri isim seГim arayЭzЭ mimarisi"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Sil"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "TЭmЭnЭ Sil"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+msgid "Send HTML Mail?"
+msgstr "HTML Posta GЖnderilsin mi?"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "DeПiЧtirilen BaПlantЩ:"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "щleti AlЩcЩlarЩ"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "щsimleri SeГin"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+msgid "Select name from _folder:"
+msgstr "_Dizinden isim seГin:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "_Category:"
+msgstr "_Kategori:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "_Ara"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr "_YЩldЖnЭmЭ:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "_Meslek"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "щЧyeri _FaksЩ"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "_BaПlantЩlar..."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 #: calendar/gui/dialogs/event-page.glade.h:2
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Kategoriler..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "щletiЧim DЭzenleyici"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor.c:123
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "AyrЩntЩlar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr "FarklЩ Dosyala:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Genel"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Yeni telefon tЭrЭ"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "_Notlar:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Kurum:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Telefon TЭrleri"
 
-#: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:14
-#: addressbook/gui/contact-editor/e-contact-editor.c:1432
-msgid "Primary Email"
-msgstr "Birincil E-posta Adresi"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Wants to receive _HTML mail"
 msgstr "_HTML e-postalarЩnЩ kabul ediyor"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Web adresi:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:96
-msgid "_Add"
-msgstr "_Ekle"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Address..."
 msgstr "_Adres..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "_Sekreterinin adЩ:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "_DoПum gЭnЭ:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "_Meslek"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "ч_irket:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "_BaПlantЩlar..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:1215 mail/mail-config.glade.h:97
-#: ui/evolution-mail-message.xml.h:76 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:47
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Sil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "_BЖlЭm:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "_Tam щsim..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "_Ev"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "_Meslek tanЩmЩ:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "_Menejerinin adЩ:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "_Cep"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "_Lakap:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "_Ofis:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "_UzmanlЩk alanЩ:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr "_EЧ:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "_Bu mektuplaЧma adresidir"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:658
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "BaПlantЩyЩ Sil?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr "Bu baПlantЩ adЩ aЧaПЩdaki sЩnЩflandЩrmalara girer:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1390
-#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "YardЩmcЩ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1391
-#: addressbook/gui/contact-editor/e-contact-editor.c:1458
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Meslek"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1392
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "2. Meslek"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1393
-#: addressbook/gui/widgets/e-addressbook-view.c:715
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "щЧyeri FaksЩ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1394
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr "Geri Arama"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1395
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Araba"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1396
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "чirket"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1397
-#: addressbook/gui/contact-editor/e-contact-editor.c:1459
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Ev"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1398
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "2. ev"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1399
-#: addressbook/gui/widgets/e-addressbook-view.c:716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Ev FaksЩ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1400
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1401
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Cep"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1402
-#: addressbook/gui/contact-editor/e-contact-editor.c:1460
-#: mail/mail-config.glade.h:57
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "DiПer"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1403
-#: addressbook/gui/widgets/e-addressbook-view.c:721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "BaЧka Fakslar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1404
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "гaПrЩ CihazЩ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1405
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "щlk"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1406
-#: addressbook/gui/widgets/e-addressbook-view.c:723
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Radyo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1407
-#: addressbook/gui/widgets/e-addressbook-view.c:724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1408
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1433
-#: addressbook/gui/widgets/e-addressbook-view.c:727
-msgid "Email 2"
-msgstr "2. E-posta Adresi"
-
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1434
-#: addressbook/gui/widgets/e-addressbook-view.c:728
-msgid "Email 3"
-msgstr "3. E-posta Adresi"
-
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "BaПlantЩyЩ Sil?"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "BaПlantЩyЩ HЩzlЩ Ekle"
@@ -620,7 +988,7 @@ msgid "Edit Full"
 msgstr "TЭmЭnЭ DЭzenle"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:702
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Tam щsim"
 
@@ -740,379 +1108,46 @@ msgstr "S_onek:"
 msgid "_Title:"
 msgstr "_SЩfatЩ:"
 
-#: addressbook/gui/component/addressbook.c:345
-#, c-format
-msgid "Enter password for %s"
-msgstr "%s iГin parolayЩ girin"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#, fuzzy
+msgid "List _name:"
+msgstr "Dosya adЩ:"
 
-#: addressbook/gui/component/addressbook.c:373
-msgid "Unable to open addressbook"
-msgstr "Adres defterini aГamadЩm"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#, fuzzy
+msgid "Members"
+msgstr "EylЭl"
 
-#: addressbook/gui/component/addressbook.c:380
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or the LDAP server\n"
-"is down"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
-"Bu adres defteri aГЩlamadЩ. HatalЩ bir adres girilmiЧ,\n"
-"ya da LDAP sunucusu eriЧilemiyor olabilir."
 
-#: addressbook/gui/component/addressbook.c:385
-msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
-msgstr ""
-"Evolution'Щn bu sЭrЭmЭnde LDAP desteПi bulunmuyor. \n"
-"EПer Evolution'Щ LDAP desteПi ile kullanmak istiyorsanЩz,\n"
-"programЩ CVS kaynaklarЩndan alacaПЩnЩz openLDAP desteПi\n"
-"ile kurmalЩsЩnЩz:\n"
-
-#: addressbook/gui/component/addressbook.c:393
-msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
-"Bu adres defteri aГЩlamadЩ. Yeterli izin haklarЩna sahip olup\n"
-"olmadЩПЩnЩzЩ ve dosyanЩn yerini kontrol edin."
-
-#: addressbook/gui/component/addressbook.c:554 calendar/gui/gnome-cal.c:215
-msgid "Any field contains"
-msgstr "Herhangi bir alanЩn iГeriПi"
 
-#: addressbook/gui/component/addressbook.c:555
-msgid "Name contains"
-msgstr "щsim iГeriПi"
-
-#: addressbook/gui/component/addressbook.c:556
-msgid "Email contains"
-msgstr "E-posta iГeriПi"
-
-#: addressbook/gui/component/addressbook.c:557
-msgid "Category contains"
-msgstr "Kategori iГeriПi"
-
-#: addressbook/gui/component/addressbook.c:707
-msgid "The URI that the Folder Browser will display"
-msgstr "Dizin tarayЩcЩsЩnЩn gЖstereceПi URI"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "LDAP Sunucusu"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Dosya"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Bilinmeyen adres defteri tЭrЭ"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr "HiГbiri (anonim kipi)"
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:61
-msgid "Password"
-msgstr "Parola"
-
-#: addressbook/gui/component/addressbook-config.c:168
-msgid "Unknown auth type"
-msgstr "Bilinmeyen kimlik denetim tЭrЭ"
-
-#: addressbook/gui/component/addressbook-config.c:177
-msgid "Base"
-msgstr "Temel"
-
-#: addressbook/gui/component/addressbook-config.c:179
-msgid "One"
-msgstr "Biri"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "Subtree"
-msgstr "Alt AПaГ"
-
-#: addressbook/gui/component/addressbook-config.c:184
-msgid "Unknown scope type"
-msgstr "Bilinmeyen saha tЭrЭ"
-
-#: addressbook/gui/component/addressbook-config.c:349
-msgid "Bind DN:"
-msgstr "BaПlantЩ DN:"
-
-#: addressbook/gui/component/addressbook-config.c:350
-msgid "FIXME Bind DN Help text here"
-msgstr "Bind DN yardЩm metni"
-
-#: addressbook/gui/component/addressbook-config.c:352
-#: mail/mail-config.glade.h:70
-msgid "Remember this password"
-msgstr "Bu parolayЩ hatЩrla"
-
-#: addressbook/gui/component/addressbook-config.c:403
-#: mail/mail-config.glade.h:41
-msgid "Host:"
-msgstr "Makina:"
-
-#: addressbook/gui/component/addressbook-config.c:404
-msgid "FIXME Host help text here."
-msgstr "Makine yardЩm metni"
-
-#: addressbook/gui/component/addressbook-config.c:406
-msgid "Root DN:"
-msgstr "KЖk DN:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Root DN help text here."
-msgstr "Root DN yardЩm metni"
-
-#: addressbook/gui/component/addressbook-config.c:411
-msgid "Port:"
-msgstr "Port:"
-
-#: addressbook/gui/component/addressbook-config.c:412
-msgid "FIXME Port help text here."
-msgstr "Port yardЩm metni"
-
-#: addressbook/gui/component/addressbook-config.c:432
-msgid "Search Scope:"
-msgstr "Arama SahasЩ:"
-
-#: addressbook/gui/component/addressbook-config.c:479
-msgid "Authentication:"
-msgstr "Kimlik Denetimi:"
-
-#: addressbook/gui/component/addressbook-config.c:501
-msgid "Advanced LDAP Options"
-msgstr "GeliЧmiЧ LDAP SeГenekleri"
-
-#: addressbook/gui/component/addressbook-config.c:522
-#: mail/mail-config.glade.h:62
-msgid "Path:"
-msgstr "Yol:"
-
-#: addressbook/gui/component/addressbook-config.c:523
-msgid "FIXME Path Help text here"
-msgstr "Yol yardЩm metni"
-
-#: addressbook/gui/component/addressbook-config.c:528
-msgid "Create path if it doesn't exist."
-msgstr "EПer yoksa yol oluЧtur."
-
-#: addressbook/gui/component/addressbook-config.c:662
-msgid "Edit Addressbook"
-msgstr "Adres Defterini DЭzenle"
-
-#: addressbook/gui/component/addressbook-config.c:664
-msgid "Add Addressbook"
-msgstr "Adres Defterine Ekle"
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr "Sahip olduПunuz adres defterini seГin ve gerekli bilgileri girin."
-
-#: addressbook/gui/component/addressbook-config.c:688
-#: mail/mail-config.glade.h:51
-msgid "Name:"
-msgstr "щsim:"
-
-#: addressbook/gui/component/addressbook-config.c:689
-msgid "FIXME Name help text here"
-msgstr "щsim yardЩm metni"
-
-#: addressbook/gui/component/addressbook-config.c:691
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
-msgid "Description:"
-msgstr "AГЩklama:"
-
-#: addressbook/gui/component/addressbook-config.c:692
-msgid "FIXME Description help text here"
-msgstr "AГЩklama yardЩm metni"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Adres Defteri KaynaklarЩ"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-#: addressbook/gui/widgets/e-addressbook-view.c:606
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-#: calendar/gui/dialogs/recurrence-page.glade.h:5 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:27
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-mail-message.xml.h:16 ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Sil"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: filter/filter.glade.h:3 mail/mail-config.glade.h:33
-msgid "Edit"
-msgstr "DЭzenle"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "щsim"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
-msgstr "DiПer BaПlantЩlar"
-
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * card.
-#.
-#: addressbook/gui/component/e-address-popup.c:178
-msgid "(none)"
-msgstr "(hiГbiri)"
-
-#: addressbook/gui/component/e-address-popup.c:579
-msgid "Select an Action"
-msgstr "Bir Eylem SeГin"
-
-#: addressbook/gui/component/e-address-popup.c:585
-msgid "Create a new contact \"%s\""
-msgstr "Yeni bir baПlantЩ yarat: \"%s\""
-
-#: addressbook/gui/component/e-address-popup.c:597
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "\"%s\" baПlantЩsЩna adres ekle"
-
-#: addressbook/gui/component/e-address-popup.c:859
-msgid "Querying Addressbook..."
-msgstr "Adres Defterini AraЧtЩrЩlЩyor..."
-
-#: addressbook/gui/component/e-address-popup.c:916
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:276
-msgid "Edit Contact Info"
-msgstr "BaПlantЩ Bilgisini DЭzenle"
-
-#: addressbook/gui/component/e-address-popup.c:946
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:342
-msgid "Add to Contacts"
-msgstr "BaПlantЩlara Ekle"
-
-#: addressbook/gui/component/e-address-popup.c:989
-msgid "Merge E-Mail Address"
-msgstr "E-posta Adresini BirleЧtir"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "AramalarЩ Kapat"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "AramalarЩ EtkinleЧtir (Tehlikeli!)"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr "Adres menЭsЭ iГin Bonobo denetleyici"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr "Adres gЖsteren Жrnek bir Bonobo denetleyici"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
-msgstr "Adres defteri gЖsteren Жrnek bir Bonobo denetleyici"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
-msgstr "Evolution adres defteri mini kartЩnЩ gЖsteren denetleyici."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Evolution Adres Defteri mini kart gЖrЭntЭleyici"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "BaПlantЩlarЩ dЭzenleyen Evolution bileЧeni."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Adres defteri mini kart mimarisi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Adres defteri isim gЖsterim arayЭzЭ mimarisi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
-msgstr "Adres defteri menЭsЭ mimarisi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "Evolution adres defteri bileЧen mimarisi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the sample Addressbook control"
-msgstr "жrnek adres defteri kontrol mimarisi"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:156
-#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:267 shell/e-shortcuts-view.c:470
-msgid "Remove"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#, fuzzy
+msgid "_Remove"
 msgstr "Sil"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:171
-msgid "Remove All"
-msgstr "TЭmЭnЭ Sil"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:195
-msgid "Send HTML Mail?"
-msgstr "HTML Posta GЖnderilsin mi?"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Evolution adres defteri isim seГme arayЭzЭ."
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "Adres defteri isim seГim arayЭzЭ mimarisi"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Message Recipients"
-msgstr "щleti AlЩcЩlarЩ"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Select Names"
-msgstr "щsimleri SeГin"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select name from _folder:"
-msgstr "_Dizinden isim seГin:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "_Category:"
-msgstr "_Kategori:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "щletiЧim DЭzenleyici"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "_Ara"
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
+#, fuzzy
+msgid "Contact List Editor"
+msgstr "щletiЧim DЭzenleyici"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "Ekle Gitsin"
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
 msgid "Duplicate Contact Detected"
 msgstr "гift BaПlantЩ Bulundu"
 
@@ -1133,18 +1168,14 @@ msgstr ""
 "Yine de eklemek istiyor musunuz?"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
-msgid "Change Anyway"
-msgstr "DeПiЧtir"
-
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Changed Contact:"
 msgstr "DeПiЧtirilen BaПlantЩ:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
 msgid "Conflicting Contact:"
 msgstr "гakЩЧan BaПlantЩ:"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
@@ -1152,8 +1183,13 @@ msgstr ""
 "DeПiЧtirilen baПlantЩ adresinin adЩ ya da e-posta adresi zaten var.\n"
 "Yine de eklemek istiyor musunuz?"
 
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+#, fuzzy
+msgid "_Change Anyway"
+msgstr "DeПiЧtir"
+
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
-#: mail/mail-search.c:242
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Ara"
 
@@ -1284,9 +1320,9 @@ msgstr "BaПlantЩya ileti gЖnder"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
 #: addressbook/gui/widgets/e-addressbook-view.c:604
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-mail-message.xml.h:51
-#: ui/evolution-tasks.xml.h:10 ui/my-evolution.xml.h:2
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "YazdЩr"
 
@@ -1295,138 +1331,213 @@ msgstr "YazdЩr"
 msgid "Print Envelope"
 msgstr "ZarfЩ YazdЩr"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:700
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Sil"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+msgid "Error modifying card"
+msgstr "Kartlar dЭzenlenirken bir hata oluЧtu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "Kaynaklar"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Bilinmeyen hata"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "гevrimdЩЧЩ ГalЩЧ"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr "щzin yok"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "Dosya bulunamadЩ"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "щЧlem desteklenmiyor"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "щptal Edildi"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "G/г hatasЩ"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "%s yЭklenirken hata oluЧtu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Kartlar dЭzenlenirken bir hata oluЧtu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Kartlar dЭzenlenirken bir hata oluЧtu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "KartЩ silerken bir hata oluЧtu"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+msgid "Error removing card"
+msgstr "KartЩ silerken bir hata oluЧtu"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* BaПlantЩ eklemek buraya tЩklayЩn *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "File As"
 msgstr "FarklЩ Dosyala"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:703
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "E-posta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:704
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "щlk Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:705
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr "Sekreter Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:706
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "щЧ Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:707
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr "Geri Arama Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "чirket Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:709
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "Ev Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:710
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Kurum"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "щЧyeri Adresi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:712
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "Ev Adresi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "Cep Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "AraГ Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:717
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "2. щЧ Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "2. Ev Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "DiПer Telefonlar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "DiПer Adres"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:729
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Web SayfasЩ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:730
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "BЖlЭm"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:731
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Ofis"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:732
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 msgid "Title"
 msgstr "SЩfat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:733
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "UzmanlЩk alanЩ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:734
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "YЖnetici"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Lakap"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:737
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 msgid "Spouse"
 msgstr "EЧ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:738
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Not"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:739
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr "Web SayfasЩ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
 msgid "Done."
 msgstr "TamamlandЩ."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
-msgid "Error removing card"
-msgstr "KartЩ silerken bir hata oluЧtu"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1114
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
 msgid "Removing cards..."
 msgstr "Kartlar siliniyor..."
 
-#: addressbook/gui/widgets/e-minicard.c:451
-msgid "Error modifying card"
-msgstr "Kartlar dЭzenlenirken bir hata oluЧtu"
-
 #: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Adres Defterine kaydet"
@@ -1474,7 +1585,8 @@ msgid "Dimensions:"
 msgstr "Boyutlar:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "YazЩtipi..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1613,37 +1725,62 @@ msgstr "Tip:"
 msgid "Width:"
 msgstr "GeniЧlik:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: addressbook/printing/e-contact-print.glade.h:42
+#, fuzzy
+msgid "_Font..."
+msgstr "YazЩtipi..."
+
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr "Takvim sunucusuyla iletiЧimde hata oluЧtu"
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr "Pilot'tan takvim uygulama bloПu okunamadЩ"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilot ToDO uygulama bloПu okunamadЩ"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:623
-#: calendar/gui/alarm-notify/alarm-queue.c:922
-#: calendar/gui/alarm-notify/alarm-queue.c:978
-msgid "Reminder of your appointment at "
-msgstr "Randevu hatЩrlatma tarihi"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Takvim gЖsteren Жrnek bir Bonobo denetleyici."
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: calendar/gui/alarm-notify/alarm-queue.c:914
-msgid "Snooze"
-msgstr "Dinlenme"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar executive summary component."
+msgstr "Evolution takvim Жzet bileЧeni."
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:927
-#: calendar/gui/alarm-notify/alarm-queue.c:982
-msgid "Ok"
-msgstr "Tamam"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolution takvimi iTip/iMip gЖrЭntЭleyici"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr "Takvimi dЭzenleyen Evolution bileЧeni."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Calendar Summary component."
+msgstr "Takvim Жzet bileЧen mimarisi."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the Evolution calendar component."
+msgstr "Evolution takvimi bileЧen mimarisi."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the calendar iTip view control"
+msgstr "Takvim iTip gЖrЭntЭ kontrolЭ mimarisi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Factory for the sample Calendar control"
+msgstr "жrnek Takvim kontrolЭ mimarisi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Evolution takvimi bileЧen mimarisi."
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1653,83 +1790,88 @@ msgstr "Alarm bilgilendirme servisi"
 msgid "Factory for the alarm notification service"
 msgstr "Alarm bilgilendirme servisi mimarisi"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:153
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr "Randevu iГin uyarЩ: BaЧlangЩГ tarihi %s, bitiЧ tarihi %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:157
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr "%s tarihinde baЧlayacak randevu iГin uyarЩ"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:162
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr "%s tarihinde bitecek randevu iГin uyarЩ"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:166
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
 msgid "Notification about your appointment"
 msgstr "Randevu uyarЩsЩ"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:173
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, c-format
 msgid "Notification about your task starting on %s and ending on %s"
 msgstr "%s tarihinde baЧlayacak ve %s tarihinde bitecek gЖrev iГin uyarЩ"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:177
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, c-format
 msgid "Notification about your task starting on %s"
 msgstr "%s tarihinde baЧlayacak gЖrev iГin uyarЩ"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:182
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, c-format
 msgid "Notification about your task ending on %s"
 msgstr "%s tarihinde bitecek gЖrev iГin uyarЩ"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:186
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
 msgid "Notification about your task"
 msgstr "GЖrev uyarЩsЩ"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:193
-#, fuzzy, c-format
-msgid "Notification about your journal entry starting on %s and ending on %s"
-msgstr "%d %b %A, %Y %H:%M tarihindeki toplantЩ iГin uyarЩ"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:197
-#, fuzzy, c-format
-msgid "Notification about your journal entry starting on %s"
-msgstr "%d %b %A, %Y %H:%M tarihindeki toplantЩ iГin uyarЩ"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:202
-#, fuzzy, c-format
-msgid "Notification about your journal entry ending on %s"
-msgstr "%d %b %A, %Y %H:%M tarihindeki toplantЩ iГin uyarЩ"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:206
-#, fuzzy
-msgid "Notification about your journal entry"
-msgstr "%d %b %A, %Y %H:%M tarihindeki toplantЩ iГin uyarЩ"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:285
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "%d %b %A, %Y %H:%M tarihinde alarm ver"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:301
-msgid "No summary available."
-msgstr "жzet yok."
-
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution.xml.h:5
-msgid "Close"
-msgstr "Kapat"
+#: ui/evolution-comp-editor.xml.h:1
+msgid "C_lose"
+msgstr "_Kapat"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "ToplantЩyЩ dЭzenle"
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "Dinlenme"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
 msgid "Snooze time (minutes)"
 msgstr "Dinlenme zamanЩ (dakika)"
 
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "ToplantЩyЩ dЭzenle"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+#, fuzzy
+msgid "No description available."
+msgstr "жzet yok."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr "Randevu hatЩrlatma tarihi"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "Dinlenme"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Tamam"
+
 #: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
@@ -1750,125 +1892,149 @@ msgstr "Gnome-vfs baЧlatЩlamЩyor"
 msgid "Could not create the alarm notify service factory"
 msgstr "Alarm bilgilendirme servis mimarisi oluЧturamadЩm"
 
-#: calendar/gui/calendar-commands.c:275
-msgid "File not found"
-msgstr "Dosya bulunamadЩ"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%d %B %A"
 
-#: calendar/gui/calendar-commands.c:299
-msgid "Open calendar"
-msgstr "Takvimi aГ"
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%d %b %a"
 
-#: calendar/gui/calendar-commands.c:341
-msgid "Save calendar"
-msgstr "Takvimi kaydet"
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%d %b %a"
+
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:523
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "Takvim gЖrЭnЭmЭ yaratЩlamadЩ. ORBit ve OAF kurulumunu gЖzden geГirin."
 
-#: calendar/gui/calendar-model.c:361 calendar/gui/calendar-model.c:951
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr "Genel"
 
-#: calendar/gui/calendar-model.c:364 calendar/gui/calendar-model.c:953
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr "жzel"
 
-#: calendar/gui/calendar-model.c:367 calendar/gui/calendar-model.c:955
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr "Gizli"
 
-#: calendar/gui/calendar-model.c:370 calendar/gui/dialogs/alarm-page.c:320
-#: calendar/gui/dialogs/alarm-page.c:356
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
-#: calendar/gui/calendar-model.c:458
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr "K"
 
-#: calendar/gui/calendar-model.c:458
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr "G"
 
-#: calendar/gui/calendar-model.c:460
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr "D"
 
-#: calendar/gui/calendar-model.c:460
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr "B"
 
-#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1119
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
 #: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:441 mail/message-list.c:620
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "YЭksek"
 
-#: calendar/gui/calendar-model.c:500 calendar/gui/calendar-model.c:1121
-#: calendar/gui/calendar-model.c:1644
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
 #: calendar/gui/dialogs/task-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:442 mail/message-list.c:619
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:502 calendar/gui/calendar-model.c:1123
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:443 mail/message-list.c:618
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "DЭЧЭk"
 
-#: calendar/gui/calendar-model.c:538 calendar/gui/calendar-model.c:1175
-#: calendar/gui/e-calendar-table.c:495
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "чeffaf"
 
-#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1177
-#: calendar/gui/e-calendar-table.c:494
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Opak"
 
-#: calendar/gui/calendar-model.c:690 calendar/gui/calendar-model.c:1229
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
 #: calendar/gui/dialogs/task-page.glade.h:12
-#: calendar/gui/e-calendar-table.c:515
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "BaЧlamadЩ"
 
-#: calendar/gui/calendar-model.c:693 calendar/gui/calendar-model.c:1231
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
 #: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:516
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "щЧlemde"
 
-#: calendar/gui/calendar-model.c:696 calendar/gui/calendar-model.c:1233
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
 #: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:517
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "TamamlandЩ"
 
-#: calendar/gui/calendar-model.c:699 calendar/gui/calendar-model.c:1235
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
 #: calendar/gui/dialogs/task-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:518 camel/camel-service.c:544
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "щptal Edildi"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:847 e-util/e-time-utils.c:267
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%d/%m/%Y %a %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:850 e-util/e-time-utils.c:276
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:855
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1879,23 +2045,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:935
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr "SЩnЩflandЩrma 'Genel', 'жzel', 'Gizli', ya da 'HiГbiri' olmalЩdЩr."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:949 calendar/gui/calendar-model.c:1173
-#: calendar/gui/calendar-model.c:1227 calendar/gui/e-calendar-table.c:418
-#: calendar/gui/e-calendar-table.c:493 mail/mail-account-gui.c:1295
-#: mail/mail-accounts.c:125 mail/mail-accounts.c:176
-#: mail/mail-config.glade.h:54 shell/e-shell-view.c:1398
-#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
-#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Yok"
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1905,150 +2075,251 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "YЭzde deПeri 0 ile 100 arasЩnda bulunmalЩdЩr."
 
-#: calendar/gui/calendar-model.c:1104
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr "жncelik deПeri 'YЭksek', 'Normal', 'DЭЧЭk' ya da 'TanЩmsЩz' olmalЩdЩr."
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1117
+#: calendar/gui/calendar-model.c:1181
 #: calendar/gui/dialogs/task-page.glade.h:18
-#: calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "TanЩmsЩz"
 
-#: calendar/gui/calendar-model.c:1158
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr "чeffaflЩk deПeri 'чeffaf', 'Opak' ya da 'HiГbiri' olmalЩdЩr."
 
-#: calendar/gui/calendar-model.c:1646
+#: calendar/gui/calendar-model.c:1710
 msgid "Recurring"
 msgstr "Tekrarlama"
 
-#: calendar/gui/calendar-model.c:1648
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "GЖrevlendirildi"
 
-#: calendar/gui/calendar-model.c:1654
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Evet"
 
-#: calendar/gui/calendar-model.c:1654
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "HayЩr"
 
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
+msgid "Day View"
+msgstr "GЭn GЖrЭnЭmЭ"
+
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+msgid "Work Week View"
+msgstr "гalЩЧma HaftasЩ GЖrЭnЭmЭ"
+
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+msgid "Week View"
+msgstr "Hafta GЖrЭnЭmЭ"
+
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+msgid "Month View"
+msgstr "Ay GЖrЭnЭmЭ"
+
 #: calendar/gui/control-factory.c:128
 msgid "The URI that the calendar will display"
 msgstr "Takvimin gЖsterecek olduПu URI"
 
-#: calendar/gui/dialogs/alarm-page.c:255
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "GeliЧmiЧ LDAP SeГenekleri"
+
+#: calendar/gui/dialogs/alarm-options.c:363
+#, fuzzy
+msgid "Message Alarm Options"
+msgstr "щleti AlЩcЩlarЩ"
+
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "%s'ten E-posta"
+
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "щleti _GЖrЭnЭmЭ"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+#, fuzzy
+msgid "Play sound:"
+msgstr "Bir ses Гal"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "Bir program ГalЩЧtЩr"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+msgid "days"
+msgstr "gЭn"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+msgid "extra times every"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr "saat"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr "dakika"
+
+#: calendar/gui/dialogs/alarm-page.c:284
+#, c-format
 msgid "%d days"
 msgstr "%d gЭn"
 
-#: calendar/gui/dialogs/alarm-page.c:257
+#: calendar/gui/dialogs/alarm-page.c:286
 msgid "1 day"
 msgstr "1 gЭn"
 
-#: calendar/gui/dialogs/alarm-page.c:260
+#: calendar/gui/dialogs/alarm-page.c:289
+#, c-format
 msgid "%d weeks"
 msgstr "%d hafta"
 
-#: calendar/gui/dialogs/alarm-page.c:262
+#: calendar/gui/dialogs/alarm-page.c:291
 msgid "1 week"
 msgstr "1 hafta"
 
-#: calendar/gui/dialogs/alarm-page.c:265
+#: calendar/gui/dialogs/alarm-page.c:294
+#, c-format
 msgid "%d hours"
 msgstr "%d saat"
 
-#: calendar/gui/dialogs/alarm-page.c:267
+#: calendar/gui/dialogs/alarm-page.c:296
 msgid "1 hour"
 msgstr "1 saat"
 
-#: calendar/gui/dialogs/alarm-page.c:270
+#: calendar/gui/dialogs/alarm-page.c:299
+#, c-format
 msgid "%d minutes"
 msgstr "%d dakika"
 
-#: calendar/gui/dialogs/alarm-page.c:272
+#: calendar/gui/dialogs/alarm-page.c:301
 msgid "1 minute"
 msgstr "1 dakika"
 
-#: calendar/gui/dialogs/alarm-page.c:275
+#: calendar/gui/dialogs/alarm-page.c:304
+#, c-format
 msgid "%d seconds"
 msgstr "%d saniye"
 
-#: calendar/gui/dialogs/alarm-page.c:277
+#: calendar/gui/dialogs/alarm-page.c:306
 msgid "1 second"
 msgstr "1 saniye"
 
-#: calendar/gui/dialogs/alarm-page.c:302
-#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Bir ses Гal"
 
-#: calendar/gui/dialogs/alarm-page.c:306
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "Show a dialog"
-msgstr "Bir pencere gЖster"
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "Sonraki iletiyi gЖster"
 
-#: calendar/gui/dialogs/alarm-page.c:310
-#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
 msgid "Send an email"
 msgstr "Bir e-posta gЖnder"
 
-#: calendar/gui/dialogs/alarm-page.c:314
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Bir program ГalЩЧtЩr"
 
-#: calendar/gui/dialogs/alarm-page.c:332
-msgid " before start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
 msgstr " randevunun baЧlangЩcЩndan Жnce"
 
-#: calendar/gui/dialogs/alarm-page.c:335
-msgid " after start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
 msgstr " randevunun baЧlangЩcЩndan sonra"
 
-#: calendar/gui/dialogs/alarm-page.c:345
-msgid " before end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
 msgstr " randevunun bitiminden Жnce"
 
-#: calendar/gui/dialogs/alarm-page.c:348
-msgid " after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
 msgstr " randevunun bitiminden sonra"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #: calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "Basics"
 msgstr "Temel"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-itip-control.c:293
+#: calendar/gui/e-itip-control.c:298
 msgid "Date/Time:"
 msgstr "Tarih/Zaman:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:5
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Reminders"
 msgstr "HatЩrlatЩcЩlar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9 ui/evolution-calendar.xml.h:36
-msgid "Settings..."
-msgstr "Ayarlar..."
-
-#: calendar/gui/dialogs/alarm-page.glade.h:11
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-itip-control.c:282 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "жzet:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "_SeГenekler"
+
 #. Automatically generated. Do not edit.
 #: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
 msgid "after"
@@ -2071,7 +2342,7 @@ msgstr "randevu sonu"
 msgid "hour(s)"
 msgstr "saat"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:99
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
 msgid "minute(s)"
 msgstr "dakika"
 
@@ -2112,7 +2383,7 @@ msgid "Beep when alarm windows appear."
 msgstr "Alarm penceresi gЖrЭndЭПЭnde biple."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: ui/evolution-calendar.xml.h:4
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
 msgid "Calendar"
 msgstr "Takvim"
 
@@ -2145,7 +2416,7 @@ msgid "Defaults"
 msgstr "жntanЩmlЩlar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:30
 msgid "Display"
 msgstr "GЖsterim"
 
@@ -2162,7 +2433,7 @@ msgid "Fri"
 msgstr "Cum"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:918
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "Cuma"
 
@@ -2171,7 +2442,7 @@ msgid "Mon"
 msgstr "Pzt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:914
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Pazartesi"
 
@@ -2192,7 +2463,7 @@ msgid "Sat"
 msgstr "Cmt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:919
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Cumartesi"
 
@@ -2213,7 +2484,7 @@ msgid "Sun"
 msgstr "Paz"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/recurrence-page.c:920
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Pazar"
 
@@ -2230,7 +2501,7 @@ msgid "Thu"
 msgstr "Per"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/recurrence-page.c:917
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "PerЧembe"
 
@@ -2255,7 +2526,7 @@ msgid "Tue"
 msgstr "Sal"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.c:915
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "SalЩ"
 
@@ -2264,7 +2535,7 @@ msgid "Wed"
 msgstr "гar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.c:916
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "гarЧamba"
 
@@ -2276,6 +2547,144 @@ msgstr "гalЩЧma HaftasЩ"
 msgid "minutes before they occur."
 msgstr "dakika Жnce (oluЧmadan)."
 
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "GerГekten bu hesabЩ silmek istiyor musunuz?"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "GerГekten %d gЖrevi silmek istiyor musunuz?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "`%s' baЧlЩksЩz gЭnlЭk girdisini silmek istiyor musunuz?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+#, fuzzy
+msgid "This task has been deleted."
+msgstr "Bu bir toplantЩ isteПidir."
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+#, fuzzy
+msgid "This task has been changed."
+msgstr "Bu bir olay iptalidir."
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+msgid " (Completed "
+msgstr " (Tamamlanan "
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+msgid "Completed "
+msgstr "Tamamlanan "
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+msgid "Due "
+msgstr "Tarihe gЖre "
+
+#: calendar/gui/dialogs/comp-editor.c:449
+#, fuzzy
+msgid "Edit Appointment"
+msgstr "ToplantЩyЩ dЭzenle"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, fuzzy, c-format
+msgid "Appointment - %s"
+msgstr "Randevular"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, fuzzy, c-format
+msgid "Task - %s"
+msgstr "GЖrevler"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:474
+#, fuzzy
+msgid "No summary"
+msgstr "щleti Жzeti"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "Dosya Эzerine yazЩlsЩn mЩ?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"AynЩ isimde bir dosya zaten var\n"
+"эzerine yazЩlsЩn mЩ?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "FarklЩ Kaydet..."
+
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
 #: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -2304,31 +2713,58 @@ msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Bu baЧlЩksЩz gЭnlЭk girdisini silmek istiyor musunuz?"
 
 #: calendar/gui/dialogs/delete-comp.c:120
+#, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "GerГekten %d randevuyu silmek istiyor musunuz?"
 
 #: calendar/gui/dialogs/delete-comp.c:125
+#, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "GerГekten %d gЖrevi silmek istiyor musunuz?"
 
 #: calendar/gui/dialogs/delete-comp.c:130
+#, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "GerГekten %s gЭnlЭk girdisini silmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/event-editor.c:136
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Bir dosya seГin"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "BЖlЭmler:"
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Zaman Dilimi: "
+
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:154
 msgid "Appointment"
 msgstr "Randevu"
 
-#: calendar/gui/dialogs/event-editor.c:141
+#: calendar/gui/dialogs/event-editor.c:159
 msgid "Reminder"
 msgstr "HatЩrlatЩcЩ"
 
-#: calendar/gui/dialogs/event-editor.c:146
+#: calendar/gui/dialogs/event-editor.c:164
 msgid "Recurrence"
 msgstr "Tekrarlama"
 
-#: calendar/gui/dialogs/event-editor.c:151
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
 msgid "Meeting"
 msgstr "ToplantЩ"
 
@@ -2338,7 +2774,7 @@ msgstr "_TЭm gЭn olaylarЩ"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:245
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "SЩnЩflandЩrma"
 
@@ -2367,11 +2803,6 @@ msgstr "ж_zet:"
 msgid "_Confidential"
 msgstr "_Gizli"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:20
-msgid "_Contacts..."
-msgstr "_BaПlantЩlar..."
-
 #: calendar/gui/dialogs/event-page.glade.h:10
 msgid "_End time:"
 msgstr "B_itiЧ tarihi:"
@@ -2380,38 +2811,274 @@ msgstr "B_itiЧ tarihi:"
 msgid "_Start time:"
 msgstr "B_aЧlangЩГ tarihi:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Grup adЩ:"
+
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
+#, fuzzy
+msgid "Resource"
+msgstr "KaПЩt kaynaПЩ:"
+
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+#, fuzzy
+msgid "Chair"
+msgstr "Araba"
+
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+#, fuzzy
+msgid "Required Participant"
+msgstr "щstenen Bilgiler"
+
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+#, fuzzy
+msgid "Optional Participant"
+msgstr "SeГimlik Bilgiler"
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Bir Eylem SeГin"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Accepted"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr "Silinen"
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "GiriЧimli"
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Silinen"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "щЧlemde"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "AraГ Telefonu"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "щstenen Bilgiler"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "SeГimlik Bilgiler"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+msgid "Non-Participants"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "GЖnderildi"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "Sil..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#, fuzzy
+msgid "Attendee"
+msgstr "TЭm KatЩlЩmcЩlar"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
+msgstr "Tamamlanma Tarihi"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "Silinen"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "GЖrevi DaПЩt"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "YЖnetici"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#, fuzzy
+msgid "Member"
+msgstr "EylЭl"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#, fuzzy
+msgid "Role"
+msgstr "GЖrevler"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Durum"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "TЭr"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Kurum:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Kurum:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "_BaЧkalarЩnЩ Davet Et..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Kurum:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr "%d %b %a %Y"
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Bu randevuyu Evolution dЭzenleyemiyor."
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+msgid "on"
+msgstr "tarih"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "gЭn"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+msgid "on the"
+msgstr " "
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr "."
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+msgid "occurrences"
+msgstr "tekrarlar"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Custom recurrence"
 msgstr "жzel tekrar"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Her"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Exceptions"
 msgstr "щstisnalar"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "Modify"
-msgstr "DeПiЧtir"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "No recurrence"
 msgstr "Tekrarlama yok"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Preview"
 msgstr "жnizleme"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "Recurrence Rule"
 msgstr "Tekrarlama KuralЩ"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "Simple recurrence"
 msgstr "Basit tekrar"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "DeПiЧtir"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "iГin"
@@ -2436,48 +3103,47 @@ msgstr "hafta"
 msgid "year(s)"
 msgstr "yЩl"
 
-#: calendar/gui/dialogs/recurrence-page.c:398 calendar/gui/print.c:1978
-#: calendar/gui/print.c:1980 calendar/gui/print.c:1981
-msgid "%a %b %d %Y"
-msgstr "%d %b %a %Y"
-
-#: calendar/gui/dialogs/recurrence-page.c:544
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Bu randevuyu Evolution dЭzenleyemiyor."
-
-#: calendar/gui/dialogs/recurrence-page.c:887
-msgid "on"
-msgstr "tarih"
-
-#: calendar/gui/dialogs/recurrence-page.c:913 filter/filter-datespec.c:81
-msgid "day"
-msgstr "gЭn"
-
-#: calendar/gui/dialogs/recurrence-page.c:1043
-msgid "on the"
-msgstr " "
-
-#: calendar/gui/dialogs/recurrence-page.c:1051
-msgid "th"
-msgstr "."
-
-#: calendar/gui/dialogs/recurrence-page.c:1215
-msgid "occurrences"
-msgstr "tekrarlar"
-
 #: calendar/gui/dialogs/save-comp.c:51
 msgid "Do you want to save changes?"
 msgstr "DeПiЧiklikleri kaydetmek istiyor musunuz?"
 
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "Date Completed:"
 msgstr "Tamamlama Tarihi:"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "GЖrevi DaПЩt"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "GЖrevi DaПЩt"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "Yok"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor.c:118
+#: calendar/gui/dialogs/task-editor.c:130
 msgid "Task"
 msgstr "GЖrev"
 
@@ -2506,329 +3172,317 @@ msgstr "ж_ncelik:"
 msgid "_Status:"
 msgstr "_Durum:"
 
-#: calendar/gui/e-calendar-table.c:244
-msgid "Categories"
-msgstr "Kategoriler"
-
-#: calendar/gui/e-calendar-table.c:246
-msgid "Completion Date"
-msgstr "Tamamlanma Tarihi"
-
-#: calendar/gui/e-calendar-table.c:247
-msgid "End Date"
-msgstr "BitiЧ Tarihi"
-
-#: calendar/gui/e-calendar-table.c:248
-msgid "Start Date"
-msgstr "BaЧlangЩГ Tarihi"
-
-#: calendar/gui/e-calendar-table.c:249
-msgid "Due Date"
-msgstr "Tarihe gЖre:"
-
-#: calendar/gui/e-calendar-table.c:250
-msgid "Geographical Position"
-msgstr "CoПrafi Konum"
-
-#: calendar/gui/e-calendar-table.c:251
-msgid "Percent complete"
-msgstr "Biten yЭzde"
-
-#: calendar/gui/e-calendar-table.c:252
-msgid "Priority"
-msgstr "жncelik"
-
-#: calendar/gui/e-calendar-table.c:253
-msgid "Summary"
-msgstr "жzet"
-
-#: calendar/gui/e-calendar-table.c:254
-msgid "Transparency"
-msgstr "чeffaflЩk"
-
-#: calendar/gui/e-calendar-table.c:255
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:256
-msgid "Alarms"
-msgstr "UyarЩlar"
-
-#: calendar/gui/e-calendar-table.c:257
-msgid "Click here to add a task"
-msgstr "GЖrev eklemek buraya tЩklayЩn"
-
-#: calendar/gui/e-calendar-table.c:463
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "%0"
 
-#: calendar/gui/e-calendar-table.c:464
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "%10"
 
-#: calendar/gui/e-calendar-table.c:465
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "%20"
 
-#: calendar/gui/e-calendar-table.c:466
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "%30"
 
-#: calendar/gui/e-calendar-table.c:467
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "%40"
 
-#: calendar/gui/e-calendar-table.c:468
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "%50"
 
-#: calendar/gui/e-calendar-table.c:469
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "%60"
 
-#: calendar/gui/e-calendar-table.c:470
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "%70"
 
-#: calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "%80"
 
-#: calendar/gui/e-calendar-table.c:472
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "%90"
 
-#: calendar/gui/e-calendar-table.c:473
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "%100"
 
-#: calendar/gui/e-calendar-table.c:950
-msgid "Edit this task"
-msgstr "Bu gЖrevi dЭzenle"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "_AГ"
 
-#: calendar/gui/e-calendar-table.c:951 calendar/gui/e-calendar-table.c:961
-#: calendar/gui/e-day-view.c:3268 calendar/gui/e-week-view.c:3100
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-calendar.xml.h:10
-#: ui/evolution-mail-list.xml.h:4
-msgid "Cut"
-msgstr "Kes"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "_Kes"
 
-#: calendar/gui/e-calendar-table.c:952 calendar/gui/e-calendar-table.c:962
-#: calendar/gui/e-day-view.c:3270 calendar/gui/e-week-view.c:3102
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-calendar.xml.h:5
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:5
-msgid "Copy"
-msgstr "Kopyala"
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "_Kopyala"
 
-#: calendar/gui/e-calendar-table.c:953 calendar/gui/e-calendar-table.c:963
-#: calendar/gui/e-day-view.c:3243 calendar/gui/e-day-view.c:3272
-#: calendar/gui/e-week-view.c:3076 calendar/gui/e-week-view.c:3104
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:26
-#: ui/evolution-mail-list.xml.h:12
-msgid "Paste"
-msgstr "YapЩЧtЩr"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "_YapЩЧtЩr"
 
-#: calendar/gui/e-calendar-table.c:955
-msgid "Mark as complete"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
 msgstr "BitmiЧ olarak iЧaretle"
 
-#: calendar/gui/e-calendar-table.c:956
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Bu gЖrevi sil"
 
-#: calendar/gui/e-calendar-table.c:965
-msgid "Mark tasks as complete"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
 msgstr "GЖrevleri bitmiЧ olarak iЧaretle"
 
-#: calendar/gui/e-calendar-table.c:966 ui/evolution-tasks.xml.h:7
-msgid "Delete selected tasks"
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "SeГilen gЖrevleri sil"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:572 calendar/gui/e-week-view.c:306
-#: calendar/gui/print.c:785
-msgid "am"
-msgstr "ЖЖ"
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "GЖrev eklemek buraya tЩklayЩn"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:575 calendar/gui/e-week-view.c:309
-#: calendar/gui/print.c:787
-msgid "pm"
-msgstr "Жs"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "_Biten %:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "UyarЩlar"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategoriler"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+msgid "Complete"
+msgstr "TamamlandЩ"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "Tamamlanma Tarihi"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr "Tarihe gЖre:"
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "BitiЧ Tarihi"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "CoПrafi Konum"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "жncelik"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "BaЧlangЩГ Tarihi"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "жzet"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "GЖrev Listesi"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "чeffaflЩk"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i dakika bЖlmeleri"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1325
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1602
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%d %B %A"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1339
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr "%d %b %a"
-
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1352
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:3248 ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "ЖЖ"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "Жs"
+
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Yeni Randevu"
 
-#: calendar/gui/e-day-view.c:3250 calendar/gui/e-week-view.c:3083
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "Y_eni TЭm GЭn OlayЩ"
 
-#: calendar/gui/e-day-view.c:3255 calendar/gui/e-week-view.c:3088
-msgid "Go to Today"
-msgstr "BugЭne Git"
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
+msgid "Go to _Today"
+msgstr "_BugЭne Git"
 
-#: calendar/gui/e-day-view.c:3257 calendar/gui/e-week-view.c:3090
-msgid "Go to Date..."
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
+#, fuzzy
+msgid "_Go to Date..."
 msgstr "Tarihe Git..."
 
-#: calendar/gui/e-day-view.c:3264 calendar/gui/e-week-view.c:3096
-#: shell/e-shortcuts-view.c:463 ui/evolution-calendar.xml.h:24
-#: ui/evolution-message-composer.xml.h:12
-msgid "Open"
-msgstr "AГ"
-
-#: calendar/gui/e-day-view.c:3266 calendar/gui/e-week-view.c:3098
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Bu Randevuyu Sil"
 
-#: calendar/gui/e-day-view.c:3281 calendar/gui/e-week-view.c:3118
-msgid "Make this Occurrence Movable"
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
+#, fuzzy
+msgid "Make this Occurrence _Movable"
 msgstr "Bu OluЧumu TaЧЩnabilir Yap"
 
-#: calendar/gui/e-day-view.c:3283 calendar/gui/e-week-view.c:3120
-msgid "Delete this Occurrence"
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
+#, fuzzy
+msgid "Delete this _Occurrence"
 msgstr "Bu OluЧumu Sil"
 
-#: calendar/gui/e-day-view.c:3285
-msgid "Delete all Occurrences"
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
+#, fuzzy
+msgid "Delete _All Occurrences"
 msgstr "TЭm OluЧumlarЩ Sil"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i dakika bЖlmeleri"
-
-#: calendar/gui/e-itip-control.c:544 calendar/gui/print.c:2237
-msgid " to "
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:548 calendar/gui/print.c:2241
-msgid " (Completed "
-msgstr " (Tamamlanan "
-
-#: calendar/gui/e-itip-control.c:550 calendar/gui/print.c:2243
-msgid "Completed "
-msgstr "Tamamlanan "
-
-#: calendar/gui/e-itip-control.c:555 calendar/gui/print.c:2248
-msgid " (Due "
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:557 calendar/gui/print.c:2250
-msgid "Due "
-msgstr "Tarihe gЖre "
-
-#: calendar/gui/e-itip-control.c:611
+#: calendar/gui/e-itip-control.c:694
 msgid "This is an event that can be added to your calendar."
 msgstr "Bu takvime eklenebilen bir olaydЩr."
 
-#: calendar/gui/e-itip-control.c:614
+#: calendar/gui/e-itip-control.c:697
 msgid "This is a meeting request."
 msgstr "Bu bir toplantЩ isteПidir."
 
-#: calendar/gui/e-itip-control.c:617
+#: calendar/gui/e-itip-control.c:700
 msgid "This is one or more additions to a current meeting."
 msgstr "Bu Чimdiki toplantЩya bir ya da bir kaГ eklemedir."
 
-#: calendar/gui/e-itip-control.c:620
+#: calendar/gui/e-itip-control.c:703
 msgid "This is a request for the latest event information."
 msgstr "Bu, son olay bilgisi iГin bir istektir."
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:706
 msgid "This is a reply to a meeting request."
 msgstr "Bu, bir toplantЩ isteПine cevaptЩr."
 
-#: calendar/gui/e-itip-control.c:626
+#: calendar/gui/e-itip-control.c:709
 msgid "This is an event cancellation."
 msgstr "Bu bir olay iptalidir."
 
-#: calendar/gui/e-itip-control.c:629 calendar/gui/e-itip-control.c:668
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 msgid "The message is not understandable."
 msgstr "Bu ileti anlaЧЩlЩr deПil."
 
-#: calendar/gui/e-itip-control.c:653
+#: calendar/gui/e-itip-control.c:737
 msgid "This is an task that can be added to your calendar."
 msgstr "Bu, takvime eklenebilen bir gЖrevdir."
 
-#: calendar/gui/e-itip-control.c:656
+#: calendar/gui/e-itip-control.c:740
 msgid "This is a task request."
 msgstr "Bu bir gЖrev isteПidir."
 
-#: calendar/gui/e-itip-control.c:659
+#: calendar/gui/e-itip-control.c:743
 msgid "This is a request for the latest task information."
 msgstr "Bu, son gЖrev bilgisi iГin bir istektir."
 
-#: calendar/gui/e-itip-control.c:662
+#: calendar/gui/e-itip-control.c:746
 msgid "This is a reply to a task request."
 msgstr "Bu bir gЖrev isteПine cevaptЩr."
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:749
 msgid "This is an task cancellation."
 msgstr "Bu bir gЖrev iptalidir."
 
-#: calendar/gui/e-itip-control.c:687
+#: calendar/gui/e-itip-control.c:771
 msgid "This is freebusy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:690
+#: calendar/gui/e-itip-control.c:774
 msgid "This is a request for freebusy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:777
 msgid "This is a reply to a freebusy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:716
+#: calendar/gui/e-itip-control.c:834
 msgid "The message does not appear to be properly formed"
 msgstr "Bu iletinin biГimi dЭzgЭn deПil."
 
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:853
 msgid "The message contains only unsupported requests."
 msgstr "Bu iletide desteklenmeyen bilgiler var."
 
-#: calendar/gui/e-itip-control.c:751
+#: calendar/gui/e-itip-control.c:877
 msgid "The information contained in this attachment was not valid"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:989
 msgid "I couldn't update your calendar file!\n"
 msgstr "Takvim dosyanЩ gЭncelleyemedim!\n"
 
-#: calendar/gui/e-itip-control.c:892
+#: calendar/gui/e-itip-control.c:1015
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Bu ЖПe takvim dosyasЩndan silinemedi!\n"
 
@@ -2857,10 +3511,6 @@ msgstr "Takvim YЭkleniyor"
 msgid "Loading calendar..."
 msgstr "Takvim yЭkleniyor..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Kurum:"
-
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Sunucu MesajЩ:"
@@ -2873,98 +3523,48 @@ msgstr "bitiЧ-tarihi"
 msgid "date-start"
 msgstr "baЧlangЩГ-tarihi"
 
-#: calendar/gui/e-tasks.c:185 calendar/gui/e-tasks.c:522
-#: calendar/gui/e-tasks.c:555
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr "TЭmЭ"
 
-#: calendar/gui/e-tasks.c:191
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "Kategori:"
 
-#: calendar/gui/e-tasks.c:330
+#: calendar/gui/e-tasks.c:403
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "%s iГindeki gЖrevler yЭklenemedi."
 
-#: calendar/gui/e-tasks.c:342
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s' yЭklemek iГin gereken yЖntem desteklenmiyor"
 
-#: calendar/gui/e-week-view.c:3081 calendar/gui/e-week-view.c:3109
-msgid "New Appointment..."
-msgstr "Yeni Randevu..."
-
-#: calendar/gui/e-week-view.c:3122
-msgid "Delete All Occurrences"
-msgstr "TЭm OluЧumlarЩ Sil"
-
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1586
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/gnome-cal.c:216
-msgid "Summary contains"
-msgstr "жzet iГeriПi"
-
-#: calendar/gui/gnome-cal.c:217
-msgid "Description contains"
-msgstr "AГЩklama iГeriПi"
-
-#: calendar/gui/gnome-cal.c:218
-msgid "Comment contains"
-msgstr "Yorum iГeriПi"
-
-#: calendar/gui/gnome-cal.c:219
-msgid "Has category"
-msgstr "Kategori"
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
+#, fuzzy
+msgid "New _Appointment..."
+msgstr "Yeni Randevu..."
 
-#: calendar/gui/gnome-cal.c:1015
+#: calendar/gui/gnome-cal.c:999
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s' dizini aГЩlamadЩ."
 
-#: calendar/gui/gnome-cal.c:1026
+#: calendar/gui/gnome-cal.c:1010
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s' aГmak iГin gereken yЖntem desteklenmiyor"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr "Takvim gЖsteren Жrnek bir Bonobo denetleyici."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution takvim Жzet bileЧeni."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Evolution takvimi iTip/iMip gЖrЭntЭleyici"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr "Takvimi dЭzenleyen Evolution bileЧeni."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Factory for the Calendar Summary component."
-msgstr "Takvim Жzet bileЧen mimarisi."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "Evolution takvimi bileЧen mimarisi."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the calendar iTip view control"
-msgstr "Takvim iTip gЖrЭntЭ kontrolЭ mimarisi"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the sample Calendar control"
-msgstr "жrnek Takvim kontrolЭ mimarisi"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Nisan"
@@ -2986,245 +3586,255 @@ msgid "Go To Date"
 msgstr "Tarihe Git"
 
 #: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "BugЭne Git"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Ocak"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr "Temmuz"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr "Haziran"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "March"
 msgstr "Mart"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "May"
 msgstr "MayЩs"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr "KasЩm"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "October"
 msgstr "Ekim"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "EylЭl"
 
-#: calendar/gui/print.c:451
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "BugЭne Git"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:451
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "8."
 
-#: calendar/gui/print.c:452
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:453
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:454
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:455
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:456
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "39."
 
-#: calendar/gui/print.c:457
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Pz"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Pt"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Sa"
 
-#: calendar/gui/print.c:516
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "гa"
 
-#: calendar/gui/print.c:517
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Pe"
 
-#: calendar/gui/print.c:517
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Cu"
 
-#: calendar/gui/print.c:517
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "Ct"
 
-#: calendar/gui/print.c:1847 views/tasks/galview.xml.h:1
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "GЖrevler"
 
 #. Day
-#: calendar/gui/print.c:1954
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "GeГerli gЭn (%d %b %a %Y)"
 
-#: calendar/gui/print.c:1973 calendar/gui/print.c:1977
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%d %b %a"
 
-#: calendar/gui/print.c:1974
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%d %a %Y"
 
-#: calendar/gui/print.c:1985
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "GeГerli hafta (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1993
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "GeГerli ay (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:2000
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "GeГerli yЩl (%Y)"
 
-#: calendar/gui/print.c:2321
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Takvimi YazdЩr"
 
-#: calendar/gui/print.c:2409 calendar/gui/print.c:2501
-#: mail/mail-callbacks.c:1779 my-evolution/e-summary.c:449
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:31
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "жnizlemeyi YazdЩr"
 
-#: calendar/gui/print.c:2438
+#: calendar/gui/print.c:2317
 msgid "Print Item"
 msgstr "жПeyi YazdЩr"
 
-#: calendar/gui/print.c:2519
+#: calendar/gui/print.c:2398
 msgid "Print Setup"
 msgstr "YazdЩrma AyarlarЩ"
 
-#: calendar/gui/tasks-control.c:122
+#: calendar/gui/tasks-control.c:126
 msgid "The URI of the tasks folder to display"
 msgstr "GЖsterilecek gЖrevler dizininin URI'si"
 
@@ -3266,96 +3876,6 @@ msgstr "`%s' yЭklemek iГin gereken yЖntem desteklemiyor."
 msgid "SMTWTFS"
 msgstr "PPSгPCCP"
 
-#: calendar/pcs/query.c:218
-msgid "time-now expects 0 arguments"
-msgstr "time-now hiГ argЭman istemiyor"
-
-#: calendar/pcs/query.c:242
-msgid "make-time expects 1 argument"
-msgstr "make-time 1 argЭman istiyor"
-
-#: calendar/pcs/query.c:247
-msgid "make-time expects argument 1 to be a string"
-msgstr "make-time iГin birinci argЭman bir dizi olmalЩdЩr."
-
-#: calendar/pcs/query.c:255
-msgid "make-time argument 1 must be an ISO 8601 date/time string"
-msgstr "make-time 1. argЭmanЩ ISO 8601 tarih/saat bilgisi olmalЩdЩr"
-
-#: calendar/pcs/query.c:281
-msgid "time-add-day expects 2 arguments"
-msgstr "time-add-day 2 argЭman istiyor"
-
-#: calendar/pcs/query.c:286
-msgid "time-add-day expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:293
-msgid "time-add-day expects argument 2 to be an integer"
-msgstr "time-add-day 2. argЭmanЩ bir sayЩ istiyor"
-
-#: calendar/pcs/query.c:318
-msgid "time-day-begin expects 1 argument"
-msgstr "time-day-begin bir argЭman istiyor"
-
-#: calendar/pcs/query.c:323
-msgid "time-day-begin expects argument 1 to be a time_t"
-msgstr "time-day-begin birinci argЭmanЩ time_t biГiminde istiyor"
-
-#: calendar/pcs/query.c:348
-msgid "time-day-end expects 1 argument"
-msgstr "time-day-end bir argЭman istiyor"
-
-#: calendar/pcs/query.c:353
-msgid "time-day-end expects argument 1 to be a time_t"
-msgstr "time-day-end birinci argЭmanЩ time_t biГiminde istiyor"
-
-#: calendar/pcs/query.c:389
-msgid "get-vtype expects 0 arguments"
-msgstr "get-vtype hiГ argЭman istemiyor"
-
-#: calendar/pcs/query.c:472
-msgid "occur-in-time-range? expects 2 arguments"
-msgstr "ocrur-in-time-range? iki argЭman istiyor"
-
-#: calendar/pcs/query.c:477
-msgid "occur-in-time-range? expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:484
-msgid "occur-in-time-range? expects argument 2 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:611
-msgid "contains? expects 2 arguments"
-msgstr "contains? iki argЭman istiyor"
-
-#: calendar/pcs/query.c:616
-msgid "contains? expects argument 1 to be a string"
-msgstr "contains? birinci argЭmanЩ dizgi Чeklinde istiyor"
-
-#: calendar/pcs/query.c:623
-msgid "contains? expects argument 2 to be a string"
-msgstr "contains? ikinci argЭmanЩ dizgi Чeklinde istiyor"
-
-#: calendar/pcs/query.c:640
-msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
-"\""
-msgstr ""
-
-#: calendar/pcs/query.c:678
-msgid "has-categories? expects at least 1 argument"
-msgstr ""
-
-#: calendar/pcs/query.c:684
-msgid "has-categories? expects all arguments to be strings"
-msgstr "has-categories? tЭm argЭmanlarЩ dizgi Чeklinde istiyor"
-
-#: calendar/pcs/query.c:932
-msgid "Evaluation of the search expression did not yield a boolean value"
-msgstr ""
-
 #: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr "Bu Чifreleme ile imza desteklenmiyor"
@@ -3376,64 +3896,80 @@ msgstr "Bu Чifre ile Чifreleme desteklenmiyor"
 msgid "Decryption is not supported by this cipher"
 msgstr "Bu Чifreleme ile geriye dЖnЭk Чifreleme desteklenmiyor"
 
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
 #: camel/camel-disco-store.c:305
 msgid "You must be working online to complete this operation"
 msgstr "Bu iЧlemi bitirmek iГin щnternet baПlantЩsЩ saПlamalЩsЩnЩz"
 
-#: camel/camel-filter-driver.c:537 camel/camel-filter-driver.c:546
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 msgid "Syncing folders"
 msgstr "Dizinler eЧzamanlЩ hale getiriliyor"
 
-#: camel/camel-filter-driver.c:646
+#: camel/camel-filter-driver.c:644
 msgid "Unable to open spool folder"
 msgstr "Spool dizini aГЩlamadЩ"
 
-#: camel/camel-filter-driver.c:655
+#: camel/camel-filter-driver.c:653
 msgid "Unable to process spool folder"
 msgstr "Spool dizini iЧlenemedi"
 
-#: camel/camel-filter-driver.c:669
-#, c-format
+#: camel/camel-filter-driver.c:667
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%%%d) iletisi alЩnЩyor"
 
-#: camel/camel-filter-driver.c:673 camel/camel-filter-driver.c:683
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#, c-format
 msgid "Failed on message %d"
 msgstr "%d iletisinde hata"
 
-#: camel/camel-filter-driver.c:674
+#: camel/camel-filter-driver.c:672
 msgid "Cannot open message"
 msgstr "щleti aГЩlamadЩ"
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:805
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 msgid "Syncing folder"
 msgstr "Dizin eЧzamanlЩ hale getiriliyor"
 
-#: camel/camel-filter-driver.c:698 camel/camel-filter-driver.c:810
-msgid "Complete"
-msgstr "TamamlandЩ"
-
-#: camel/camel-filter-driver.c:764
+#: camel/camel-filter-driver.c:766
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d/%d ileti alЩnЩyor"
 
-#: camel/camel-filter-driver.c:769 camel/camel-filter-driver.c:787
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d/%d iletisinde hata"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:892
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "%s filtresini ayrЩЧtЩrЩrken hata oldu: %s"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:898
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "%s filtresini ГalЩЧtЩrЩrken hata oldu: %s"
 
-#: camel/camel-filter-search.c:437 camel/camel-filter-search.c:444
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "%s filtre taramasЩnЩ ГalЩЧtЩrЩrken hata oldu: %s"
@@ -3469,6 +4005,26 @@ msgstr "Bilinmeyen baЧlЩk Эzerinde arama yapЩlЩyor: %s"
 msgid "Invalid type in body-contains, expecting string"
 msgstr "GЖvde iГeriПinde geГersiz tЭr. Dizgi bekleniyordu"
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Boru yaratЩlamadЩ: %s"
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "%s Эzerinde dizin kilitlemesi yaratЩlamadЩ: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "гatallama yapЩlamadЩ: %s"
+
 #. well, this is really only a programatic error
 #: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
@@ -3492,108 +4048,108 @@ msgstr "fcntl(2) kullanЩlЩrken kilitleme hatasЩ: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2) kullanЩlЩrken kilitleme hatasЩ: %s"
 
-#: camel/camel-movemail.c:104
+#: camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "E-posta dosyasЩ %s denetlenemedi: %s"
 
-#: camel/camel-movemail.c:118
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "E-posta dosyasЩ %s aГЩlamadЩ: %s"
 
-#: camel/camel-movemail.c:126
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "GeГici e-posta dosyasЩ %s aГЩlamadЩ: %s"
 
-#: camel/camel-movemail.c:151
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "%s posta dosyasЩnЩ okurken hata oluЧtu"
-
-#: camel/camel-movemail.c:162
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "GeГici mektup dosyasЩna yazarken hata: %s"
-
-#: camel/camel-movemail.c:181
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "%s geГici mektup dosyasЩnЩ oluЧtururken hata: %s"
 
-#: camel/camel-movemail.c:211
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Boru yaratЩlamadЩ: %s"
 
-#: camel/camel-movemail.c:223
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "гatallama yapЩlamadЩ: %s"
 
-#: camel/camel-movemail.c:261
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail programЩnda hata: %s"
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Bilinmeyen hata)"
 
-#: camel/camel-movemail.c:492
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "%s posta dosyasЩnЩ okurken hata oluЧtu"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "GeГici mektup dosyasЩna yazarken hata: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "GeГici mektup dosyasЩna yazarken hata: %s"
 
-#: camel/camel-pgp-context.c:190
+#: camel/camel-pgp-context.c:193
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "%s parolasЩnЩ %s iГin parolayЩ girin"
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "%s parolasЩnЩ girin"
 
-#: camel/camel-pgp-context.c:511
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr "щmzalanacak metin yok."
 
-#: camel/camel-pgp-context.c:518 camel/camel-pgp-context.c:690
-#: camel/camel-pgp-context.c:1057 camel/camel-pgp-context.c:1269
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Parola verilmedi"
 
-#: camel/camel-pgp-context.c:524 camel/camel-pgp-context.c:696
-#: camel/camel-pgp-context.c:879 camel/camel-pgp-context.c:1064
-#: camel/camel-pgp-context.c:1276
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "GPG/PGP ile baПlantЩ kurulamadЩ: %s"
 
-#: camel/camel-pgp-context.c:683
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:873
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr "DoПrulanacak metin yok."
 
-#: camel/camel-pgp-context.c:890
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "%s geГici dosyasЩ yaratЩlamadЩ"
 
-#: camel/camel-pgp-context.c:1047
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr "чifrelenecek metin yok."
 
-#: camel/camel-pgp-context.c:1073
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr "AlЩcЩ belirtilmedi"
 
-#: camel/camel-pgp-context.c:1261
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr "AГЩlacak Чifre metni yok."
 
@@ -3627,7 +4183,7 @@ msgid "Connection cancelled"
 msgstr "BaПlantЩ iptal edildi"
 
 #: camel/camel-remote-store.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:270
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s adresine baПlantЩ kurulamadЩ (%d): %s"
@@ -3636,13 +4192,13 @@ msgstr "%s adresine baПlantЩ kurulamadЩ (%d): %s"
 msgid "(unknown host)"
 msgstr "(bilinmeyen makine)"
 
-#: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
-#: camel/camel-remote-store.c:470
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 msgid "Operation cancelled"
 msgstr "щЧlem iptal edildi"
 
-#: camel/camel-remote-store.c:476
+#: camel/camel-remote-store.c:489
 msgid "Server unexpectedly disconnected"
 msgstr "Sunucu beklenmedik bir Чekilde baПlantЩyЩ kesti"
 
@@ -3748,7 +4304,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:438
+#: camel/providers/imap/camel-imap-store.c:440
 msgid "Bad authentication response from server."
 msgstr "Sunucudan hatalЩ kimlik sЩnama yanЩtЩ."
 
@@ -3817,7 +4373,7 @@ msgstr "diПer bir dizin listesinden alЩnan iletileri okumak iГin"
 msgid "No provider available for protocol `%s'"
 msgstr "`%s' protokolЭ iГin alЩcЩ yok"
 
-#: camel/camel-session.c:479
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3827,6 +4383,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-smime-context.c:173
+#, c-format
 msgid "Please enter your password for %s"
 msgstr "%s iГin parolanЩzЩ girin"
 
@@ -3835,15 +4392,18 @@ msgid "Please indicate the nickname of a certificate to sign with."
 msgstr ""
 
 #: camel/camel-smime-context.c:209
+#, c-format
 msgid "The signature certificate for \"%s\" does not exist."
 msgstr "\"%s\" iГin imza sertifikasЩ bulunmuyor."
 
 #: camel/camel-smime-context.c:249
+#, c-format
 msgid "The encryption certificate for \"%s\" does not exist."
 msgstr "\"%s\" iГin Чifreleme sertifikasЩ bulunmuyor."
 
 #: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
 #: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, c-format
 msgid "Failed to find certificate for \"%s\"."
 msgstr "\"%s\" iГin sertifika bulunamadЩ."
 
@@ -3859,33 +4419,17 @@ msgstr "MesajЩn aГЩlmasЩnda hata."
 msgid "Failed to verify certificates."
 msgstr "Sertifika denetlenemedi."
 
-#. Fill in the new fields
-#: camel/camel-store.c:378 mail/mail-ops.c:1029 mail/mail-ops.c:1036
-#: mail/mail-ops.c:1054 mail/mail-ops.c:1055
-msgid "Trash"
-msgstr "гЖp"
-
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
-"E-posta: %s\n"
-"AdЩ: %s\n"
-"Kurum Birimi: %s\n"
-"Kurum: %s\n"
-"Yer: %s\n"
-"BЖlge: %s\n"
-"чehir: %s"
+"GЖnderen: %s\n"
+"Konu: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:428 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3900,26 +4444,36 @@ msgstr ""
 "\n"
 "Yine de kabul etmek istiyor musunuz?"
 
-#: camel/camel-tcp-stream-openssl.c:423
+#: camel/camel-tcp-stream-ssl.c:348
 #, c-format
 msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
 msgstr ""
-"GЖnderen: %s\n"
-"Konu: %s"
+"E-posta: %s\n"
+"AdЩ: %s\n"
+"Kurum Birimi: %s\n"
+"Kurum: %s\n"
+"Yer: %s\n"
+"BЖlge: %s\n"
+"чehir: %s"
 
 #: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL aГЩlamadЩ: %s"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Bu isimle bir ileti yok: %s (%s)"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:547
 #, c-format
 msgid "No such message: %s"
 msgstr "Bu isimle bir ileti yok: %s"
@@ -3928,67 +4482,75 @@ msgstr "Bu isimle bir ileti yok: %s"
 msgid "You cannot copy messages from this trash folder."
 msgstr "Bu ГЖp dizininden iletileri kopyalayamazsЩnЩz."
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
-msgid "Could not open cache directory: %s"
-msgstr "жnbellek dizini yaratЩlamadЩ: %s"
-
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP sunucusundan beklenmeyen cevap: %s"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP komutu baЧarЩsЩz oldu: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Bilinmeyen hata"
-
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr "Sunucu cevabЩ Гok erken bitti."
 
-#: camel/providers/imap/camel-imap-command.c:489
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP sunucu cevabЩ %s bilgisini iГermiyor"
 
-#: camel/providers/imap/camel-imap-command.c:526
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP sunucudan beklenmeyen cevap: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:192
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "%s dizini yaratЩlamadЩ: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s iГin Жzet bilgisi yЭklenemedi"
 
-#: camel/providers/imap/camel-imap-folder.c:270
+#: camel/providers/imap/camel-imap-folder.c:275
 msgid "Folder was destroyed and recreated on server."
 msgstr "Sunucudaki dizin silindi ve yeniden oluЧturuldu."
 
-#: camel/providers/imap/camel-imap-folder.c:425
-msgid "Scanning IMAP folder"
-msgstr "IMAP dizini taranЩyor"
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
+#, fuzzy
+msgid "Scanning for changed messages"
+msgstr "щletiler kaydediliyor"
 
-#: camel/providers/imap/camel-imap-folder.c:1463
-#: camel/providers/imap/camel-imap-folder.c:1716
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr "Bu ileti kullanЩlabilir deПil"
 
-#: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1749
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "щletiler kaydediliyor"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH cevabЩnda ileti gЖvdesi bulunamadЩ"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:16
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "жnbellek dizini yaratЩlamadЩ: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr "Yeni iletiler denetleniyor"
 
@@ -3996,7 +4558,7 @@ msgstr "Yeni iletiler denetleniyor"
 msgid "Check for new messages in all folders"
 msgstr "Yeni iletileri tЭm dizinlerde denetle"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:643
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Dizinler"
 
@@ -4030,28 +4592,28 @@ msgstr ""
 "Bu seГenek IMAP sunucusuna aГЩk metin parola kullanarak baПlantЩ kurulmasЩnЩ "
 "saПlar."
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "%s IMAP sunucusu %s kimlik sЩnama yЖntemini desteklemiyor"
 
-#: camel/providers/imap/camel-imap-store.c:471
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s kimlik sЩnama yЖntemi desteklenmiyor"
 
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sLЭtfen %s@%s iГin IMAP parolasЩnЩ giriniz"
 
-#: camel/providers/imap/camel-imap-store.c:510
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr "Bir parola girmediniz."
 
-#: camel/providers/imap/camel-imap-store.c:536
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4062,11 +4624,15 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:825 mail/mail-local.c:335
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, c-format
 msgid "No such folder %s"
 msgstr "Bu isimde bir dizin yok: `%s'"
 
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr ""
+
 #: camel/providers/local/camel-local-provider.c:40
 msgid "MH-format mail directories"
 msgstr "MH biГimli e-posta dizinleri"
@@ -4100,6 +4666,7 @@ msgid "For storing local mail in standard Unix spool directories"
 msgstr "щletileri Unix spool dizinleri halinde saklamak iГin"
 
 #: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s saklama dizininde hata"
@@ -4139,7 +4706,8 @@ msgstr "`%s' dizin Жzet dosyasЩ silinemedi: %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "`%s' dizin indeks dosyasЩ silinemedi: %s"
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr "щleti Жzete eklenemedi: bilinmeyen neden"
 
@@ -4155,6 +4723,7 @@ msgstr "%s dizinine ileti eklenemedi: %s"
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4166,6 +4735,7 @@ msgstr ""
 #: camel/providers/local/camel-maildir-folder.c:201
 #: camel/providers/local/camel-mbox-folder.c:322
 #: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 msgid "No such message"
 msgstr "щleti bulunmuyor"
 
@@ -4174,7 +4744,7 @@ msgstr "щleti bulunmuyor"
 msgid "Invalid message contents"
 msgstr "GeГersiz ileti iГeriПi"
 
-#: camel/providers/local/camel-maildir-store.c:101
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4184,14 +4754,14 @@ msgstr ""
 "Dizin aГЩlamadЩ: `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "%s dizini bulunamadЩ."
 
-#: camel/providers/local/camel-maildir-store.c:112
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4201,37 +4771,41 @@ msgstr ""
 "'%s dizini yaratЩlamadЩ:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:127
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' bir maildir dizini."
 
-#: camel/providers/local/camel-maildir-store.c:156
-#: camel/providers/local/camel-maildir-store.c:193
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "`%s' dizini silinemedi: %s"
 
-#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "maildir dizini deПil"
 
-#: camel/providers/local/camel-maildir-store.c:267
+#: camel/providers/local/camel-maildir-store.c:276
+#, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "'%s dizini taranamadЩ: %s"
 
 #: camel/providers/local/camel-maildir-summary.c:405
 #: camel/providers/local/camel-maildir-summary.c:526
+#, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Maildir dizini aГЩlamadЩ: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s Эzerinde dizin kilitlemesi yaratЩlamadЩ: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "%s posta kutusu aГЩlamadЩ: %s\n"
@@ -4244,6 +4818,9 @@ msgstr "щleti mbox dosyasЩna eklenemedi (%s): %s"
 #: camel/providers/local/camel-mbox-folder.c:338
 #: camel/providers/local/camel-mbox-folder.c:370
 #: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4253,10 +4830,12 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Dizin onarЩlamayacak Чekilde bozulmuЧ."
 
 #: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "щletiler dЭzenlenemiyor: щleti kutusu bozulmuЧ olabilir."
 
@@ -4302,36 +4881,45 @@ msgstr "`%s' dizini boЧ deПil. Silinmedi."
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
 #: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 msgid "Summarising folder"
 msgstr "Dizin Жzeti ГЩkartЩlЩyor"
 
 #: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "Dizin aГЩlamadЩ: %s: %ld konumundan itibaren Жzet ГЩkartЩlЩyor: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "%ld yakЩnЩnda e-posta ayrЩЧtЩrma hatasЩ (dizin: %s)"
 
 #: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Dizin Жzeti ГЩkartЩlamadЩ: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1613
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 msgid "Synchronising folder"
 msgstr "Dizin eЧzamanlЩ hale getiriliyor"
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "жzet iГin dizin aГЩlamadЩ: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "GeГici posta kutusu aГЩlamadЩ: %s"
@@ -4340,21 +4928,28 @@ msgstr "GeГici posta kutusu aГЩlamadЩ: %s"
 #: camel/providers/local/camel-mbox-summary.c:557
 #: camel/providers/local/camel-mbox-summary.c:746
 #: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "жzet ve dizin uyuЧmazlЩПЩ"
 
 #: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "GeГici posta kutusuna yazma hatasЩ: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "GeГici dosya kutusuna yazma iЧlemi baЧarЩsЩz: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:635
 #: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kaynak dizin %s aГЩlamadЩ: %s"
@@ -4369,7 +4964,9 @@ msgstr "geГici dizin kapatЩlamadЩ: %s"
 msgid "Could not rename folder: %s"
 msgstr "Dizinin adЩ deПiЧtirilemedi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Bilinmeyen hata: %s"
@@ -4385,42 +4982,97 @@ msgid "`%s' is not a directory."
 msgstr "`%s' bir dizin deПil."
 
 #: camel/providers/local/camel-mh-summary.c:218
+#, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH dizin yolu aГЩlamadЩ: %s: %s"
 
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "щleti mbox dosyasЩna eklenemedi (%s): %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "`%s' normal bir dosya deПildir."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "%s dizini bulunamadЩ."
+
+#: camel/providers/local/camel-spool-store.c:176
+#, fuzzy
+msgid "Spool stores do not have an inbox"
+msgstr "Yerel disklerde gelen dizini bulunmasЩn"
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Yerel mektup dosyasЩ %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "GeГici e-posta dosyasЩ %s aГЩlamadЩ: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "'%s dizini taranamadЩ: %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "%s@%s iГin NNTP parolasЩnЩ giriniz"
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "KullanЩcЩ adЩ sunucu tarafЩndan reddedildi"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "Sunucuya kullanЩcЩ adЩ gЖnderilemedi"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "Sunucu kullanЩcЩ adЩ ve parolasЩnЩ reddetti"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "%s iletisi bulunamadЩ."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "Sunucudan grup listesi alЩnamadЩ."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "%s iГin grup liste dosyasЩ alЩnamadЩ: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "%s iГin grup liste dosyasЩ kaydedilemedi: %s"
@@ -4433,17 +5085,17 @@ msgstr "USENET haber grubu"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "USENET haber gruplarЩndan ileti okuma ve gЖnderme iГin saПlayЩcЩ."
 
-#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Haber sunucusu iГin dizin aГЩlamadЩ: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s Эzerinden USENET"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4451,8 +5103,8 @@ msgstr ""
 "Bu seГenek NNTP sunucusuna aГЩk metin parola Эzerinden kimlik denetimi "
 "yaptЩrЩr."
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "%s iГin .newsrc dosyasЩ aГЩlamadЩ ya da oluЧturulamadЩ: %s"
@@ -4503,7 +5155,7 @@ msgstr "щletileri sunucuda bЩrak"
 msgid "Delete after %s day(s)"
 msgstr "%s gЭnden sonra sil"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:60
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4592,7 +5244,7 @@ msgid "No such folder `%s'."
 msgstr "Bu isimde bir dizin yok: `%s'"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4644,7 +5296,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Sendmail Эzerinden ileti gЖnderimi"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:72
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -4652,122 +5304,122 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "SMTP Эzerinden bir sunucuya baПlanЩp e-postalarЩnЩzЩ gЖndermek iГin.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "щmla hatasЩ, bilinmeyen komut"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "Parametre ya da argЭmanlarda imla hatasЩ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Komut henЭz tanЩnmЩyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "Komut parametresi henЭz tanЩnmЩyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr "Sistem durumu, ya da sistem yardЩm yanЩtЩ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "YardЩm mesajЩ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Servis hazЩr"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr "Servis iletiЧim kanalЩnЩ kapatЩyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr "Servis uygun deПil, iletiЧim kanalЩ kapatЩlЩyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr "щstenen ileti iЧlemi tamamlandЩ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr "KullanЩcЩ yerel deПil, <forward-path> Эzerine yЖnlendirilecek"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "щstenen ileti eylemi yapЩlmadЩ: posta kutusu bulunamadЩ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "щstenen eylem yapЩlmadЩ: posta kutusu bulunamadЩ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr "щstenen eylem iptal edildi: iЧlem sЩrasЩnda hata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr "KullanЩcЩ yerel deПil; lЭtfen <forward-path> deneyin"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr "щstenen eylem yapЩlmadЩ: disk alanЩ yetersiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "щstenen eylem iptal edildi: disk alanЩ yetersiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "щstenen eylem yapЩlmadЩ: e-posta kutusu izni yok"
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "щleti baЧlangЩcЩnЩ girin, <CRLF>.<CRLF> ile bitirin."
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "щletiЧim kurulamadЩ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr "Parola iletimi gerekiyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "Kimlik sЩnama yЖntemi Гok zayЩf"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr "щstenen kimlik sЩnama yЖntemi iГin Чifreleme gerekiyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "GeГici kimlik denetim hatasЩ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "Kimlik denetimi isteniyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:314
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "GiriЧ hatasЩ: %s: Жnemsiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:357
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "%s SMTP sunucusu %s kimlik sЩnama yЖntemini desteklemiyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:396
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sLЭtfen %s@%s iГin SMTP parolasЩnЩ giriniz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:419
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4778,113 +5430,127 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:535
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP sunucu %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:537
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s Эzerinden STMP ileti gЖnderimi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:562
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr "щleti gЖnderilemiyor: gЖnderen adresi tanЩmlЩ deПil."
 
-#: camel/providers/smtp/camel-smtp-transport.c:569
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr "щleti gЖnderilemiyor: gЖnderen adresi geГersiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:583
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+msgid "Sending message"
+msgstr "щleti gЖnderiliyor"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "MAIL FROM cevap hatasЩ: %s: ileti gЖnderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:677
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, fuzzy
+msgid "SMTP Greeting"
+msgstr "ToplantЩ"
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO zaman aЧЩmЩ: %s: ileti gЖnderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO cevap hatasЩ: %s: ileti gЖnderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:729
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr "SASL kimlik denetim nesnesi yaratЩlamadЩ."
 
-#: camel/providers/smtp/camel-smtp-transport.c:744
-#: camel/providers/smtp/camel-smtp-transport.c:756
+#: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Kimlik Denetimi"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH isteПi zaman aЧЩmЩna uПradЩ: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:765
+#: camel/providers/smtp/camel-smtp-transport.c:782
 msgid "AUTH request failed."
 msgstr "AUTH isteПi baЧarЩsЩz."
 
-#: camel/providers/smtp/camel-smtp-transport.c:810
+#: camel/providers/smtp/camel-smtp-transport.c:829
 msgid "Bad authentication response from server.\n"
 msgstr "Sunucudan hatalЩ kimlik sЩnama yanЩtЩ.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:836
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM zaman aЧЩmЩ: %s: ileti gЖnderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:855
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "MAIL FROM cevap hatasЩ: %s: ileti gЖnderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO zaman aЧЩmЩ: %s: ileti gЖnderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:899
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "RCPT TO cevap hatasЩ: %s: ileti gЖnderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA isteПi zaman aЧЩmЩna uПradЩ: %s: ileti gЖnderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "DATA cevap hatasЩ: %s: ileti gЖnderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:966
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "DATA gЖnderimi zaman aЧЩmЩna uПradЩ: %s: ileti gЖnderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1003
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "DATA cevap hatasЩ: %s: ileti gЖnderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1027
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET isteПi zaman aЧЩmЩna uПradЩ: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1046
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, c-format
 msgid "RSET response error: %s"
 msgstr "RSET cevap hatasЩ: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT isteПi zaman aЧЩmЩna uПradЩ: %s: Жnemsiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "QUIT cevap hatasЩ: %s: Жnemsiz"
@@ -4914,7 +5580,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:126
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "ek"
 
@@ -4943,10 +5609,70 @@ msgid "MIME type:"
 msgstr "MIME tЭrЭ:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
 msgid "Suggest automatic display of attachment"
 msgstr "Eklentinin otomatik gЖsterimini Жner"
 
-#: composer/e-msg-composer.c:651
+#: composer/e-msg-composer-hdrs.c:328
+msgid "Click here for the address book"
+msgstr "Adres defteri iГin buraya tЩklayЩn"
+
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:359
+msgid "From:"
+msgstr "GЖnderen:"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:365
+msgid "Reply-To:"
+msgstr "Cevapla:"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:376
+msgid "Subject:"
+msgstr "Konu:"
+
+#: composer/e-msg-composer-hdrs.c:390
+msgid "To:"
+msgstr "AlЩcЩ:"
+
+#: composer/e-msg-composer-hdrs.c:391
+msgid "Enter the recipients of the message"
+msgstr "щletinin gЖnderildiПi kiЧiler"
+
+#: composer/e-msg-composer-hdrs.c:394
+msgid "Cc:"
+msgstr "Bilgi:"
+
+#: composer/e-msg-composer-hdrs.c:395
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "щletinin kopyasЩnЩn gЖnderilecek olunduПu adresler"
+
+#: composer/e-msg-composer-hdrs.c:398
+msgid "Bcc:"
+msgstr "Gizli:"
+
+#: composer/e-msg-composer-hdrs.c:399
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"щletinin karbon kopyalarЩnЩn gЖnderileceПi adresi girin. Ancak buraya "
+"girilecek kiЧiler gЖnderilenler listesinde gЖrЭnmeyecektir."
+
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Bir dosya ekle"
+
+#: composer/e-msg-composer.c:670
+#, c-format
 msgid ""
 "Could not open file %s:\n"
 "%s"
@@ -4954,28 +5680,39 @@ msgstr ""
 "%s dosyasЩ aГЩlamadЩ:\n"
 "%s"
 
-#: composer/e-msg-composer.c:664
+#: composer/e-msg-composer.c:683
+#, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
-msgstr "%s dosyasЩnЩ yЭklerken hata oldu:\n"
+msgstr ""
+"%s dosyasЩnЩ yЭklerken hata oldu:\n"
 "%s"
 
-#: composer/e-msg-composer.c:854
+#: composer/e-msg-composer.c:873
 msgid "Save as..."
 msgstr "FarklЩ kaydet..."
 
-#: composer/e-msg-composer.c:865
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "UyarЩ"
+
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
+msgstr ""
+
+#: composer/e-msg-composer.c:906
 #, c-format
 msgid "Error saving file: %s"
 msgstr "%s dosyasЩnЩ kaydederken hata oldu"
 
-#: composer/e-msg-composer.c:885
+#: composer/e-msg-composer.c:926
 #, c-format
 msgid "Error loading file: %s"
 msgstr "`%s' dosyasЩnЩ yЭklerken hata oldu"
 
-#: composer/e-msg-composer.c:957
+#: composer/e-msg-composer.c:997
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -4983,12 +5720,53 @@ msgstr ""
 "Bu hesap iГin taslak dizini aГЩlamadЩ.\n"
 "жntanЩmlЩ taslak dizinini kullanmak istiyor musunuz?"
 
-#: composer/e-msg-composer.c:1023 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:231
-msgid "Evolution"
-msgstr "Evolution"
+#: composer/e-msg-composer.c:1047
+#, fuzzy, c-format
+msgid "Error accessing file: %s"
+msgstr "%s dosyasЩnЩ kaydederken hata oldu"
+
+#: composer/e-msg-composer.c:1055
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "%s POP sunucusundan iletileri alamadЩm: %s"
+
+#: composer/e-msg-composer.c:1061
+#, fuzzy, c-format
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr ""
+"гЩkЩЧ dosyasЩ yaratЩlamadЩ: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1067
+#, fuzzy, c-format
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr ""
+"гЩkЩЧ dosyasЩ yaratЩlamadЩ: %s\n"
+" %s"
+
+#: composer/e-msg-composer.c:1076
+#, fuzzy, c-format
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr ""
+"щletilerin kaydЩnda hata: %s:\n"
+" %s"
+
+#: composer/e-msg-composer.c:1173
+#, fuzzy
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
+msgstr ""
+"Evolution, Pine e-posta dosyalarЩ buldu.\n"
+"BunlarЩn Evolution'a aktarЩlmasЩnЩ istiyor musunuz?"
 
-#: composer/e-msg-composer.c:1029
+#: composer/e-msg-composer.c:1321
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4997,75 +5775,27 @@ msgstr ""
 "Bu ileti gЖnderilmedi.\n"
 "DeПiЧiklikleri kaydetmek istiyor musunuz?"
 
-#: composer/e-msg-composer.c:1054
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
 msgid "Open file"
 msgstr "DosyayЩ aГ"
 
-#: composer/e-msg-composer.c:1204
+#: composer/e-msg-composer.c:1500
 msgid "Insert File"
 msgstr "Dosya _Ekle"
 
-#: composer/e-msg-composer.c:1539 composer/e-msg-composer.c:1928
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
 msgid "Compose a message"
 msgstr "Bir ileti yaz"
 
-#: composer/e-msg-composer.c:2022
+#: composer/e-msg-composer.c:2351
 msgid "Could not create composer window."
 msgstr "Mektup gЖnderme penceresi aГЩlamadЩ."
 
-#: composer/e-msg-composer-hdrs.c:325
-msgid "Click here for the address book"
-msgstr "Adres defteri iГin buraya tЩklayЩn"
-
-#.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:356
-msgid "From:"
-msgstr "GЖnderen:"
-
-#.
-#. * Reply-To:
-#.
-#: composer/e-msg-composer-hdrs.c:362
-msgid "Reply-To:"
-msgstr "Cevapla:"
-
-#.
-#. * Subject:
-#.
-#: composer/e-msg-composer-hdrs.c:373
-msgid "Subject:"
-msgstr "Konu:"
-
-#: composer/e-msg-composer-hdrs.c:387
-msgid "To:"
-msgstr "AlЩcЩ:"
-
-#: composer/e-msg-composer-hdrs.c:388
-msgid "Enter the recipients of the message"
-msgstr "щletinin gЖnderildiПi kiЧiler"
-
-#: composer/e-msg-composer-hdrs.c:391
-msgid "Cc:"
-msgstr "Bilgi:"
-
-#: composer/e-msg-composer-hdrs.c:392
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "щletinin kopyasЩnЩn gЖnderilecek olunduПu adresler"
-
-#: composer/e-msg-composer-hdrs.c:395
-msgid "Bcc:"
-msgstr "Gizli:"
-
-#: composer/e-msg-composer-hdrs.c:396
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"щletinin karbon kopyalarЩnЩn gЖnderileceПi adresi girin. Ancak buraya "
-"girilecek kiЧiler gЖnderilenler listesinde gЖrЭnmeyecektir."
-
 #: composer/evolution-composer.c:359
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -5091,40 +5821,56 @@ msgid "calendar information"
 msgstr "takvim bilgisi"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:64 e-util/e-time-utils.c:106
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
+#: widgets/misc/e-dateedit.c:1480
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:77 e-util/e-time-utils.c:187
-#: e-util/e-time-utils.c:312
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:80 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:304
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:83 e-util/e-time-utils.c:194
-#: e-util/e-time-utils.c:309 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
-#: e-util/e-time-utils.c:301 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
 msgid "%H:%M"
 msgstr "%H:%M"
 
+#: e-util/e-time-utils.c:240
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%d %b %Y %a"
+
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
+
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:258
+#: e-util/e-time-utils.c:298
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 msgid "%a %m/%d/%Y"
@@ -5132,77 +5878,65 @@ msgstr "%d %b %Y %a"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:263
+#: e-util/e-time-utils.c:303
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%d/%m/%Y %a %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:272
+#: e-util/e-time-utils.c:312
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "yЩl"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 msgid "years"
 msgstr "yЩl"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "ay"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "months"
 msgstr "ay"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "hafta"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "hafta"
 
-#: filter/filter-datespec.c:81
-msgid "days"
-msgstr "gЭn"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "saat"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr "saat"
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "dakika"
 
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr "dakika"
-
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "saniye"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "seconds"
 msgstr "saniye"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Bir tarih seГmeyi unuttunuz."
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr "HatalЩ tarih giriЧi yaptЩnЩz."
 
-#: filter/filter-datespec.c:276
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -5212,7 +5946,7 @@ msgstr ""
 "ya da vfolder'Щn aГЩldЩПЩ tarih ile\n"
 "karЧЩlaЧtЩrЩlacaktЩr."
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -5220,7 +5954,7 @@ msgstr ""
 "щletinin tarihi burada belirttiПiniz\n"
 "tarih ile karЧЩlaЧtЩrЩlacaktЩr."
 
-#: filter/filter-datespec.c:339
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5231,28 +5965,36 @@ msgstr ""
 "Жrnek olarak \"bir hafta Жnce\"."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "Чimdiki zaman"
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "belirttiПiniz zaman"
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "Чimdiki zamana gЖreceli bir zaman"
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "KarЧЩlaЧtЩr"
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "Чimdi"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<bir tarih seГmek iГin tЩklayЩnЩz>"
 
@@ -5277,8 +6019,8 @@ msgstr ""
 "Bir dizin seГmeyi unuttunuz.\n"
 "LЭtfen geriye gidip geГerli bir dizin seГin."
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:292
-#: mail/mail-account-gui.c:701
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Dizini SeГin"
 
@@ -5290,46 +6032,6 @@ msgstr "Dizin URI girin"
 msgid "<click here to select a folder>"
 msgstr "<bir dizin seГmek iГin tЩklayЩn>"
 
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "Filtreleri DЭzenle"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "VFolder DЭzenle"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "Gelen"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "Giden"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr "Sanal Dizinler"
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr "sadece belirtilen dizinler"
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr "vFolder KaynaklarЩ"
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr "tЭm etkin uzak dizinlerle birlikte"
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr "tЭm yerel ve etkin uzak dizinlerle birlikte"
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr "tЭm yerel dizinlerle birlikte"
-
 #: filter/filter-input.c:193
 #, c-format
 msgid ""
@@ -5351,36 +6053,88 @@ msgstr "Kural adЩ:"
 msgid "Untitled"
 msgstr "щsimsiz"
 
-#: filter/filter-rule.c:646
+#: filter/filter-rule.c:648
 msgid "If"
 msgstr "EПer"
 
-#: filter/filter-rule.c:664
+#: filter/filter-rule.c:666
 msgid "Execute actions"
 msgstr "Eylemleri iЧlet"
 
-#: filter/filter-rule.c:668
+#: filter/filter-rule.c:670
 msgid "if all criteria are met"
 msgstr "tЭm kriterler saПlanЩrsa"
 
-#: filter/filter-rule.c:673
+#: filter/filter-rule.c:675
 msgid "if any criteria are met"
 msgstr "herhangi bir kriter saПlanЩrsa"
 
-#: filter/filter-rule.c:684
+#: filter/filter-rule.c:686
 msgid "Add criterion"
 msgstr "SЩnЩf ekle"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "incoming"
 msgstr "gelen"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:771
 msgid "outgoing"
 msgstr "giden"
 
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Ekle"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "DЭzenle"
+
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Filtreleri DЭzenle"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "VFolder DЭzenle"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "Gelen"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "Giden"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr "Sanal Dizinler"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr "sadece belirtilen dizinler"
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "vFolder KaynaklarЩ"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "tЭm etkin uzak dizinlerle birlikte"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "tЭm yerel ve etkin uzak dizinlerle birlikte"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "tЭm yerel dizinlerle birlikte"
+
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
+#, fuzzy
+msgid "Assign Color"
 msgstr "Renk Belirt"
 
 #: filter/libfilter-i18n.h:4
@@ -5456,90 +6210,91 @@ msgid "Expression"
 msgstr "Deyim"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "Adrese YЖnlendir"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "жnemli"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr " "
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "bЭyЭk"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "kЭГЭk"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr "deПil"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "E-posta listesi"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "щleti GЖvdesi"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "щleti BaЧlЩПЩ"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "щleti alЩndЩ"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "щleti gЖnderildi"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Dizine TaЧЩ"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 msgid "on or after"
 msgstr "birlikte ya da sonra"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr "birlikte ya da Жnce"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Oku"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "AlЩcЩlar"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "DЭzgЭn Deyim EЧleЧimi"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Cevaplanan"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:6
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Puan"
 
-#: filter/libfilter-i18n.h:43 mail/mail-callbacks.c:1047
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "GЖnderen"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Durum belirt"
 
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Boyut"
+
 #: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "benzer"
@@ -5556,15 +6311,11 @@ msgstr "жzel baЧlЩk"
 msgid "starts with"
 msgstr "baЧlayan"
 
-#: filter/libfilter-i18n.h:49 mail/message-list.etspec.h:8
-msgid "Status"
-msgstr "Durum"
-
 #: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "щЧlemeyi Durdur"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:776
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Konu"
@@ -5593,29 +6344,23 @@ msgstr "GЖrev DЭzenle"
 msgid "Score Rules"
 msgstr "Puan KurallarЩ"
 
-#: importers/elm-importer.c:512 importers/evolution-gnomecard-importer.c:238
-#: importers/netscape-importer.c:780 importers/pine-importer.c:646
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
 #: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
 #: shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Aktar"
 
-#: importers/elm-importer.c:517 importers/netscape-importer.c:785
-#: importers/pine-importer.c:651
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
 msgid "Mail"
 msgstr "щleti"
 
-#: importers/elm-importer.c:521
-msgid "Elm Aliases"
-msgstr "Elm Takma щsimleri"
-
-#: importers/elm-importer.c:528 importers/evolution-gnomecard-importer.c:250
-#: importers/netscape-importer.c:807 importers/pine-importer.c:668
-#: shell/importer/intelligent.c:199
-msgid "Don't ask me again"
-msgstr "Tekrar sorma"
-
-#: importers/elm-importer.c:561
+#: importers/elm-importer.c:498
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -5623,15 +6368,15 @@ msgstr ""
 "Evolution, Elm ileti dosyalarЩ buldu.\n"
 "BunlarЩ Evolution'a aktarmak ister misiniz?"
 
-#: importers/elm-importer.c:579
+#: importers/elm-importer.c:527
 msgid "Elm mail"
 msgstr "Elm iletisi"
 
-#: importers/evolution-gnomecard-importer.c:243 importers/pine-importer.c:661
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
 msgid "Addressbook"
 msgstr "Adres Defteri"
 
-#: importers/evolution-gnomecard-importer.c:275
+#: importers/evolution-gnomecard-importer.c:253
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5639,19 +6384,11 @@ msgstr ""
 "Evolution, GnomeCard dosyalarЩ buldu.\n"
 "BunlarЩn Evolution'a aktarЩlmasЩnЩ istiyor musunuz?"
 
-#: importers/netscape-importer.c:790 importers/pine-importer.c:656
+#: importers/netscape-importer.c:824
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: importers/netscape-importer.c:795 mail/mail-callbacks.c:1691
-msgid "Filters"
-msgstr "Filtreler"
-
-#: importers/netscape-importer.c:800
-msgid "Addressbooks"
-msgstr "Adres Defterleri"
-
-#: importers/netscape-importer.c:847
+#: importers/netscape-importer.c:849
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -5659,7 +6396,7 @@ msgstr ""
 "Evolution, Netscape e-posta dosyalarЩ buldu.\n"
 "BunlarЩn Evolution'a aktarЩlmasЩnЩ istiyor musunuz?"
 
-#: importers/pine-importer.c:705
+#: importers/pine-importer.c:663
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -5667,182 +6404,207 @@ msgstr ""
 "Evolution, Pine e-posta dosyalarЩ buldu.\n"
 "BunlarЩn Evolution'a aktarЩlmasЩnЩ istiyor musunuz?"
 
-#: importers/pine-importer.c:723
+#: importers/pine-importer.c:691
 msgid "Pine mail"
 msgstr "Pine iletisi"
 
-#: mail/component-factory.c:651
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "E-posta alma va gЖnderme iГin Evolution bileЧeni"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr "Evolution e-posta programЩ."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr "Evolution e-posta Жzet bileЧeni."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr "Evolution e-posta dizin gЖrЭntЭleme bileЧeni."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr "Evolution e-posta dizin bileЧeni"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid "Factory for the Evolution composer."
+msgstr "Evolution e-posta programЩ mimarisi."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Factory for the Evolution mail component."
+msgstr "Evolution e-posta bileЧen mimarisi."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr "E-posta Жzet bileЧen mimarisi"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+msgid "Mail configuration interface"
+msgstr "щleti yapЩlandЩrma arayЭzЭ"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "ж_zellikler..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Bu dizinin Жzelliklerini deПiЧtir"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution'Щn posta programЩ baЧlatЩlamadЩ."
 
-#: mail/component-factory.c:785
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr "Depo kabuПa kayЩt ettirilemedi"
 
-#: mail/folder-browser.c:808
+#: mail/folder-browser-ui.c:254
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "\"%s\" Жzellikleri"
+
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr "жzellikler"
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "GeГici dizin yaratЩlamadЩ: %s"
+
+#: mail/folder-browser.c:893
 msgid "Store search as vFolder"
 msgstr "KaydЩ vFolder olarak kaydet"
 
-#: mail/folder-browser.c:1151
+#: mail/folder-browser.c:1238
 msgid "VFolder on _Subject"
 msgstr "_Konuya GЖre VFolder"
 
-#: mail/folder-browser.c:1154
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "_GЖnderene GЖre VFolder"
 
-#: mail/folder-browser.c:1157
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "_AlЩcЩlara GЖre VFolder"
 
-#: mail/folder-browser.c:1160
+#: mail/folder-browser.c:1247
 msgid "VFolder on Mailing _List"
 msgstr "_E-posta Listesi эzerinde VFolder"
 
-#: mail/folder-browser.c:1166
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "_Konuya GЖre Filtrele"
 
-#: mail/folder-browser.c:1169
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "_GЖnderene GЖre Filtrele"
 
-#: mail/folder-browser.c:1172
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "_AlЩcЩlara GЖre Filtrele"
 
-#: mail/folder-browser.c:1175
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "_E-posta Listelerine GЖre Filtrele"
 
-#: mail/folder-browser.c:1184
-msgid "_Open"
-msgstr "_AГ"
-
-#: mail/folder-browser.c:1186
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr "Yeniden GЖnder"
 
-#: mail/folder-browser.c:1188 ui/evolution-calendar.xml.h:52
-#: ui/evolution-mail-message.xml.h:84 ui/evolution-tasks.xml.h:17
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "_FarklЩ Kaydet..."
 
-#: mail/folder-browser.c:1190 ui/evolution-tasks.xml.h:16
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "_YazdЩr"
 
-#: mail/folder-browser.c:1195 ui/evolution-mail-message.xml.h:83
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 msgid "_Reply to Sender"
 msgstr "_GЖnderene Cevapla"
 
-#: mail/folder-browser.c:1197 ui/evolution-mail-message.xml.h:59
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
 msgid "Reply to _List"
 msgstr "_Listeye Cevapla"
 
-#: mail/folder-browser.c:1199 ui/evolution-mail-message.xml.h:58
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "_TЭmЭne Cevapla"
 
-#: mail/folder-browser.c:1201
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "_YЖnlendir"
 
-#: mail/folder-browser.c:1204
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "_OkunmuЧ Olarak щЧaretle"
 
-#: mail/folder-browser.c:1206
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Oku_nmamЩЧ Olarak щЧaretle"
 
-#: mail/folder-browser.c:1211
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "жnemli"
+
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Oku_nmamЩЧ Olarak щЧaretle"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "_Dizine TaЧЩ..."
 
-#: mail/folder-browser.c:1213
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "D_izine Kopyala..."
 
-#: mail/folder-browser.c:1217 ui/evolution-mail-message.xml.h:85
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "_Silme"
 
-#: mail/folder-browser.c:1222
+#: mail/folder-browser.c:1313
 msgid "Add Sender to Address Book"
 msgstr "GЖndereni Adres Defterine Ekle"
 
-#: mail/folder-browser.c:1227
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Filtreleri Uygula"
 
-#: mail/folder-browser.c:1231
+#: mail/folder-browser.c:1322
 msgid "Create Ru_le From Message"
 msgstr "щletiden Bir Kural Yarat"
 
-#: mail/folder-browser.c:1370
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "E-posta Listelerine GЖre Filtreleme"
 
-#: mail/folder-browser.c:1371
+#: mail/folder-browser.c:1480
 msgid "VFolder on Mailing List"
 msgstr "E-posta Listesi эzerinde VFolder"
 
-#: mail/folder-browser.c:1373
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "E-posta Listesine Filtre (%s)"
 
-#: mail/folder-browser.c:1374
+#: mail/folder-browser.c:1483
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "E-posta Listesi эzerinde VFolder (%s)"
 
-#: mail/folder-browser-ui.c:252
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "\"%s\" Жzellikleri"
-
-#: mail/folder-browser-ui.c:254
-msgid "Properties"
-msgstr "жzellikler"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr "E-posta alma va gЖnderme iГin Evolution bileЧeni"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
-msgstr "Evolution e-posta programЩ."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
-msgstr "Evolution e-posta Жzet bileЧeni."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
-msgstr "Evolution e-posta dizin gЖrЭntЭleme bileЧeni."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
-msgstr "Evolution e-posta dizin bileЧeni"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
-msgstr "Evolution e-posta programЩ mimarisi."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Evolution e-posta bileЧen mimarisi."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Factory for the Mail Summary component."
-msgstr "E-posta Жzet bileЧen mimarisi"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
-msgid "Mail configuration interface"
-msgstr "щleti yapЩlandЩrma arayЭzЭ"
-
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr "Mbox dosyalarЩnЩ Evolution'a aktarЩm mimarisi"
@@ -5893,20 +6655,26 @@ msgstr "pkutusu"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
 msgid "You have not filled in all of the required information."
 msgstr "Gerekli tЭm bilgiler verilmedi."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:154
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "Evolution Hesap DЭzenleyici"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Evolution Hesap DЭzenleyici"
 
-#: mail/mail-account-gui.c:891
+#: mail/mail-account-gui.c:971
 msgid "Save signature"
 msgstr "щmzayЩ kaydet"
 
-#: mail/mail-account-gui.c:897
+#: mail/mail-account-gui.c:977
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -5916,28 +6684,38 @@ msgstr ""
 "\n"
 "DeПiЧiklikleri kaydetmek istiyor musunuz?"
 
-#: mail/mail-accounts.c:126 mail/mail-accounts.c:177
+#: mail/mail-accounts.c:135
 msgid " (default)"
 msgstr " (ЖntanЩmlЩ)"
 
-#: mail/mail-accounts.c:209
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr "Kapat"
 
-#: mail/mail-accounts.c:211 mail/mail-config.glade.h:36
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr "EtkinleЧtir"
 
-#: mail/mail-accounts.c:299 mail/mail-accounts.c:303
+#: mail/mail-accounts.c:264
 msgid "Are you sure you want to delete this account?"
 msgstr "GerГekten bu hesabЩ silmek istiyor musunuz?"
 
-#: mail/mail-accounts.c:463 mail/mail-accounts.c:467
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "Sil"
+
+#: mail/mail-accounts.c:271
+#, fuzzy
+msgid "Really delete account?"
+msgstr "Bunu ЖntanЩmlЩ hesabЩm yap"
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr "GerГekten bu haber grubu hesabЩnЩ silmek istiyor musunuz?"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:650
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr "Evolution Hesap YЖneticisi"
 
@@ -5965,7 +6743,7 @@ msgstr "%s posta listesi"
 msgid "Add Filter Rule"
 msgstr "Filtre KuralЩ Ekle"
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:96
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5977,7 +6755,7 @@ msgstr ""
 "Жnce yapmanЩz gerekiyor.\n"
 "чimdi yapЩlandЩrmak istiyor musunuz?"
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:149
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5985,7 +6763,7 @@ msgstr ""
 "щleti gЖndermeden Жnce kendinize\n"
 "ait bir kimlik oluЧturmalЩsЩnЩz."
 
-#: mail/mail-callbacks.c:160
+#: mail/mail-callbacks.c:161
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5993,11 +6771,11 @@ msgstr ""
 "щleti gЖndermeden Жnce bir posta\n"
 "iletim ayarЩ yapmalЩsЩnЩz."
 
-#: mail/mail-callbacks.c:204
+#: mail/mail-callbacks.c:205
 msgid "You have not set a mail transport method"
 msgstr "Posta iletim yЖntemi dЭzenlenmemiЧ"
 
-#: mail/mail-callbacks.c:237
+#: mail/mail-callbacks.c:238
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -6005,7 +6783,7 @@ msgstr ""
 "Bu iletinin konusu yok.\n"
 "Yine de gЖnderilsin mi?"
 
-#: mail/mail-callbacks.c:272
+#: mail/mail-callbacks.c:273
 msgid ""
 "This message contains only Bcc recipients.\n"
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -6013,40 +6791,41 @@ msgid ""
 "Send anyway?"
 msgstr ""
 "Bu ileti sadece gizli alЩcЩ iГeriyor. \n"
-"E-posta sunucusu tЭm alЩcЩlarЩ Apparently-to baЧlЩПЩ ekleyerek gЖrЭnЭr "
-"hale getirebilir.\n"
+"E-posta sunucusu tЭm alЩcЩlarЩ Apparently-to baЧlЩПЩ ekleyerek gЖrЭnЭr hale "
+"getirebilir.\n"
 "Yine de gЖndereyim mi?"
 
-
-#: mail/mail-callbacks.c:358
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr "Bu e-postayЩ gЖndermek iГin alЩcЩsЩnЩ belirtmeniz gereklidir."
 
-#: mail/mail-callbacks.c:409
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr "Bu e-postayЩ gЖndermeden Жnce bir hesap ayarЩ yapmalЩsЩnЩz."
 
-#: mail/mail-callbacks.c:654
+#: mail/mail-callbacks.c:653
+#, c-format
 msgid "On %s, %s wrote:"
 msgstr "%s tarihinde, %s dedi ki:"
 
-#: mail/mail-callbacks.c:873
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "YЖnlendirilmiЧ ileti:\n"
 
-#: mail/mail-callbacks.c:967
+#: mail/mail-callbacks.c:1011
 msgid "Move message(s) to"
 msgstr "щletileri buraya taЧЩ"
 
-#: mail/mail-callbacks.c:969
+#: mail/mail-callbacks.c:1013
 msgid "Copy message(s) to"
 msgstr "щleti(leri) buraya kopyala"
 
-#: mail/mail-callbacks.c:1323
+#: mail/mail-callbacks.c:1374
+#, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "GerГekten %d iletiyi dЭzenlemek istiyor musunuz?"
 
-#: mail/mail-callbacks.c:1345
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -6054,7 +6833,7 @@ msgstr ""
 "Sadece taslaklar dizinine kaydedilen\n"
 "iletileri dЭzenleyebilirsiniz."
 
-#: mail/mail-callbacks.c:1379
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -6062,35 +6841,24 @@ msgstr ""
 "Sadece GЖnderilen dizinine kaydedilen\n"
 "iletileri yeniden gЖnderebilirsiniz."
 
-#: mail/mail-callbacks.c:1391
+#: mail/mail-callbacks.c:1442
+#, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "GerГekten %d iletiyi yeniden gЖndermek istiyor musunuz?"
 
-#: mail/mail-callbacks.c:1412
+#: mail/mail-callbacks.c:1463
 msgid "No Message Selected"
 msgstr "HiГ щleti SeГilmedi"
 
-#: mail/mail-callbacks.c:1446 mail/mail-display.c:96
-msgid "Overwrite file?"
-msgstr "Dosya Эzerine yazЩlsЩn mЩ?"
-
-#: mail/mail-callbacks.c:1450 mail/mail-display.c:100
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"AynЩ isimde bir dosya zaten var\n"
-"эzerine yazЩlsЩn mЩ?"
-
-#: mail/mail-callbacks.c:1494
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "щletiyi FarklЩ Kaydet..."
 
-#: mail/mail-callbacks.c:1496
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "щletileri FarklЩ Kaydet..."
 
-#: mail/mail-callbacks.c:1681
+#: mail/mail-callbacks.c:1766
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -6099,22 +6867,23 @@ msgstr ""
 "Filtre bilgisini yЭklerken hata oluЧtu:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1739
+#: mail/mail-callbacks.c:1776
+msgid "Filters"
+msgstr "Filtreler"
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "щletiyi YazdЩr"
 
-#: mail/mail-callbacks.c:1786
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "щletiyi yazdЩrЩlmasЩnda hata"
 
-#: mail/mail-callbacks.c:1881
+#: mail/mail-callbacks.c:1966
+#, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "GerГekten %d iletiyi farklЩ pencerelerde aГmak istiyor musunuz?"
 
-#: mail/mail-config.c:1503 mail/mail-config.c:1506
-msgid "Connecting to server..."
-msgstr "Sunucuya baПlantЩ kuruluyor..."
-
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -6158,10 +6927,14 @@ msgstr ""
 "olacaktЩr. LЭtfen aЧaПЩdaki boЧluПa bu hesap iГin bir ad veriniz. "
 
 #. set window title
-#: mail/mail-config-druid.c:445
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr "Evolution Hesap SihirbazЩ"
 
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
+msgstr "Sunucuya baПlantЩ kuruluyor..."
+
 #: mail/mail-config.glade.h:1
 msgid " Check for supported types "
 msgstr " Desteklenen tЭrleri denetle "
@@ -6171,58 +6944,63 @@ msgid " color"
 msgstr " renk"
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "Bu Чifreleme ile imza desteklenmiyor"
+
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Hesap"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Hesap Bilgisi"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr "Hesap YЖneticisi"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Hesaplar"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:11
 msgid "Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Ek"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Kimlik Denetimi"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Kimlik Denetim TЭrЭ: "
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr "E-postalarЩ otomatik denetle:"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid "Certificate ID:"
 msgstr "Sertifika No:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:18
 msgid "Composer"
 msgstr "DЭzenleyici"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6238,231 +7016,279 @@ msgstr ""
 "\n"
 "AyarlarЩnЩzЩ kaydetmek iГin \"Bitir\" dЭПmesine tЩklayЩn."
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "ж_ntanЩmlЩ"
 
-#: mail/mail-config.glade.h:25
-msgid "Default \"Forward\" style is: "
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Default Forward style is: "
 msgstr "жntanЩmlЩ \"YЖnlendirme\" tЭrЭ: "
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:27
 msgid "Default character set: "
 msgstr "жntanЩmlЩ karakter kЭmesi: "
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr "SayЩsal Numaralar..."
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Done"
 msgstr "TamamlandЩ"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Taslaklar"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Taslaklar dizini:"
 
-#: mail/mail-config.glade.h:34 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "DЭzenle..."
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "E-posta Adresi:"
 
 #: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Enabled"
+msgstr "EtkinleЧtir"
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Tam щsim:"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:41
 msgid "Get Digital ID..."
 msgstr "SayЩsal NumarayЩ Al..."
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:42
 msgid "HTML Signature:"
 msgstr "HTML щmzasЩ:"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Highlight citations with"
 msgstr "Renklendir: "
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr "Kimlik"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:47
 msgid "In HTML mail"
 msgstr "HTML iletide"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Inline"
 msgstr "_BaПlantЩda"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:50
 msgid "Load images if sender is in addressbook"
 msgstr "GЖnderici adres defterinde ise resimleri yЭkle"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "E-posta YapЩlandЩrmasЩ"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Posta Kutusu BiГimi"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr "Bunu ЖntanЩmlЩ hesabЩm yap"
 
-#: mail/mail-config.glade.h:50
-msgid "Mark messages as \"Read\" after:"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Mark messages as Read after"
 msgstr "щletileri okunmuЧ olarak iЧaretle:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "LDAP Sunucusu"
+
+#: mail/mail-config.glade.h:59
 msgid "Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:60
 msgid "News"
 msgstr "Haberler"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:62
 msgid "Optional Information"
 msgstr "SeГimlik Bilgiler"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Kurum:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:65
 msgid "PGP Key ID:"
 msgstr "PGP Anahtar NumarasЩ:"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:66
 msgid "PGP binary path:"
 msgstr "PGP program yolu:"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:70
 msgid "Pick a color"
 msgstr "Bir renk seГin"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:71
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Prompt when sending messages with an empty subject"
+msgstr "Bu konuyla iletileri filtrelemek iГin kural oluЧtur"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "MAIL FROM cevap hatasЩ: %s: ileti gЖnderilmedi"
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr "Qmail dizini "
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Quoted"
 msgstr "_KotelenmiЧ"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:76
 msgid "Receiving Email"
 msgstr "E-posta AlЩnЩyor"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr "E-posta AlЩnЩyor"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr "Alma SeГenekleri"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 msgid "Required Information"
 msgstr "щstenen Bilgiler"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:83
 msgid "Secure MIME"
 msgstr "GЭvenli MIME"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:84
 msgid "Security"
 msgstr "GЭvenlik"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr "PGP programЩnЩ seГin"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:86
 msgid "Send mail in HTML format by default."
 msgstr "E-postalarЩ ЖntanЩmlЩ olarak HTML gЖnder."
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:87
 msgid "Sending Email"
 msgstr "E-posta GЖnderiliyor"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:88
 msgid "Sending Mail"
 msgstr "E-posta GЖnderiliyor"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "GЖnderildi"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:91
 msgid "Sent and Draft Messages"
 msgstr "GЖnderilen ve Taslak щletileri"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:92
 msgid "Sent messages folder:"
 msgstr "GЖnderilen iletiler dizini:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:93
 msgid "Server Configuration"
 msgstr "Sunucu YapЩlandЩrmasЩ"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:94
 msgid "Server Type: "
 msgstr "Sunucu TЭrЭ: "
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr "Sunucu kimlik denetimi istiyor"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "щmza dosyasЩ:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "Kaynaklar"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Bilgi Yok"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Kaynaklar"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:100
 msgid "Special Folders"
 msgstr "жzel Dizinler"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr "Standart UNIX posta kutusu dosyasЩ"
 
-#: mail/mail-config.glade.h:90
-msgid "Type"
-msgstr "TЭr"
-
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr "GЭvenli baПlantЩ (SSL) kullan"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "KullanЩcЩ adЩ:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
@@ -6472,223 +7298,229 @@ msgstr ""
 "\n"
 "Devam etmek iГin \"щleri\" dЭПmesine tЩklayЩn."
 
-#: mail/mail-config.glade.h:98 ui/evolution-comp-editor.xml.h:20
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:47 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:48
-msgid "_Edit"
-msgstr "_DЭzenle"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
+msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:113
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:114
 msgid "seconds."
 msgstr "saniye."
 
-#: mail/mail-crypto.c:59
+#: mail/mail-crypto.c:60
 msgid "Could not create a PGP signature context."
 msgstr "PGP imza dosyasЩ oluЧturulamadЩ."
 
-#: mail/mail-crypto.c:84
+#: mail/mail-crypto.c:86
 msgid "Could not create a PGP verification context."
 msgstr "PGP onaylama dosyasЩ oluЧturulamadЩ."
 
-#: mail/mail-crypto.c:113
+#: mail/mail-crypto.c:116
 msgid "Could not create a PGP encryption context."
 msgstr "PGP Чifreleme dosyasЩ oluЧturulamadЩ."
 
-#: mail/mail-crypto.c:138
+#: mail/mail-crypto.c:142
 msgid "Could not create a PGP decryption context."
 msgstr "PGP Чifre aГma dosyasЩ oluЧturulamadЩ."
 
-#: mail/mail-crypto.c:173
+#: mail/mail-crypto.c:177
 msgid "Could not create a S/MIME signature context."
 msgstr "S/MIME imzasЩ oluЧturulamadЩ."
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:209
 msgid "Could not create a S/MIME certsonly context."
 msgstr "S/MIME Чifreli iГerik (sadece serifikalЩ) oluЧturulamЩyor."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:240
 msgid "Could not create a S/MIME encryption context."
 msgstr "S/MIME Чifreli iГerik oluЧturulamЩyor."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:271
 msgid "Could not create a S/MIME envelope context."
 msgstr "S/MIME Чifreli zarf iГeriПi oluЧturulamЩyor."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:301
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME kodlama iГeriПi oluЧturulamЩyor."
 
-#: mail/mail-display.c:200
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Eki Kaydet"
 
-#: mail/mail-display.c:240
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "GeГici dizin yaratЩlamadЩ: %s"
-
-#: mail/mail-display.c:301
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Diske Kaydet..."
 
-#: mail/mail-display.c:303
-#, c-format
-msgid "Open in %s..."
-msgstr "%s iГinde aГ..."
-
-#: mail/mail-display.c:305
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr "щzle"
 
-#: mail/mail-display.c:340
-msgid "External Viewer"
-msgstr "Harici щzleyici"
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "%s iГinde aГ..."
 
-#: mail/mail-display.c:363
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "щzle (%s kullanarak)"
 
-#: mail/mail-display.c:367
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Gizle"
 
-#: mail/mail-display.c:961
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr "Harici щzleyici"
+
+#: mail/mail-display.c:1048
 msgid "Loading message content"
 msgstr "щleti iГeriПi yЭkleniyor"
 
-#: mail/mail-display.c:1280
+#: mail/mail-display.c:1404
 msgid "Open Link in Browser"
 msgstr "BaПlantЩyЩ TarayЩcЩda AГ"
 
-#: mail/mail-display.c:1282
-msgid "Save as (FIXME)"
-msgstr "FarklЩ kaydet"
-
-#: mail/mail-display.c:1284
+#: mail/mail-display.c:1406
 msgid "Copy Link Location"
 msgstr "Adresi Kopyala"
 
-#: mail/mail-format.c:532
+#: mail/mail-display.c:1408
+#, fuzzy
+msgid "Save Link as (FIXME)"
+msgstr "FarklЩ kaydet"
+
+#: mail/mail-display.c:1410
+#, fuzzy
+msgid "Save Image as..."
+msgstr "FarklЩ kaydet..."
+
+#: mail/mail-folder-cache.c:170
+#, fuzzy, c-format
+msgid "%d new"
+msgstr "%d dakika"
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr "%d saniye"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, c-format
 msgid "%s attachment"
 msgstr "%s ek"
 
-#: mail/mail-format.c:580
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME iletisi aГЩlamadЩ: Kaynak kodu gЖsteriliyor."
 
-#: mail/mail-format.c:649 mail/message-list.etspec.h:2
+#: mail/mail-format.c:746
 msgid "Date"
 msgstr "Tarih"
 
-#: mail/mail-format.c:765 mail/message-list.etspec.h:4
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "E-posta Adresi:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "GЖnderen"
 
-#: mail/mail-format.c:768
+#: mail/mail-format.c:867
 msgid "Reply-To"
 msgstr "YanЩtla:"
 
-#: mail/mail-format.c:771 mail/message-list.etspec.h:10
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "AlЩcЩ"
 
-#: mail/mail-format.c:774
+#: mail/mail-format.c:873
 msgid "Cc"
 msgstr "Bilgi:"
 
-#: mail/mail-format.c:1096
+#: mail/mail-format.c:1291
 msgid "No GPG/PGP program configured."
 msgstr "GPG/PGP program yapЩlandЩrЩlmadЩ."
 
-#: mail/mail-format.c:1111
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr "чifrelenmiЧ ileti gЖsterilemiyor"
 
-#: mail/mail-format.c:1117
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "чifrelenmiЧ ileti"
 
-#: mail/mail-format.c:1118
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr "чifreyi aГmak iГin simgeye tЩklayЩn"
 
-#: mail/mail-format.c:1174
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Bu ileti dijital olarak imzalanmЩЧtЩr ve gЭvenlidir."
 
-#: mail/mail-format.c:1182
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Bu ileti dijital olarak imzalanmЩЧ, fakat gЭvenli olduПu kanЩtlanmamЩЧtЩr."
 
-#: mail/mail-format.c:1833
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP adresine baП (%s)"
 
-#: mail/mail-format.c:1845
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "%s yerel dosyasЩna baП (\"%s\" adresinde geГerli)"
 
-#: mail/mail-format.c:1849
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Yerel dosyaya baП (%s)"
 
-#: mail/mail-format.c:1883
+#: mail/mail-format.c:2094
+#, fuzzy, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "FTP adresine baП (%s)"
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Bilinmeyen harici veriye baП (\"%s\" tЭrЭnde)"
 
-#: mail/mail-format.c:1888
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr "Bozuk harici gЖvde"
 
-#: mail/mail-local.c:506
+#: mail/mail-local.c:458
 #, c-format
 msgid "Opening '%s'"
 msgstr "'%s' aГЩlЩyor"
 
-#: mail/mail-local.c:805
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" biГiminden \"%s\" biГimine geГiliyor"
 
-#: mail/mail-local.c:809
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "\"%s\" biГiminden \"%s\" biГimine geГ"
-
-#: mail/mail-local.c:832
-msgid "Reconfiguring folder"
-msgstr "Dizin yeniden yapЩlandЩrЩlЩyor"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:861
-msgid "Closing current folder"
-msgstr "GeГerli dizin kapatЩlЩyor"
-
-#: mail/mail-local.c:893
-msgid "Renaming old folder and opening"
-msgstr "Yeni dizinin adЩ deПiЧtiriliyor ve aГЩlЩyor"
-
-#: mail/mail-local.c:911
-msgid "Creating new folder"
-msgstr "Yeni dizin yaratЩlЩyor"
-
-#: mail/mail-local.c:925
-msgid "Copying messages"
-msgstr "щletiler kopyalanЩyor"
-
-#: mail/mail-local.c:942
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6697,7 +7529,7 @@ msgstr ""
 "Dizin meta bilgisi kaydedilemedi. BЭyЭk ihtimalle bu dizini \n"
 "yeniden aГamayacaksЩnЩz: %s"
 
-#: mail/mail-local.c:981
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6705,11 +7537,17 @@ msgstr ""
 "EПer bu dizini tekrar aГamazsЩnЩz, elle \n"
 "dЭzeltme yapmak zorunda kalacaksЩnЩz."
 
-#: mail/mail-local.c:1067
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr "Bu ГЖp dizininden iletileri kopyalayamazsЩnЩz."
+
+#: mail/mail-local.c:1011
+#, c-format
 msgid "Reconfigure %s"
 msgstr "Yeniden YapЩlandЩr: %s"
 
-#: mail/mail-mt.c:190
+#: mail/mail-mt.c:187
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6718,7 +7556,7 @@ msgstr ""
 "'%s' sЩrasЩnda hata:\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6727,117 +7565,104 @@ msgstr ""
 "щЧlem sЩrasЩnda hata:\n"
 "%s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:885
+#: mail/mail-mt.c:794
 msgid "Working"
 msgstr "гalЩЧЩyor"
 
-#: mail/mail-mt.c:867
-msgid "Evolution progress"
-msgstr "Evolution iЧlemleri"
-
-#: mail/mail-ops.c:616
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" gЖnderiliyor"
 
-#: mail/mail-ops.c:620
-msgid "Sending message"
-msgstr "щleti gЖnderiliyor"
-
-#: mail/mail-ops.c:735
+#: mail/mail-ops.c:698
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d ileti gЖnderiliyor"
 
-#: mail/mail-ops.c:754
+#: mail/mail-ops.c:717
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "%d/%d iletide hata"
 
-#: mail/mail-ops.c:756 mail/mail-send-recv.c:493
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 msgid "Complete."
 msgstr "TamamlandЩ."
 
-#: mail/mail-ops.c:842
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "щletiler dizine kaydediliyor"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Moving messages to %s"
 msgstr "щletiler %s'e taЧЩnЩyor"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:884
 #, c-format
 msgid "Copying messages to %s"
 msgstr "щletiler %s'e kopyalanЩyor"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "TaЧЩnЩyor"
 
-#: mail/mail-ops.c:937
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "KopyalanЩyor"
 
-#: mail/mail-ops.c:1014
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" iГinde dizinler taranЩyor"
 
-#: mail/mail-ops.c:1176
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+msgid "Trash"
+msgstr "гЖp"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "YЖnlendirilen iletiler"
 
-#: mail/mail-ops.c:1217 mail/mail-ops.c:1355
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s dizini aГЩlЩyor"
 
-#: mail/mail-ops.c:1284
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr "%s deposu aГЩlЩyor"
 
-#: mail/mail-ops.c:1423
+#: mail/mail-ops.c:1436
+#, c-format
 msgid "Removing folder %s"
 msgstr "%s dizini siliniyor"
 
-#: mail/mail-ops.c:1510
-msgid "Moving folder %s to %s"
-msgstr "%s dizini %s adresine taЧЩnЩyor"
-
-#: mail/mail-ops.c:1512
-msgid "Copying folder %s to %s"
-msgstr "%s dizini %s adresine kopyalanЩyor"
-
-#: mail/mail-ops.c:1665
+#: mail/mail-ops.c:1568
 msgid "Refreshing folder"
 msgstr "Dizin tazeleniyor"
 
-#: mail/mail-ops.c:1701
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "Dizin siliniyor"
 
-#: mail/mail-ops.c:1750
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s iletisi alЩnЩyor"
 
-#: mail/mail-ops.c:1817
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "щletiler alЩnЩyor"
 
-#: mail/mail-ops.c:1827
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "%d/%d ileti alЩnЩyor (uid \"%s\")"
-
-#: mail/mail-ops.c:1901
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "щletiler kaydediliyor"
 
-#: mail/mail-ops.c:1980
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -6846,12 +7671,7 @@ msgstr ""
 "гЩkЩЧ dosyasЩ yaratЩlamadЩ: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1993
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "%d/%d ileti kaydediliyor (uid \"%s\")"
-
-#: mail/mail-ops.c:2007
+#: mail/mail-ops.c:1913
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -6860,11 +7680,11 @@ msgstr ""
 "щletilerin kaydЩnda hata: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2081
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "Ek kaydediliyor"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2003
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -6873,12 +7693,12 @@ msgstr ""
 "гЩkЩЧ dosyasЩ yaratЩlamadЩ: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2124
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Veri yazЩlamadЩ: %s."
 
-#: mail/mail-ops.c:2191
+#: mail/mail-ops.c:2101
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s baПlantЩsЩ kesiliyor"
@@ -6887,159 +7707,166 @@ msgstr "%s baПlantЩsЩ kesiliyor"
 msgid "(Untitled Message)"
 msgstr "(BaЧlЩksЩz щleti)"
 
-#: mail/mail-search.c:268
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(BaЧlЩksЩz щleti)"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "щleti"
+
+#: mail/mail-search.c:284
 msgid "Find in Message"
 msgstr "щletide Bul"
 
-#: mail/mail-search.c:298
+#: mail/mail-search.c:314
 msgid "Case Sensitive"
 msgstr "KЭГЭk/bЭyЭk Harfe DuyarlЩ"
 
-#: mail/mail-search.c:299
+#: mail/mail-search.c:315
 msgid "Search Forward"
 msgstr "щleri DoПru Arat"
 
-#: mail/mail-search.c:316
+#: mail/mail-search.c:332
 msgid "Find:"
 msgstr "Bul:"
 
-#: mail/mail-search.c:319
+#: mail/mail-search.c:335
 msgid "Matches:"
 msgstr "EЧleЧenler:"
 
-#: mail/mail-send-recv.c:142
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "щptal ediliyor..."
 
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:250
 msgid "Send & Receive mail"
 msgstr "E-posta Al & GЖnder"
 
-#: mail/mail-send-recv.c:254
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "AlЩnЩyor"
 
-#: mail/mail-send-recv.c:303
+#: mail/mail-send-recv.c:302
 msgid "Updating..."
 msgstr "GЭncelleniyor..."
 
-#: mail/mail-send-recv.c:305 mail/mail-send-recv.c:351
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
 msgid "Waiting..."
 msgstr "Bekleniyor..."
 
-#: mail/mail-send-recv.c:324
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "GЖnderiliyor"
 
-#: mail/mail-send-recv.c:489
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "щptal edildi."
 
-#: mail/mail-tools.c:158
+#: mail/mail-session.c:171
+msgid "User canceled operation."
+msgstr "KullanЩcЩ iЧlemi iptal etti."
+
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "GeГici ileti kutusu '%s' hazЩrlanamadЩ: %s"
 
-#: mail/mail-tools.c:206
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (yЖnlendirilmiЧ ileti)"
-
-#: mail/mail-tools.c:216
-msgid "Fwd: (no subject)"
-msgstr "щlt: (konusuz)"
-
-#: mail/mail-tools.c:233
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "YЖnlendirilmiЧ ileti - %s"
 
-#: mail/mail-tools.c:235
-msgid "Forwarded message (no subject)"
-msgstr "YЖnlendirilmiЧ ileti (konusuz)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "YЖnlendirilen iletiler"
 
-#: mail/mail-tools.c:554
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
-"s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----YЖnlendirilmiЧ щleti-----<br><b>GЖnderen:</b> %s<br><b>AlЩcЩ:</b> %s<br><b>Konu:"
-"</b> %s<br>"
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "YЖnlendirilen iletiler"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "VDizin"
 
-#: mail/mail-vfolder.c:438
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Yeni VDizin"
 
-#: mail/message-list.c:608
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr "GЖrЭnmeyen"
 
-#: mail/message-list.c:609
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr "GЖrЭnen"
 
-#: mail/message-list.c:610
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr "Cevaplanan"
 
-#: mail/message-list.c:611
+#: mail/message-list.c:616
 msgid "Multiple Unseen Messages"
 msgstr "гoklu GЖrЭlmeyen щleti"
 
-#: mail/message-list.c:612
+#: mail/message-list.c:617
 msgid "Multiple Messages"
 msgstr "гoklu щletiler"
 
-#: mail/message-list.c:616
+#: mail/message-list.c:621
 msgid "Lowest"
 msgstr "En DЭЧЭk"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:622
 msgid "Lower"
 msgstr "DЭЧЭk"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:626
 msgid "Higher"
 msgstr "YЭksek"
 
-#: mail/message-list.c:622
+#: mail/message-list.c:627
 msgid "Highest"
 msgstr "En YЭksek"
 
-#: mail/message-list.c:872
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:879
+#: mail/message-list.c:884
 msgid "Today %l:%M %p"
 msgstr "BugЭn %l:%M %p"
 
-#: mail/message-list.c:888
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr "DЭn %l:%M %p"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:905
 msgid "%a %l:%M %p"
 msgstr "%a %l %M %p"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:913
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/message-list.c:910
+#: mail/message-list.c:915
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.etspec.h:3
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "щletiler kaydediliyor"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "щЧaretli"
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:4
 msgid "Received"
 msgstr "AlЩndЩ"
 
@@ -7047,10 +7874,6 @@ msgstr "AlЩndЩ"
 msgid "Size"
 msgstr "Boyut"
 
-#: mail/mail-session.c:161
-msgid "User canceled operation."
-msgstr "KullanЩcЩ iЧlemi iptal etti."
-
 #: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Dizin"
@@ -7079,7 +7902,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "\"%s\" dizininden Эyelik siliniyor"
 
 #. Construct the app
-#: mail/subscribe-dialog.c:877
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "эyelikleri DЭzenle"
 
@@ -7095,44 +7918,85 @@ msgstr "Evolution Жzet bileЧen mimarisi."
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Evolution жzet bileЧeni ilklendirilemedi."
 
-#: my-evolution/e-summary-calendar.c:158 my-evolution/e-summary-calendar.c:176
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
 msgid "Appointments"
 msgstr "Randevular"
 
-#: my-evolution/e-summary-calendar.c:159
+#: my-evolution/e-summary-calendar.c:177
 msgid "No appointments"
 msgstr "Randevu yok"
 
-#: my-evolution/e-summary-calendar.c:203 my-evolution/e-summary-calendar.c:209
-msgid "%I:%M%p"
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
 msgstr "%I:%M%p"
 
-#: my-evolution/e-summary-mail.c:100
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%a %l %M %p"
+
+#: my-evolution/e-summary-mail.c:104
 msgid "Mail summary"
 msgstr "щleti Жzeti"
 
-#: my-evolution/e-summary-rdf.c:378 my-evolution/e-summary-rdf.c:404
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "Evolution AyarlarЩ..."
+
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
 msgid "<b>Error downloading RDF</b>"
 msgstr "<b>RDF indirirken bir hata oluЧtu</b>"
 
-#: my-evolution/e-summary-weather.c:56
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "Yeni GЖrev"
+
+#: my-evolution/e-summary-weather.c:57
 msgid "My Weather"
 msgstr "Hava Durumu"
 
-#: my-evolution/e-summary-weather.c:296
-msgid "<b>Error downloading Metar</b>"
-msgstr "<b>Metar indirirken bir hata oluЧtu</b>"
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
 
-#: my-evolution/e-summary-weather.c:600
+#: my-evolution/e-summary-weather.c:643
 msgid "Regions"
 msgstr "BЖlЭmler"
 
-#: my-evolution/e-summary.c:410 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%d %B %A"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print My Evolution"
 msgstr "Evolution"
 
-#: my-evolution/e-summary.c:456
+#: my-evolution/e-summary.c:518
 #, fuzzy
 msgid "Printing of My Evolution failed"
 msgstr "щletiyi yazdЩrЩlmasЩnda hata"
@@ -7141,95 +8005,95 @@ msgstr "щletiyi yazdЩrЩlmasЩnda hata"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Bonobo baЧlatЩlamadЩ.\n"
 
-#: my-evolution/metar.c:43
+#: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "GЖkyЭzЭnЭ temizle"
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 msgid "Broken clouds"
 msgstr "ParГalЩ bulutlu"
 
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
 msgid "Scattered clouds"
 msgstr "DaПЩnЩk bulutlu"
 
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:47
 msgid "Few clouds"
 msgstr "Az bulutlu"
 
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
 msgid "Overcast"
 msgstr ""
 
-#: my-evolution/metar.c:55 my-evolution/metar.c:73 my-evolution/metar.c:136
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
 msgid "Invalid"
 msgstr "GeГersiz"
 
-#: my-evolution/metar.c:62
+#: my-evolution/metar.c:63
 msgid "Variable"
 msgstr "DeПiЧken"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "North"
 msgstr "Kuzey"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "North - NorthEast"
 msgstr "Kuzey - KuzeydoПu"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "Northeast"
 msgstr "KuzeydoПu"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "East - NorthEast"
 msgstr "DoПu - KuzeydoПu"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East"
 msgstr "DoПu"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - Southeast"
 msgstr "DoПu - GЭneydoПu"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "Southeast"
 msgstr "GЭneydoПu"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "South - Southeast"
 msgstr "GЭney - GЭneydoПu"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South"
 msgstr "GЭney"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southwest"
 msgstr "GЭney - GЭneybatЩ"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "Southwest"
 msgstr "GЭneybatЩ"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "West - Southwest"
 msgstr "BatЩ - GЭneybatЩ"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West"
 msgstr "BatЩ"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Northwest"
 msgstr "BatЩ - KuzeybatЩ"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "Northwest"
 msgstr "KuzeybatЩ"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "North - Northwest"
 msgstr "Kuzey - KuzeybatЩ"
 
@@ -7237,1085 +8101,1224 @@ msgstr "Kuzey - KuzeybatЩ"
 #. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
 #. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Drizzle in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Light drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Moderate drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Heavy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Shallow drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Patches of drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Partial drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:99 my-evolution/metar.c:100
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
 msgid "Thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Windy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 #, fuzzy
 msgid "Showers"
 msgstr "GЖster"
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Drifting drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:99
+#: my-evolution/metar.c:100
 msgid "Freezing drizzle"
 msgstr ""
 
 #. RAIN
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Rain"
 msgstr "YaПmurlu"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Rain in the vicinity"
 msgstr "Yer yer yaПmurlu"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Light rain"
 msgstr "Hafif yaПmurlu"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Moderate rain"
 msgstr "Orta yaПmur"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Heavy rain"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Shallow rain"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Patches of rain"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Partial rainfall"
 msgstr "KЩsmi yaПmurlu"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Blowing rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 msgid "Rain showers"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 #, fuzzy
 msgid "Drifting rain"
 msgstr "AГЩklama iГeriПi"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:101
 #, fuzzy
 msgid "Freezing rain"
 msgstr "Yeniden Ara"
 
 #. SNOW
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Snow"
 msgstr "KarlЩ"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Snow in the vicinity"
 msgstr "Yer yer kar yaПЩЧЩ"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Light snow"
 msgstr "Hafif kar yaПЩЧЩ"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Moderate snow"
 msgstr "Orta Чiddette kar yaПЩЧЩ"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Heavy snow"
 msgstr "AПЩr kar yaПЩЧЩ"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Shallow snow"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Patches of snow"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Partial snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:101 my-evolution/metar.c:102
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
 msgid "Snowstorm"
 msgstr "Kar fЩrtЩnasЩ"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Blowing snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Snow showers"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Drifting snow"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:102
 msgid "Freezing snow"
 msgstr ""
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Snow grains in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Light snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Moderate snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Heavy snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Shallow snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Patches of snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Partial snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Blowing snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Snow grain showers"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 #, fuzzy
 msgid "Drifting snow grains"
 msgstr "AГЩklama iГeriПi"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:103
 msgid "Freezing snow grains"
 msgstr ""
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Ice crystals"
 msgstr "Buzlanma"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Ice crystals in the vicinity"
 msgstr "Yer yer buzlanma"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Few ice crystals"
 msgstr "Az derecede buzlanma"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Moderate ice crystals"
 msgstr "Orta derecede buzlanma"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Heavy ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Patches of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Partial ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Ice crystal storm"
 msgstr "Buz fЩrtЩnasЩ"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Blowing ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Showers of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Drifting ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:104
 msgid "Freezing ice crystals"
 msgstr ""
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Ice pellets"
 msgstr "Buz peltesi"
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Ice pellets in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Few ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Moderate ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Heavy ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Shallow ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Patches of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Partial ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Ice pellet storm"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Blowing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Showers of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Drifting ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:105
 msgid "Freezing ice pellets"
 msgstr ""
 
 #. HAIL
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 #, fuzzy
 msgid "Hail"
 msgstr "E-posta"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:105 my-evolution/metar.c:106
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
 msgid "Light hail"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Moderate hail"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Heavy hail"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Shallow hail"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Patches of hail"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 #, fuzzy
 msgid "Partial hail"
 msgstr "Birincil E-posta Adresi"
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Blowing hail"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Hail showers"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 msgid "Drifting hail"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:106
 #, fuzzy
 msgid "Freezing hail"
 msgstr "E-posta AlЩnЩyor"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Small hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Moderate small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Heavy small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 #, fuzzy
 msgid "Shallow small hail"
 msgstr "TЭmЭnЭ GЖster "
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Patches of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Partial small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Small hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Blowing small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 #, fuzzy
 msgid "Showers of small hail"
 msgstr "TЭmЭnЭ GЖster "
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Drifting small hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:107
 msgid "Freezing small hail"
 msgstr ""
 
 #. PRECIPITATION
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Unknown precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Precipitation in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Light precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Moderate precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Heavy precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Shallow precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Patches of precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Partial precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 #, fuzzy
 msgid "Unknown thunderstorm"
 msgstr "Bilinmeyen hata"
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Blowing precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Showers, type unknown"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 msgid "Drifting precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:108
 #, fuzzy
 msgid "Freezing precipitation"
 msgstr "ToplantЩ Davetleri"
 
 #. MIST
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Mist"
 msgstr "Sisli"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Mist in the vicinity"
 msgstr "Yer yer sisli"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Light mist"
 msgstr "Hafif sisli"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Moderate mist"
 msgstr "Orta derecede sisli"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Thick mist"
 msgstr "KalЩn sisli"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Shallow mist"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Patches of mist"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Partial mist"
 msgstr "BЖlЭm bЖlЭm sisli"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Mist with wind"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 #, fuzzy
 msgid "Drifting mist"
 msgstr "E-posta listesi"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:109
 msgid "Freezing mist"
 msgstr ""
 
 #. FOG
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Fog in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Light fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Moderate fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Thick fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 #, fuzzy
 msgid "Shallow fog"
 msgstr "TЭmЭnЭ GЖster "
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Patches of fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Partial fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 #, fuzzy
 msgid "Fog with wind"
 msgstr "Bu pencereyi kapat"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Drifting fog"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:110
 msgid "Freezing fog"
 msgstr ""
 
 #. SMOKE
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 #, fuzzy
 msgid "Smoke"
 msgstr "Sakla"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Smoke in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Thin smoke"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Moderate smoke"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Thick smoke"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 #, fuzzy
 msgid "Shallow smoke"
 msgstr "GЖrevleri gЖster"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Patches of smoke"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Partial smoke"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Smoke w/ thunders"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 #, fuzzy
 msgid "Smoke with wind"
 msgstr "Bu pencereyi kapat"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:111
 msgid "Drifting smoke"
 msgstr ""
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Volcanic ash"
 msgstr "Volkanik kЭl"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Volcanic ash in the vicinity"
 msgstr "Yer yer volkanik kЭl"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Moderate volcanic ash"
 msgstr "Orta derecede volkanik kЭl"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Thick volcanic ash"
 msgstr "KalЩn volkanik kЭl"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Shallow volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Patches of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Partial volcanic ash"
 msgstr "KЩsmi volkanik kЭl"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Volcanic ash w/ thunders"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Blowing volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Showers of volcanic ash "
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Drifting volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:112
 msgid "Freezing volcanic ash"
 msgstr ""
 
 #. SAND
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Sand"
 msgstr "Kumlu"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Sand in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Light sand"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Moderate sand"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Heavy sand"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Patches of sand"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Partial sand"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Blowing sand"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:113
 msgid "Drifting sand"
 msgstr ""
 
 #. HAZE
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 #, fuzzy
 msgid "Haze"
 msgstr "эstbilgi"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Haze in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Light haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Moderate haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Thick haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Shallow haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Patches of haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Partial haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Haze with wind"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Drifting haze"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:114
 msgid "Freezing haze"
 msgstr ""
 
 #. SPRAY
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 #, fuzzy
 msgid "Sprays"
 msgstr "gЭn"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Sprays in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Light sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Moderate sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Heavy sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Shallow sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Patches of sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Partial sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Blowing sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Drifting sprays"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:115
 msgid "Freezing sprays"
 msgstr ""
 
 #. DUST
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 #, fuzzy
 msgid "Dust"
 msgstr "AПustos"
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Dust in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Light dust"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Moderate dust"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Heavy dust"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Patches of dust"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Partial dust"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Blowing dust"
 msgstr ""
 
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:116
 msgid "Drifting dust"
 msgstr ""
 
 #. SQUALL
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Squall in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Light squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Moderate squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Heavy squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Partial squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Thunderous squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Blowing squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Drifting squall"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:117
 msgid "Freezing squall"
 msgstr ""
 
 #. SANDSTORM
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Sandstorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Light standstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Moderate sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Heavy sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Shallow sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Partial sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Thunderous sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Blowing sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Drifting sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:118
 msgid "Freezing sandstorm"
 msgstr ""
 
 #. DUSTSTORM
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Duststorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Light duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Moderate duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Heavy duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Shallow duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Partial duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Thunderous duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Blowing duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Drifting duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:119
 msgid "Freezing duststorm"
 msgstr ""
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Funnel cloud in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Light funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Moderate funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Thick funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Shallow funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Patches of funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Partial funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Funnel cloud w/ wind"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:120
 msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Tornado"
 msgstr "KasЩrga"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Tornado in the vicinity"
 msgstr "Yer yer kasЩrga"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Moderate tornado"
 msgstr "Orta Чiddette kasЩrga"
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Raging tornado"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Partial tornado"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Thunderous tornado"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Drifting tornado"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:121
 msgid "Freezing tornado"
 msgstr ""
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Dust whirls in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Light dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Moderate dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Heavy dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Shallow dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Patches of dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Partial dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Blowing dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:122
 msgid "Drifting dust whirls"
 msgstr ""
 
-#: shell/e-activity-handler.c:174 ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "щptal"
+#: my-evolution/my-evolution.glade.h:1
+#, fuzzy
+msgid "Add new feed"
+msgstr "Cevaplanan"
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Dizini seГin"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "TЭm KatЩlЩmcЩlar"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Bununla baЧlayan dizinleri gЖster:"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "Bununla baЧlayan dizinleri gЖster:"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "GЖsterim"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "Cuma"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+#, fuzzy
+msgid "News Feed Settings"
+msgstr "Ayarlar"
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "1 gЭn"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "ay"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr "1 hafta"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr "ToplantЩ ZamanЩ DЭzenle"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "TЭmЭnЭ GЖster"
+
+#: my-evolution/my-evolution.glade.h:21
+#, fuzzy
+msgid "Show full path for folders"
+msgstr "_KapsamlЩ BaЧlЩklarЩ GЖster"
+
+#: my-evolution/my-evolution.glade.h:22
+msgid "Show today's tasks"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "GЖrevler"
+
+#: my-evolution/my-evolution.glade.h:24
+#, fuzzy
+msgid "Units: "
+msgstr ""
+"\n"
+"  эnite:  "
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "Hava Durumu"
+
+#: my-evolution/my-evolution.glade.h:26
+msgid "Weather settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:27
+#, fuzzy
+msgid "imperial"
+msgstr "Nisan"
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "Evolution kabuПu."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "AyrЩntЩlar"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "ToplantЩyЩ щ_ptal Et"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "жzel Dizinler"
 
-#: shell/e-setup.c:125 shell/e-setup.c:198
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "Evolution kurulumu"
 
@@ -8337,21 +9340,17 @@ msgstr ""
 msgid "Could not update files correctly"
 msgstr "Dosyalar dЭzgЭn bir Чekilde gЭncellenemedi"
 
-#: shell/e-setup.c:173 shell/e-setup.c:241
-msgid "Evolution files successfully installed."
-msgstr "Evolution dosyalarЩ baЧarЩyla kuruldu."
-
-#: shell/e-setup.c:202
+#: shell/e-setup.c:200
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Evolution'u ilk defa ГalЩЧtЩrЩyorsunuz."
 
-#: shell/e-setup.c:203
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Evolution kullanЩcЩ dosyalarЩnЩ buraya kurmak iГin \"Tamam\" dЭПmesine "
 "tЩklayЩn."
 
-#: shell/e-setup.c:222
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -8362,16 +9361,16 @@ msgstr ""
 "\n"
 "Hata: %s"
 
-#: shell/e-setup.c:237
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
 msgstr ""
 "Dosyalar kopyalanamadЩ\n"
 "`%s'."
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -8382,7 +9381,7 @@ msgstr ""
 "Evolution kullanЩcЩ dosyalarЩnЩn yЭklenmesi\n"
 "bunu silmelisiniz."
 
-#: shell/e-setup.c:318
+#: shell/e-setup.c:322
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -8391,7 +9390,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:343
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -8402,53 +9401,56 @@ msgstr ""
 "kullanЩlmЩyor. LЭtfen Evolution kullanЩcЩ dosyalarЩnЩn\n"
 "kopyalanabilmesi iГin bu dizini taЧЩyЩnЩz."
 
-#: shell/e-shell.c:433
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Yerel kayЩt kurulamadЩ -- %s"
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "%s dizini alЩnamadЩ: %s"
 
-#: shell/e-shell.c:1281
-#, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"Dosyalar kopyalanamadЩ\n"
+"`%s'."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
 msgstr ""
-"`%s gЖrЭnЭmЭ beklenmeyen bir Чekilde sonlandЩrЩldЩ.\n"
-"%s bileЧeni ГЖktЭ."
 
-#: shell/e-shell-folder-commands.c:242
+#: shell/e-shell-folder-commands.c:270
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "\"%s\" dizinini kopyalamak iГin bir dizin adЩ verin:"
 
-#: shell/e-shell-folder-commands.c:247
+#: shell/e-shell-folder-commands.c:275
 msgid "Copy folder"
 msgstr "Dizini kopyala"
 
-#: shell/e-shell-folder-commands.c:285
+#: shell/e-shell-folder-commands.c:313
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "\"%s\" dizinini taЧЩmak iГin bir dizin adЩ verin:"
 
-#: shell/e-shell-folder-commands.c:290
+#: shell/e-shell-folder-commands.c:318
 msgid "Move folder"
 msgstr "Dizini taЧЩ"
 
-#. Popup a dialog asking if they are sure they want to delete
-#. the folder
-#: shell/e-shell-folder-commands.c:324
+#: shell/e-shell-folder-commands.c:354
+#, c-format
 msgid "Delete folder '%s'"
 msgstr "'%s' dizinini sil"
 
-#: shell/e-shell-folder-commands.c:332
+#: shell/e-shell-folder-commands.c:363
+#, c-format
 msgid "Are you sure you want to remove the '%s' folder?"
 msgstr "GerГekten '%s' dizinini silmek istiyor musunuz?"
 
-#: shell/e-shell-folder-commands.c:390
+#: shell/e-shell-folder-commands.c:422
+#, c-format
 msgid "Rename folder '%s'"
 msgstr "'%s' dizini yeniden isimlendir"
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -8457,11 +9459,11 @@ msgstr ""
 "Belirlenen dizin yaratЩlamadЩ:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "Belirtilen dizin adЩ geГerli deПildir."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Yeni dizin yarat"
 
@@ -8473,11 +9475,11 @@ msgstr ""
 "щstenen iЧlem iГin seГili dizin tipi \n"
 "geГerli deПildir ."
 
-#: shell/e-shell-folder-selection-dialog.c:332
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Yeni..."
 
-#: shell/e-shell-folder-title-bar.c:468 shell/e-shell-folder-title-bar.c:469
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(isimsiz)"
 
@@ -8586,50 +9588,19 @@ msgstr "Bu veriyi almak iГin hedef dizin seГin"
 msgid "Closing connections..."
 msgstr "BaПlantЩlar kesiliyor..."
 
-#: shell/e-shell-view.c:174
-msgid "(No folder displayed)"
-msgstr "(dizin gЖsterilmiyor)"
-
-#. Special case for My Evolution
-#: shell/e-shell-view.c:1387 shell/e-storage-set-view.c:1440
-msgid "My Evolution"
-msgstr "Evolution"
-
-#: shell/e-shell-view.c:1404
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1406
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell-view.c:1444
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr "Evolution ГevrimiГi ГlЩЧЩyor. Bu dЭПmeye tЩklayarak ГevrimdЩЧЩ ГalЩЧmasЩnЩ saПlayЩn."
-
-#: shell/e-shell-view.c:1451
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution ГevrimdЩЧЩ ГalЩЧmak Эzere hazЩrlanЩyor."
-
-#: shell/e-shell-view.c:1457
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr "Evolution ГevrimdЩЧЩ ГalЩЧЩyor. Bu dЭПmeye tЩklayarak ГevrimiГi ГalЩЧmasЩnЩ saПlayЩn."
-
-#: shell/e-shell-view-menu.c:182
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy $PATH dizininde bulunamadЩ."
 
-#: shell/e-shell-view-menu.c:188
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy ГalЩЧtЩrЩlamadЩ."
 
-#: shell/e-shell-view-menu.c:233
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Telif hakkЩ 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:235
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -8638,43 +9609,90 @@ msgstr ""
 "Evolution, GNOME masaЭstЭ iГin bir e-posta, \n"
 "takvim ve iletiЧim listesi yЖnetim uygulamasЩdЩr."
 
-#: shell/e-shell-view-menu.c:464
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Dizine git..."
 
-#: shell/e-shell-view-menu.c:465
+#: shell/e-shell-view-menu.c:438
 msgid "Select the folder that you want to open"
 msgstr "AГmak istediПiniz dizini seГin"
 
-#: shell/e-shell-view-menu.c:610
+#: shell/e-shell-view-menu.c:583
 msgid "Create a new shortcut"
 msgstr "Yeni bir kЩsayol yarat"
 
-#: shell/e-shell-view-menu.c:611
+#: shell/e-shell-view-menu.c:584
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "KЩsayolu iЧaret etmek istediПiniz dizini seГin:"
 
-#: shell/e-shell-view-menu.c:718
-msgid "Work online"
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
 msgstr "гevrimiГi ГalЩЧ"
 
-#: shell/e-shell-view-menu.c:730 shell/e-shell-view-menu.c:742
-msgid "Work offline"
-msgstr "гevrimdЩЧЩ ГalЩЧ"
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+msgid "Work Offline"
+msgstr "гevrimdЩЧЩ гalЩЧ"
 
-#: shell/e-shortcuts.c:596
-msgid "Error saving shortcuts."
-msgstr "KЩsayollarЩ kaydederken hata oldu."
+#: shell/e-shell-view.c:175
+msgid "(No folder displayed)"
+msgstr "(dizin gЖsterilmiyor)"
+
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+msgid "My Evolution"
+msgstr "Evolution"
 
-#: shell/e-shortcuts-view.c:136
+#: shell/e-shell-view.c:1411
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
+
+#: shell/e-shell-view.c:1413
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Evolution ГevrimiГi ГlЩЧЩyor. Bu dЭПmeye tЩklayarak ГevrimdЩЧЩ ГalЩЧmasЩnЩ "
+"saПlayЩn."
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution ГevrimdЩЧЩ ГalЩЧmak Эzere hazЩrlanЩyor."
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Evolution ГevrimdЩЧЩ ГalЩЧЩyor. Bu dЭПmeye tЩklayarak ГevrimiГi ГalЩЧmasЩnЩ "
+"saПlayЩn."
+
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Yerel kayЩt kurulamadЩ -- %s"
+
+#: shell/e-shell.c:1311
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"`%s gЖrЭnЭmЭ beklenmeyen bir Чekilde sonlandЩrЩldЩ.\n"
+"%s bileЧeni ГЖktЭ."
+
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr "Yeni bir kЩsayol grubu yarat"
 
-#: shell/e-shortcuts-view.c:139
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Grup adЩ:"
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -8683,155 +9701,194 @@ msgstr ""
 "KЩsayol ГubuПundan `%s' grubunu \n"
 "kaldЩrmak istiyor musunuz?"
 
-#: shell/e-shortcuts-view.c:267
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "Silme"
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:300
 msgid "Rename Shortcut Group"
 msgstr "KЩsayol Grubunu Yeniden щsimlendir"
 
-#: shell/e-shortcuts-view.c:293
+#: shell/e-shortcuts-view.c:301
 msgid "Rename selected shortcut group to:"
 msgstr "SeГili kЩsayol grubunu yeniden isimlendir:"
 
-#: shell/e-shortcuts-view.c:303
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "_KЭГЭk Simgeler"
 
-#: shell/e-shortcuts-view.c:304
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "KЩsayollarЩ kЭГЭk simgeler olarak gЖster"
 
-#: shell/e-shortcuts-view.c:306
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "_BЭyЭk Simgeler"
 
-#: shell/e-shortcuts-view.c:307
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "KЩsayollarЩ bЭyЭk simgeler olarak gЖster"
 
-#: shell/e-shortcuts-view.c:318
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "Yeni _Grup..."
 
-#: shell/e-shortcuts-view.c:319
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr "Yeni bir kЩsayol grubu yarat"
 
-#: shell/e-shortcuts-view.c:321
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "_Bu Grubu Sil..."
 
-#: shell/e-shortcuts-view.c:322
+#: shell/e-shortcuts-view.c:333
 msgid "Remove this shortcut group"
 msgstr "Bu kЩsayolu grubunu sil"
 
-#: shell/e-shortcuts-view.c:324
-msgid "Re_name This Group..."
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
 msgstr "_Bu Grubu Yeniden щsimlendir..."
 
-#: shell/e-shortcuts-view.c:325
+#: shell/e-shortcuts-view.c:336
 msgid "Rename this shortcut group"
 msgstr "Bu kЩsayol grubunu yeniden isimlendir"
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:341
 msgid "_Hide the Shortcut Bar"
 msgstr "KЩsayol гubuПunu _Gizle"
 
-#: shell/e-shortcuts-view.c:331
+#: shell/e-shortcuts-view.c:342
 msgid "Hide the shortcut bar"
 msgstr "KЩsayol ГubuПunu gizle"
 
-#: shell/e-shortcuts-view.c:450
+#: shell/e-shortcuts-view.c:461
 msgid "Rename shortcut"
 msgstr "KЩsayolu yeniden isimlendir"
 
-#: shell/e-shortcuts-view.c:451
+#: shell/e-shortcuts-view.c:462
 msgid "Rename selected shortcut to:"
 msgstr "SeГili kЩsayollarЩ yeniden isimlendir:"
 
-#: shell/e-shortcuts-view.c:463
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "AГ"
+
+#: shell/e-shortcuts-view.c:474
 msgid "Open the folder linked to this shortcut"
 msgstr "Bu kЩsayola baПlЩ dizini aГ"
 
-#: shell/e-shortcuts-view.c:465 ui/evolution.xml.h:25
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Yeni Pencerede AГ"
 
-#: shell/e-shortcuts-view.c:465
+#: shell/e-shortcuts-view.c:476
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Bu kЩsayola baПlЩ dizini yeni pencerede aГ"
 
-#: shell/e-shortcuts-view.c:468
+#: shell/e-shortcuts-view.c:479
 msgid "Rename"
 msgstr "Yeniden isimlendir"
 
-#: shell/e-shortcuts-view.c:468
+#: shell/e-shortcuts-view.c:479
 msgid "Rename this shortcut"
 msgstr "Bu kЩsayolu yeniden isimlendir"
 
-#: shell/e-shortcuts-view.c:470
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Bu kЩsayolu kЩsayol ГubuПundan sil"
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:585
+msgid "Error saving shortcuts."
+msgstr "KЩsayollarЩ kaydederken hata oldu."
+
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "_KЩsayol гubuПu"
+
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "pkutusu"
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "_BaПlantЩ"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(isimsiz)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Hata yok"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Genel hata"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "AynЩ isimli bir dizin zaten var"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "Belirtilen dizin tЭrЭ geГerli deПildir"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "G/г hatasЩ"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "Dizin yaratmak iГin gerekli disk alanЩ yok"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "Belirtilen dizin bulunamadЩ"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr "Fonksiyon desteklenmiyor"
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr "щzin yok"
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "щЧlem desteklenmiyor"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr "Bu kayЩtta belirtilen tip desteklenmiyor"
 
-#: shell/e-task-widget.c:167
+#: shell/e-task-widget.c:168
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:172
+#: shell/e-task-widget.c:173
 msgid "%s (%d%% complete)"
 msgstr "%s (%%%d tamamlandЩ)"
 
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "BaПlantЩlar kesiliyor..."
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "Makina:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Dizin adЩ:"
@@ -8844,10 +9901,6 @@ msgstr "Dizin tЭrЭ:"
 msgid "Specify where to create the folder:"
 msgstr "Dizinin nerede yaratЩlacaПЩnЩ belirtin:"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
-msgstr "Evolution kabuПu."
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "\"Aktar\" dЭПmesine tЩklayarak dosyalarЩ Evolution'a aktarЩn."
@@ -8877,22 +9930,26 @@ msgstr "AlЩcЩlar"
 msgid "Don't import"
 msgstr "Alma"
 
-#: shell/main.c:89
-#, no-c-format
+#: shell/importer/intelligent.c:199
+msgid "Don't ask me again"
+msgstr "Tekrar sorma"
+
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
+#, fuzzy, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
@@ -8903,7 +9960,7 @@ msgstr ""
 "Evolution geniЧ bir geliЧtirici grubu tarafЩndan hazЩrlanmaktadЩr. Sizlerin "
 "de desteПini bekliyoruz.\n"
 
-#: shell/main.c:114
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -8911,28 +9968,28 @@ msgstr ""
 "TeЧekkЭrler\n"
 "Evolution Grubu\n"
 
-#: shell/main.c:152
+#: shell/main.c:155
 msgid "Cannot access the Evolution shell."
 msgstr "Evolution kabuПuna eriЧim yapЩlamadЩ."
 
-#: shell/main.c:211
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr "AГЩlЩЧ ekranЩni gЖsterme"
 
-#: shell/main.c:212
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr "TЭm hata ayЩklama verilerini bir dosyaya yazdЩr."
 
-#: shell/main.c:247
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo parГalar sistemi baЧlatЩlamadЩ."
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:3
-#: ui/evolution-tasks.xml.h:2
-msgid "C_ut"
-msgstr "_Kes"
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Kopyala"
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:6
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 msgid "Copy the selection"
 msgstr "SeГimi kopyala"
 
@@ -8944,7 +10001,11 @@ msgstr "Yeni bir baПlantЩ yarat"
 msgid "Create new contact list"
 msgstr "Yeni bir baПlantЩ listesi yarat"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:11
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Kes"
+
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
 msgid "Cut the selection"
 msgstr "SeГimi kes"
 
@@ -8960,7 +10021,11 @@ msgstr "Yeni baПlantЩ"
 msgid "New list"
 msgstr "Yeni liste"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:27
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "YapЩЧtЩr"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Panoyu yapЩЧtЩr"
 
@@ -9000,19 +10065,8 @@ msgstr "_BaПlantЩ"
 msgid "_Contact Group"
 msgstr "_BaПlantЩ Grubu"
 
-#: ui/evolution-addressbook.xml.h:25 ui/evolution-calendar.xml.h:45
-#: ui/evolution-tasks.xml.h:13
-msgid "_Copy"
-msgstr "_Kopyala"
-
-#: ui/evolution-addressbook.xml.h:26 ui/evolution-calendar.xml.h:50
-#: ui/evolution-tasks.xml.h:15
-msgid "_Paste"
-msgstr "_YapЩЧtЩr"
-
-#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:51
-#: ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13 ui/my-evolution.xml.h:5
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "_YazdЩr..."
 
@@ -9024,159 +10078,131 @@ msgstr "BaП_lantЩlarЩ ara"
 msgid "_Select All"
 msgstr "_Hepsini SeГ"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:53
-#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:64
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "_AraГlar"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 GЭn"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-msgid "Alter preferences"
-msgstr "Tercihleri deПiЧtir"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new all day Event"
+#: ui/evolution-calendar.xml.h:4
+#, fuzzy
+msgid "Create a New All-Day _Event"
 msgstr "Yeni bir tЭm gЭn olayЩ yarat"
 
-#: ui/evolution-calendar.xml.h:8
-msgid "Create a new appointment"
+#: ui/evolution-calendar.xml.h:5
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Yeni bir randevu yarat"
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Create a new calendar"
-msgstr "Yeni bir takvim yarat"
+#: ui/evolution-calendar.xml.h:6
+msgid "Create a new appointment"
+msgstr "Yeni bir randevu yarat"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Day"
-msgstr "GЭn"
+#: ui/evolution-calendar.xml.h:7
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 msgid "Go To"
 msgstr "Git"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Zamanda geriye git"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Zamanda ileri git"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "_Tarihe Git"
 
-#: ui/evolution-calendar.xml.h:17
-msgid "Go to _Today"
-msgstr "_BugЭne Git"
-
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Belirli bir tarihe git"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "чimdiki zamana git"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Month"
-msgstr "Ay"
-
-#: ui/evolution-calendar.xml.h:22
-msgid "New _Event"
-msgstr "Yeni _Olay"
-
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail-message.xml.h:46
-msgid "Next"
-msgstr "щ_leri"
-
-#: ui/evolution-calendar.xml.h:25
-msgid "Open Calendar"
-msgstr "Takvimi AГ"
-
-#: ui/evolution-calendar.xml.h:28
-msgid "Prev"
-msgstr "Geri"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Yeni Randevu"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "YazdЩrЩlacak olan takvimi Жnizler"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Takvimi yazdЩr"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Bu Takvimi YazdЩr"
 
-#: ui/evolution-calendar.xml.h:34 ui/evolution-message-composer.xml.h:19
-msgid "Save As"
-msgstr "FarklЩ Kaydet"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "щstenen Bilgiler"
 
-#: ui/evolution-calendar.xml.h:35
-msgid "Save calendar as something else"
-msgstr "Takvimi farklЩ kaydet"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "1 gЭn gЖster"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "1 ay gЖster"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "1 hafta gЖster"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "гalЩЧma gЭnlerini gЖster"
 
-#: ui/evolution-calendar.xml.h:41 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
-msgid "Today"
-msgstr "BugЭn"
-
-#: ui/evolution-calendar.xml.h:42
+#: ui/evolution-calendar.xml.h:28
 msgid "W_ork Week"
 msgstr "г_alЩЧma haftasЩ"
 
-#: ui/evolution-calendar.xml.h:43
-msgid "Week"
-msgstr "Hafta"
-
-#: ui/evolution-calendar.xml.h:44
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "_Randevu"
 
-#: ui/evolution-calendar.xml.h:46
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "E-posta AyarlarЩ..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "_GЭn"
 
-#: ui/evolution-calendar.xml.h:47
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "_Ay"
 
-#: ui/evolution-calendar.xml.h:48 ui/evolution.xml.h:58
-msgid "_New"
-msgstr "_Yeni"
-
-#: ui/evolution-calendar.xml.h:49
-msgid "_Open Calendar"
-msgstr "_Takvimi AГ"
-
-#: ui/evolution-calendar.xml.h:54
+#: ui/evolution-calendar.xml.h:37
 msgid "_Week"
 msgstr "_Hafta"
 
-#: ui/evolution-comp-editor.xml.h:1
-msgid "C_lose"
-msgstr "_Kapat"
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Kapat"
 
 #: ui/evolution-comp-editor.xml.h:3
 msgid "Close this appointment"
@@ -9187,7 +10213,7 @@ msgid "Delete this appointment"
 msgstr "Bu randevuyu sil"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:21
 msgid "Main toolbar"
 msgstr "Ana araГ ГubuПu"
 
@@ -9195,7 +10221,7 @@ msgstr "Ana araГ ГubuПu"
 msgid "Preview the printed item"
 msgstr "YazdЩrЩlacak olan ЖПeyi Жnizle"
 
-#: ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
 msgid "Print Pre_view"
 msgstr "YazdЩrma ж_nizlemesi"
 
@@ -9204,22 +10230,15 @@ msgid "Print S_etup"
 msgstr "YazdЩrma _AyarlarЩ"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
-#: ui/evolution-contact-list-editor.xml.h:5
 msgid "Print this item"
 msgstr "Bu ЖПeyi yazdЩr"
 
 #: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:6
 msgid "Print..."
 msgstr "YazdЩr..."
 
-#: ui/evolution-comp-editor.xml.h:14 widgets/misc/e-filter-bar.h:94
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "FarklЩ Kaydet..."
-
 #: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:5
 msgid "Save and Close"
 msgstr "Kaydet ve Kapat"
 
@@ -9239,18 +10258,15 @@ msgstr "GЭncel yazЩcЩ iГin sayfa ayarlarЩnЩ yap"
 msgid "_Action"
 msgstr "E_ylemler"
 
-#: ui/evolution-comp-editor.xml.h:21 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
 #: ui/evolution-mail-messagedisplay.xml.h:10
-#: ui/evolution-message-composer.xml.h:48 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:49
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
 msgid "_File"
 msgstr "_Dosya"
 
-#: ui/evolution-comp-editor.xml.h:22 ui/evolution.xml.h:53
-msgid "_Help"
-msgstr "_YardЩm"
-
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Bu ЖПeyi sil"
@@ -9265,13 +10281,12 @@ msgid "Help"
 msgstr "YardЩm"
 
 #: ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-contact-list-editor.xml.h:4
 msgid "Print En_velope..."
 msgstr "_ZarfЩ YazdЩr..."
 
 #: ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:7
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "_FarklЩ Kaydet..."
 
@@ -9292,26 +10307,31 @@ msgid "Send _message to contact..."
 msgstr "BaПlantЩya _ileti gЖnder..."
 
 #: ui/evolution-contact-editor.xml.h:16
-#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:10
 #: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "_Kaydet"
 
 #: ui/evolution-contact-list-editor.xml.h:2
-msgid "Delete this group"
-msgstr "Bu grubu sil"
+#, fuzzy
+msgid "Delete this list"
+msgstr "Bu ЖПeyi sil"
 
-#: ui/evolution-contact-list-editor.xml.h:9
-msgid "Save the group and close the dialog box"
-msgstr "Bu grubu kaydet ve pencereyi kapat"
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "BaПlantЩyЩ kaydet ve diyalog penceresini kapat"
 
-#: ui/evolution-contact-list-editor.xml.h:10
-msgid "Se_nd group to other..."
-msgstr "G_rubu baЧkasЩna gЖnder..."
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "_BaПlantЩyЩ baЧkasЩna gЖnder..."
 
-#: ui/evolution-contact-list-editor.xml.h:11
-msgid "Send _message to group..."
-msgstr "щletiyi gruba gЖnder..."
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "BaПlantЩya _ileti gЖnder..."
 
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
@@ -9346,7 +10366,7 @@ msgid "Schedule a meeting for this item"
 msgstr "Bu ЖПe _iГin toplantЩ zamanЩ dЭzenle"
 
 #: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:42
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
 msgid "_Actions"
 msgstr "E_ylemler"
 
@@ -9354,6 +10374,10 @@ msgstr "E_ylemler"
 msgid "Customise My Evolution"
 msgstr "Evolution'Щ жzelleЧtir"
 
+#: ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "щptal"
+
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "чimdiki e-posta iЧlemini iptal et"
@@ -9363,78 +10387,83 @@ msgid "Compose"
 msgstr "DЭzenle"
 
 #: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Bir ileti yaz"
+
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit mail accounts and other preferences"
 msgstr "E-posta hesaplarЩnЩ dЭzenle ve diПer seГenekler"
 
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
 msgstr "Yeni iletileri sЭzmek iГin kural oluЧtur"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:7
 msgid "Create or edit virtual folder definitions"
 msgstr "Sanal dizin tanЩmlarЩ oluЧtur/dЭzenle"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
 msgstr "гЖpЭ _BoЧalt"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:9
 msgid "Forget _Passwords"
 msgstr "ParolalarЩ _Unut"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:10
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Bilinen parolalarЩ unut (tЭm parolalarЩ yeniden girmeniz gerekecektir)"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:11
 msgid "Manage _Subscriptions..."
 msgstr "эyelikleri _DЭzenle..."
 
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:12
 msgid "Open a window for composing a mail message"
 msgstr "щletiyi dЭzenlemek iГin bir pencere aГ"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:13
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "TЭm dizindeki tЭm silinmiЧ iletileri tamamen sil"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:14
 msgid "Send / Receive"
 msgstr "Al / GЖnder"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:15
 msgid "Send queued mail and retrieve new mail"
 msgstr "Kuyruktaki iletileri gЖnder ve yeni iletileri al"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "щleti Жnizleme penceresini gЖster"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:17
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Uzak sunuculardaki dizinlere Эyelik iЧlemini gerГekleЧtir"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "Virtual Folder _Editor..."
 msgstr "Sanal Dizin _DЭzenleyici..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Filters..."
 msgstr "_Filtreler..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:20
 msgid "_Mail Message"
 msgstr "_щletiyi GЖnder"
 
-#: ui/evolution-mail-global.xml.h:20
+#: ui/evolution-mail-global.xml.h:21
 msgid "_Mail Settings..."
 msgstr "E-posta AyarlarЩ..."
 
-#: ui/evolution-mail-global.xml.h:21
+#: ui/evolution-mail-global.xml.h:22
 msgid "_Preview Pane"
 msgstr "жnizleme _Panosu"
 
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:23
 msgid "_Send / Receive"
 msgstr "_GЖnder / Al"
 
@@ -9459,14 +10488,14 @@ msgid "Hide _Deleted Messages"
 msgstr "_Silenen щletileri Gizle"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide _Read messages"
+#, fuzzy
+msgid "Hide _Read Messages"
 msgstr "_Okunan щletileri Gizle"
 
 #: ui/evolution-mail-list.xml.h:9
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-"Silinen iletileri Эzerine Гizgi Гekmek yerine gizle"
+msgstr "Silinen iletileri Эzerine Гizgi Гekmek yerine gizle"
 
 #: ui/evolution-mail-list.xml.h:10
 msgid "Mark All as R_ead"
@@ -9484,7 +10513,7 @@ msgstr "щletiyi panoya yapЩЧtЩr"
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Bu dizindeki tЭm silinmiЧ iletileri tamamen sil"
 
-#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "TЭmЭnЭ _SeГ"
 
@@ -9528,7 +10557,7 @@ msgstr "KonumlandЩrЩlan щleti listesi"
 msgid "_Expunge"
 msgstr "_Sil"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:50
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
 msgid "_Folder"
 msgstr "_Dizin"
 
@@ -9536,7 +10565,7 @@ msgstr "_Dizin"
 msgid "_Invert Selection"
 msgstr "S_eГimi Tersine гevir"
 
-#: ui/evolution-mail-list.xml.h:28 ui/evolution.xml.h:60
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Properties..."
 msgstr "ж_zellikler..."
 
@@ -9629,19 +10658,23 @@ msgid "Display the previous unread message"
 msgstr "жnceki okunmamЩЧ iletiyi gЖster"
 
 #: ui/evolution-mail-message.xml.h:24
-msgid "Filter on Mailing _List"
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "_E-posta Listelerine GЖre Filtreleme"
 
 #: ui/evolution-mail-message.xml.h:25
-msgid "Filter on Se_nder"
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "_GЖnderene GЖre Filtreleme"
 
 #: ui/evolution-mail-message.xml.h:26
-msgid "Filter on _Recipients"
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "_AlЩcЩlara GЖre Filtreleme"
 
 #: ui/evolution-mail-message.xml.h:27
-msgid "Filter on _Subject"
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "_Konuya GЖre Filtreleme"
 
 #: ui/evolution-mail-message.xml.h:28
@@ -9688,189 +10721,239 @@ msgstr "SeГilen iletiyi birisine yЖnlendir"
 msgid "Forward the selected message to someone as an attachment"
 msgstr "SeГilen iletiyi birisine eklenti olarak yЖnlendir"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 msgid "Load _Images"
 msgstr "Resimleri _YЭkle"
 
-#: ui/evolution-mail-message.xml.h:39
-msgid "Mar_k As Read"
-msgstr "OkunmuЧ Olarak щЧaretle"
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "жnemli"
 
-#: ui/evolution-mail-message.xml.h:40
-msgid "Mark As U_nread"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
 msgstr "Oku_nmamЩЧ Olarak щЧaretle"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark the selected messages as having been read"
 msgstr "SeГili iletileri okunmuЧ olarak iЧaretle"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "SeГili iletileri silmek iГin iЧaretle"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr "SeГili iletileri okunmamЩЧ olarak iЧaretle"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "SeГili iletileri silmek iГin iЧaretle"
+
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages for deletion"
 msgstr "SeГili iletileri silmek iГin iЧaretle"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "TaЧЩ"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:50
 msgid "Move selected messages to another folder"
 msgstr "SeГili iletileri baЧka bir dizine taЧЩ"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "щ_leri"
+
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Sonraki Жnemli iletiyi gЖster"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "щleti"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Konumu _SeГ"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "(BaЧlЩksЩz щleti)"
+
+#: ui/evolution-mail-message.xml.h:56
 msgid "Open the selected message in a new window"
 msgstr "SeГilen iletiyi yeni bir pencerede aГ"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:57
 msgid "Open the selected message in the composer to re-send it"
 msgstr "SeГilen iletiyi dЭzenleyicide yeniden gЖndermek Эzere aГ"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:58
 msgid "Previews the message to be printed"
 msgstr "YazdЩrЩlacak olan iletiyi Жnizler"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:59
 msgid "Previous"
 msgstr "Geri"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "жnceki Жnemli iletiyi gЖster"
+
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "щletiyi YazdЩr"
+
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "жnceki okunmamЩЧ iletiyi gЖster"
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Print Message..."
 msgstr "щletiyi YazdЩr..."
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:65
 msgid "Print Preview..."
 msgstr "YazdЩrma жnizlemesi..."
 
-#: ui/evolution-mail-message.xml.h:54
-msgid "Print message to the printer"
-msgstr "щletiyi yazЩcЩya gЖnder"
-
-#: ui/evolution-mail-message.xml.h:55
-msgid "Redirect (FIXME: implement me)"
-msgstr "YЖnlendir"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "щletiyi YazdЩr"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:67
 msgid "Reply"
 msgstr "Cevapla"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:68
 msgid "Reply to All"
 msgstr "TЭmЭne cevapla"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:71
 msgid "S_earch Message"
 msgstr "щle_ti Ara"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:72
 msgid "Save the message as a text file"
 msgstr "щletiyi bir dosyaya kaydet"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:73
 msgid "Search for text in the body of the displayed message"
 msgstr "GЖrЭntЭlenen ileti iГinde bir metin ara"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:74
 msgid "Show Email _Source"
 msgstr "щleti _KaynaПЩnЩ GЖster"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:75
 msgid "Show Full _Headers"
 msgstr "_KapsamlЩ BaЧlЩklarЩ GЖster"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:76
 msgid "Show message in the normal style"
 msgstr "щletiyi normal biГemde gЖster"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:77
 msgid "Show message with all email headers"
 msgstr "щletiyi tЭm baЧlЩklarЩyla gЖster"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:78
 msgid "Show the raw email source of the message"
 msgstr "щletinin kaynaПЩnЩ gЖster"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:79
 msgid "Un-delete the selected messages"
 msgstr "SeГilen iletiyi silme"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:80
 msgid "VFolder on Mailing _List..."
 msgstr "_E-posta Listesine GЖre VFolder..."
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:81
 msgid "VFolder on Se_nder..."
 msgstr "_GЖnderene GЖre VFolder..."
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:82
 msgid "VFolder on _Recipients..."
 msgstr "_AlЩcЩlara GЖre VFolder..."
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:83
 msgid "VFolder on _Subject..."
 msgstr "_Konuya GЖre VFolder..."
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "_Filtreleri Uygula"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:85
 msgid "_Copy to Folder"
 msgstr "Dizine _Kopyala"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:86
 msgid "_Create Filter From Message"
 msgstr "щ_letiden Bir Filtre Yarat"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:88
 msgid "_Forward Message"
 msgstr "щletiyi _YЖnlendir"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:89
 msgid "_Message Display"
 msgstr "щleti _GЖrЭnЭmЭ"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:90
 msgid "_Move to Folder"
 msgstr "Dizine _TaЧЩ"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Normal Display"
 msgstr "Normal _GЖsterim"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Open Message"
 msgstr "щ_letiyi AГ "
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Re-send Message"
 msgstr "щ_letiyi Yeniden GЖnder"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Bu pencereyi kapat"
 
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
 msgid "Customi_ze Toolbars..."
 msgstr "_AraГ гubuklarЩnЩ жzelleЧtir..."
 
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:12
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
 msgid "Customize"
 msgstr "ж_zelleЧtir"
 
-#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:13
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
 msgid "Customize toolbars"
 msgstr "AraГ ГubuklarЩnЩ ЖzelleЧtir"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:44 ui/evolution.xml.h:44
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
 msgid "_Close"
 msgstr "_Kapat"
 
 #: ui/evolution-mail-messagedisplay.xml.h:12
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:65
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
 msgid "_View"
 msgstr "_GЖster"
 
@@ -9878,11 +10961,7 @@ msgstr "_GЖster"
 msgid "Attach"
 msgstr "Ekle"
 
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Bir dosya ekle"
-
-#: ui/evolution-message-composer.xml.h:4
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "GЭncel dosyayЩ kapat"
 
@@ -9907,50 +10986,57 @@ msgid "HTML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "Metin dosyasЩ ekle..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Bir dosyayЩ ileti iГine ekle"
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Metin dosyasЩ ekle..."
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Bir dosya aГ"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "PGP чifre"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "PGP щmza"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
 msgstr "S/MIME чifreleme"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr "S/MIME щmza"
 
-#: ui/evolution-message-composer.xml.h:18 widgets/misc/e-filter-bar.c:241
+#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
 msgid "Save"
 msgstr "Kaydet"
 
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save _Draft"
-msgstr "_TaslaПЩ Kaydet"
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "FarklЩ Kaydet"
 
 #: ui/evolution-message-composer.xml.h:22
-msgid "Save in _folder... (FIXME)"
-msgstr "Di_zine kaydet..."
+msgid "Save _Draft"
+msgstr "_TaslaПЩ Kaydet"
 
 #: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Dizine kaydet..."
 
 #: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
 msgid "Save the current file"
 msgstr "чimdiki zamanЩ kaydet"
 
@@ -10023,33 +11109,36 @@ msgid "Toggles whether the Reply-To field is displayed"
 msgstr "YanЩtla alanЩnЩ gЖsterir/gizler"
 
 #: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "Dosya ekle..."
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr "_Gizli AlanЩ"
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr "_Bilgi AlanЩ"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
 msgid "_Debug"
 msgstr "_Hata ayЩkla"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
 msgstr "He_psini sil"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr "_GЖnderen AlanЩ"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "_Ekle"
 
-#: ui/evolution-message-composer.xml.h:51
-msgid "_Insert text file..."
-msgstr "_Metin dosyasЩ ekle..."
-
 #: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "_AГ..."
@@ -10062,31 +11151,35 @@ msgstr "_YanЩtla AlanЩ"
 msgid "_Security"
 msgstr "_GЭvenlik"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "_YardЩm"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Bu dizini Эye dizinler listesine ekle"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Dizin"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Listeyi Tazele"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Dizin Listesini Tazele"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Bu dizini Эye diziler listesinden sil"
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "эye ol"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "эyelikten ГЩk"
 
@@ -10102,6 +11195,10 @@ msgstr "GЖrevi DaПЩt"
 msgid "Re_fresh Task"
 msgstr "GЖrevi _Tazele"
 
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
+msgstr ""
+
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "SeГili gЖrevi kopyala"
@@ -10114,6 +11211,10 @@ msgstr "Yeni bir gЖrev yarat"
 msgid "Cut selected task"
 msgstr "SeГili GЖrevi Sil"
 
+#: ui/evolution-tasks.xml.h:7
+msgid "Delete selected tasks"
+msgstr "SeГilen gЖrevleri sil"
+
 #: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Yeni GЖrev"
@@ -10122,15 +11223,16 @@ msgstr "Yeni GЖrev"
 msgid "Paste task from the clipboard"
 msgstr "Panodan gЖrevi yapЩЧtЩr"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "GЖrevi farklЩ kaydet"
 
-#: ui/evolution-tasks.xml.h:12
-msgid "Tasks Preferences..."
-msgstr "GЖrev Tercihleri..."
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "E-posta AyarlarЩ..."
 
-#: ui/evolution-tasks.xml.h:18
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "_GЖrev"
 
@@ -10146,183 +11248,180 @@ msgstr "_KЩsayol гubuПuna Ekle"
 msgid "Change the name of this folder"
 msgstr "Bu dizinin adЩnЩ deПiЧtir"
 
-#: ui/evolution.xml.h:4
-msgid "Change the properties for this folder"
-msgstr "Bu dizinin Жzelliklerini deПiЧtir"
-
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:6
 msgid "Copy this folder"
 msgstr "Bu Dizini Kopyala"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:7
 msgid "Create _New Folder..."
 msgstr "Yeni Bir _Dizin Yarat..."
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:8
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "KЩsayol ГubuПunda bu dizine bir baПlantЩ oluЧtur"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:9
 msgid "Create a new folder"
 msgstr "Yeni bir dizin yarat"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Bu dizini sil"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "FarklЩ bir dizin gЖster"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "гЩ_k"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:16
 msgid "Evolution _FAQ"
 msgstr "Evolution _SSS"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "Evolution _Penceresi"
 
-#: ui/evolution.xml.h:19
-msgid "Evolution bar _shortcut"
-msgstr "Evolution ГubuПu _kЩsayolu"
-
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Programdan ГЩk"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "_BaЧlangЩГ"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr "Harici dosya biГimini aktar"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:22
 msgid "Move this folder to another place"
 msgstr "Bu dizini baЧka bir yere taЧЩ"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Y_eni Pencerede AГ"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Bu dizini yeni bir pencerede aГ"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Evolution hakkЩnda bilgi ver"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Hata Raporu GЖnder"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "_Hata Raporu GЖnder"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "_Bug Buddy kullanarak hata raporu gЖnder."
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 msgid "Toggle"
 msgstr "AГ/kapat"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Dizin ГubuПunu gЖster/gizle"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Toggle whether to show the shortcut bar"
 msgstr "KЩsayol ГubuПunu gЖster/gizle"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "гevrimiГi/ГevrimdЩЧЩ ГalЩЧ."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "_BaПlantЩ YЖneticisini Kullanarak"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "_Takvim Kullanarak"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "_PostalayЩcЩ Kullanarak"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:37
 msgid "View the selected folder"
 msgstr "SeГili dizini gЖster"
 
-#: ui/evolution.xml.h:40
-msgid "Work Offline"
-msgstr "гevrimdЩЧЩ гalЩЧ"
-
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "_Evolution HakkЩnda..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:41
 msgid "_Appointment (FIXME)"
 msgstr "_Randevu"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:43
 msgid "_Contact (FIXME)"
 msgstr "_BaПlantЩ (FIXME)"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "_Kopyala..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "_Dizin гubuПu"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "Dizine _Git..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "Dosya _ekle..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "щ_ndex"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "щ_letiyi postala"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_Move..."
 msgstr "_TaЧЩ..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "_Yeni"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "_Yeni Dizin"
 
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:58
 msgid "_Rename..."
 msgstr "Y_eniden щsimlendir..."
 
-#: ui/evolution.xml.h:62
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "_KЩsayol гubuПu"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "_KЩsayol гubuПu"
 
-#: ui/evolution.xml.h:63
+#: ui/evolution.xml.h:61
 msgid "_Task (FIXME)"
 msgstr "_GЖrev (FIXME)"
 
-#: ui/evolution.xml.h:66
+#: ui/evolution.xml.h:64
 msgid "_Work Offline"
 msgstr "гe_vrimdЩЧЩ гalЩЧ"
 
@@ -10346,22 +11445,6 @@ msgstr "чirket"
 msgid "Phone List"
 msgstr "Telefon Listesi"
 
-#: views/calendar/galview.xml.h:1
-msgid "Day View"
-msgstr "GЭn GЖrЭnЭmЭ"
-
-#: views/calendar/galview.xml.h:2
-msgid "Month View"
-msgstr "Ay GЖrЭnЭmЭ"
-
-#: views/calendar/galview.xml.h:3
-msgid "Week View"
-msgstr "Hafta GЖrЭnЭmЭ"
-
-#: views/calendar/galview.xml.h:4
-msgid "Work Week View"
-msgstr "гalЩЧma HaftasЩ GЖrЭnЭmЭ"
-
 #: views/mail/galview.xml.h:1
 msgid "By Sender"
 msgstr "GЖnderen"
@@ -10382,9 +11465,12 @@ msgstr "щletiler"
 msgid "With Category"
 msgstr "Kategori"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "GiriЧimli"
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%d %B %A, %Y"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
@@ -10458,13 +11544,6 @@ msgstr "ToplantЩ _bitiЧ saati:"
 msgid "All Attendees"
 msgstr "TЭm KatЩlЩmcЩlar"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%d %B %A, %Y"
-
 #: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "ч_imdiki GЖrЭnЭm"
@@ -10475,45 +11554,129 @@ msgstr "GЖrЭnЭmleri TanЩmla"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:422
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "PSгPCCP"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "чimdi"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "BugЭn"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "Tamam"
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "GЭn %s biГiminde girilmelidir."
 
+#: widgets/misc/e-charset-picker.c:59
+#, fuzzy
+msgid "Baltic"
+msgstr "Temel"
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "hafta"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "гЖp"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "щletiЧim kurulamadЩ"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "Haberler"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Bilinmeyen hata: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+#, fuzzy
+msgid "Enter the character set to use"
+msgstr "жntanЩmlЩ karakter kЭmesi: "
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "DiПer"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "щletiЧim DЭzenleyici"
+
+#: widgets/misc/e-filter-bar.c:173
 msgid "Save Search"
 msgstr "AramayЩ Kaydet"
 
-#: widgets/misc/e-filter-bar.c:239
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "GeliЧmiЧ Arama"
 
-#: widgets/misc/e-filter-bar.h:95 widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "TЭmЭnЭ GЖster"
 
-#: widgets/misc/e-filter-bar.h:97 widgets/misc/e-filter-bar.h:104
+#: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "GeliЧmiЧ..."
 
@@ -10565,3 +11728,257 @@ msgstr "init_corba(): GNOME baЧlatЩlamadЩ"
 #: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo baЧlatЩlamadЩ"
+
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "Tercihleri deПiЧtir"
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "GЖrev Tercihleri..."
+
+#~ msgid "???"
+#~ msgstr "???"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "_BaПlantЩlar..."
+
+#~ msgid "_Company:"
+#~ msgstr "ч_irket:"
+
+#~ msgid "(none)"
+#~ msgstr "(hiГbiri)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Notification about your journal entry starting on %s and ending on %s"
+#~ msgstr "%d %b %A, %Y %H:%M tarihindeki toplantЩ iГin uyarЩ"
+
+#, fuzzy
+#~ msgid "Notification about your journal entry starting on %s"
+#~ msgstr "%d %b %A, %Y %H:%M tarihindeki toplantЩ iГin uyarЩ"
+
+#, fuzzy
+#~ msgid "Notification about your journal entry ending on %s"
+#~ msgstr "%d %b %A, %Y %H:%M tarihindeki toplantЩ iГin uyarЩ"
+
+#, fuzzy
+#~ msgid "Notification about your journal entry"
+#~ msgstr "%d %b %A, %Y %H:%M tarihindeki toplantЩ iГin uyarЩ"
+
+#~ msgid "Open calendar"
+#~ msgstr "Takvimi aГ"
+
+#~ msgid "Save calendar"
+#~ msgstr "Takvimi kaydet"
+
+#~ msgid "Show a dialog"
+#~ msgstr "Bir pencere gЖster"
+
+#~ msgid "Settings..."
+#~ msgstr "Ayarlar..."
+
+#~ msgid "Percent complete"
+#~ msgstr "Biten yЭzde"
+
+#~ msgid "Edit this task"
+#~ msgstr "Bu gЖrevi dЭzenle"
+
+#~ msgid "Go to Today"
+#~ msgstr "BugЭne Git"
+
+#~ msgid "Delete all Occurrences"
+#~ msgstr "TЭm OluЧumlarЩ Sil"
+
+#~ msgid "Summary contains"
+#~ msgstr "жzet iГeriПi"
+
+#~ msgid "Description contains"
+#~ msgstr "AГЩklama iГeriПi"
+
+#~ msgid "Comment contains"
+#~ msgstr "Yorum iГeriПi"
+
+#~ msgid "Has category"
+#~ msgstr "Kategori"
+
+#~ msgid "time-now expects 0 arguments"
+#~ msgstr "time-now hiГ argЭman istemiyor"
+
+#~ msgid "make-time expects 1 argument"
+#~ msgstr "make-time 1 argЭman istiyor"
+
+#~ msgid "make-time expects argument 1 to be a string"
+#~ msgstr "make-time iГin birinci argЭman bir dizi olmalЩdЩr."
+
+#~ msgid "make-time argument 1 must be an ISO 8601 date/time string"
+#~ msgstr "make-time 1. argЭmanЩ ISO 8601 tarih/saat bilgisi olmalЩdЩr"
+
+#~ msgid "time-add-day expects 2 arguments"
+#~ msgstr "time-add-day 2 argЭman istiyor"
+
+#~ msgid "time-add-day expects argument 2 to be an integer"
+#~ msgstr "time-add-day 2. argЭmanЩ bir sayЩ istiyor"
+
+#~ msgid "time-day-begin expects 1 argument"
+#~ msgstr "time-day-begin bir argЭman istiyor"
+
+#~ msgid "time-day-begin expects argument 1 to be a time_t"
+#~ msgstr "time-day-begin birinci argЭmanЩ time_t biГiminde istiyor"
+
+#~ msgid "time-day-end expects 1 argument"
+#~ msgstr "time-day-end bir argЭman istiyor"
+
+#~ msgid "time-day-end expects argument 1 to be a time_t"
+#~ msgstr "time-day-end birinci argЭmanЩ time_t biГiminde istiyor"
+
+#~ msgid "get-vtype expects 0 arguments"
+#~ msgstr "get-vtype hiГ argЭman istemiyor"
+
+#~ msgid "occur-in-time-range? expects 2 arguments"
+#~ msgstr "ocrur-in-time-range? iki argЭman istiyor"
+
+#~ msgid "contains? expects 2 arguments"
+#~ msgstr "contains? iki argЭman istiyor"
+
+#~ msgid "contains? expects argument 1 to be a string"
+#~ msgstr "contains? birinci argЭmanЩ dizgi Чeklinde istiyor"
+
+#~ msgid "contains? expects argument 2 to be a string"
+#~ msgstr "contains? ikinci argЭmanЩ dizgi Чeklinde istiyor"
+
+#~ msgid "has-categories? expects all arguments to be strings"
+#~ msgstr "has-categories? tЭm argЭmanlarЩ dizgi Чeklinde istiyor"
+
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "IMAP dizini taranЩyor"
+
+#~ msgid "Forward to Address"
+#~ msgstr "Adrese YЖnlendir"
+
+#~ msgid "Elm Aliases"
+#~ msgstr "Elm Takma щsimleri"
+
+#~ msgid "Addressbooks"
+#~ msgstr "Adres Defterleri"
+
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "\"%s\" biГiminden \"%s\" biГimine geГ"
+
+#~ msgid "Reconfiguring folder"
+#~ msgstr "Dizin yeniden yapЩlandЩrЩlЩyor"
+
+#~ msgid "Closing current folder"
+#~ msgstr "GeГerli dizin kapatЩlЩyor"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Yeni dizinin adЩ deПiЧtiriliyor ve aГЩlЩyor"
+
+#~ msgid "Creating new folder"
+#~ msgstr "Yeni dizin yaratЩlЩyor"
+
+#~ msgid "Copying messages"
+#~ msgstr "щletiler kopyalanЩyor"
+
+#~ msgid "Evolution progress"
+#~ msgstr "Evolution iЧlemleri"
+
+#~ msgid "Moving folder %s to %s"
+#~ msgstr "%s dizini %s adresine taЧЩnЩyor"
+
+#~ msgid "Copying folder %s to %s"
+#~ msgstr "%s dizini %s adresine kopyalanЩyor"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "%d/%d ileti alЩnЩyor (uid \"%s\")"
+
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "%d/%d ileti kaydediliyor (uid \"%s\")"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (yЖnlendirilmiЧ ileti)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "щlt: (konusuz)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "YЖnlendirilmiЧ ileti (konusuz)"
+
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+#~ "%s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----YЖnlendirilmiЧ щleti-----<br><b>GЖnderen:</b> %s<br><b>AlЩcЩ:</b> "
+#~ "%s<br><b>Konu:</b> %s<br>"
+
+#~ msgid "<b>Error downloading Metar</b>"
+#~ msgstr "<b>Metar indirirken bir hata oluЧtu</b>"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Evolution dosyalarЩ baЧarЩyla kuruldu."
+
+#~ msgid "5 Days"
+#~ msgstr "5 GЭn"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Yeni bir takvim yarat"
+
+#~ msgid "Day"
+#~ msgstr "GЭn"
+
+#~ msgid "Month"
+#~ msgstr "Ay"
+
+#~ msgid "New _Event"
+#~ msgstr "Yeni _Olay"
+
+#~ msgid "Open Calendar"
+#~ msgstr "Takvimi AГ"
+
+#~ msgid "Prev"
+#~ msgstr "Geri"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Takvimi farklЩ kaydet"
+
+#~ msgid "Week"
+#~ msgstr "Hafta"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "_Takvimi AГ"
+
+#~ msgid "Delete this group"
+#~ msgstr "Bu grubu sil"
+
+#~ msgid "Save the group and close the dialog box"
+#~ msgstr "Bu grubu kaydet ve pencereyi kapat"
+
+#~ msgid "Se_nd group to other..."
+#~ msgstr "G_rubu baЧkasЩna gЖnder..."
+
+#~ msgid "Send _message to group..."
+#~ msgstr "щletiyi gruba gЖnder..."
+
+#~ msgid "Mar_k As Read"
+#~ msgstr "OkunmuЧ Olarak щЧaretle"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Oku_nmamЩЧ Olarak щЧaretle"
+
+#~ msgid "Print message to the printer"
+#~ msgstr "щletiyi yazЩcЩya gЖnder"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "YЖnlendir"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Di_zine kaydet..."
+
+#~ msgid "_Insert text file..."
+#~ msgstr "_Metin dosyasЩ ekle..."
+
+#~ msgid "Change the properties for this folder"
+#~ msgstr "Bu dizinin Жzelliklerini deПiЧtir"
+
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Evolution ГubuПu _kЩsayolu"
diff --git a/po/uk.po b/po/uk.po
index ec6674beee..622fbcf916 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2001-04-28 02:04-0400\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2000-04-04 15:25+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -13,11 +13,20 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import VCard files into Evolution."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Картка: "
 
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +34,7 @@ msgstr ""
 "\n"
 "╤м'я: "
 
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,31 +42,31 @@ msgstr ""
 "\n"
 "  Преф╕кс:    "
 
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -65,7 +74,7 @@ msgstr ""
 "\n"
 "Дата народження: "
 
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -73,7 +82,7 @@ msgstr ""
 "\n"
 "Адреса:"
 
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -81,13 +90,13 @@ msgstr ""
 "\n"
 "  Поштова скринька: "
 
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -95,7 +104,7 @@ msgstr ""
 "\n"
 "  Вулиця:      "
 
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -103,7 +112,7 @@ msgstr ""
 "\n"
 "  М╕сто:       "
 
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -111,7 +120,7 @@ msgstr ""
 "\n"
 "  Ре╜╕он:      "
 
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -119,7 +128,7 @@ msgstr ""
 "\n"
 "  ╤ндекс:      "
 
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -127,13 +136,13 @@ msgstr ""
 "\n"
 "  Кра╖на:      "
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -141,7 +150,7 @@ msgstr ""
 "\n"
 "Телефони:\n"
 
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -149,7 +158,7 @@ msgstr ""
 "\n"
 "Телефон:"
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -157,7 +166,7 @@ msgstr ""
 "\n"
 "Електронна пошта:\n"
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -165,7 +174,7 @@ msgstr ""
 "\n"
 "Електронна адреса: "
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -173,7 +182,7 @@ msgstr ""
 "\n"
 "Поштова програма: "
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -181,7 +190,7 @@ msgstr ""
 "\n"
 "Часовий пояс: "
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -189,7 +198,7 @@ msgstr ""
 "\n"
 "Розташування: "
 
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -197,7 +206,7 @@ msgstr ""
 "\n"
 "Помада: "
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -205,7 +214,7 @@ msgstr ""
 "\n"
 "Орган╕зац╕я: "
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -213,31 +222,31 @@ msgstr ""
 "\n"
 "  ╤м'я:  "
 
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -245,7 +254,7 @@ msgstr ""
 "\n"
 "Категор╕╖: "
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -263,13 +272,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -277,27 +286,25 @@ msgstr ""
 "\n"
 "Публ╕чний ключ: "
 
-#: addressbook/backend/ebook/e-destination.c:232
-msgid "???"
-msgstr ""
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:4037
+#, fuzzy
+msgid "Multiple VCards"
+msgstr "Надрукувати пов╕домлення"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:4045
+#, fuzzy, c-format
+msgid "VCard for %s"
+msgstr "Введ╕ть пароль для %s"
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 
@@ -310,14 +317,14 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Не вдалося запустити сервер Wombat"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Не вдалось запустити Wombat"
 
@@ -326,723 +333,851 @@ msgstr "Не вдалось запустити Wombat"
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Канал адресно╖ книги Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "Компонент Evolution для обробки контакт╕в."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution addressbook component."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#, fuzzy
+msgid "Factory for the sample Addressbook control"
+msgstr "Клацн╕ть тут щоб викликати адресну книгу"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "Сервер LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Файл"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Нев╕домий тип адресно╖ книги"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Пароль"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Нев╕домий тип авторизац╕╖"
+
+#: addressbook/gui/component/addressbook-config.c:177
+#, fuzzy
+msgid "Base"
+msgstr "Вставити"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:181
+#, fuzzy
+msgid "Subtree"
+msgstr "Джерело"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Запам'ятати цей пароль"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "Комп'ютер:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Порт:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Аутенф╕кац╕я:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Шлях:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "Створити шлях, якщо його не ╕сну╓."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "Виправити адресну книгу"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "Додати адресну книгу"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "╤м'я:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Опис:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr ""
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
+msgid "Addressbook Sources"
+msgstr "Джерело адресно╖ книги"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Стерти"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "╤м'я:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
 msgstr "Додати"
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "Редагування"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "╤нш╕ контакти"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "Введ╕ть пароль для %s"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Не вдалося в╕дкрити адресну книгу"
+
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
+msgstr "Будь-яке поле м╕стить"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "╤м'я м╕стить"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "Електронна адреса м╕стить"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "╤м'я м╕стить"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "URI теки, що буде в╕дображено переглядачем"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "Первинна е-пошта"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "Е-пошта 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "Е-пошта 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "Вибрати файл"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Створити новий контакт"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "Виправити адресну книгу"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "Виправлення контактно╖ ╕нформац╕╖"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "Додати до контакт╕в"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "Електронна адреса:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "Заборонити запити"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Дозволити запити (небезпечно!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#, fuzzy
+msgid "Evolution's addressbook name selection interface."
+msgstr "Канал адресно╖ книги Evolution"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Видалити"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "Видалити все"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "Sendmail"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "╤нш╕ контакти"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "Адресати пов╕домлення"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "Вибрати назви"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "Вибер╕ть назву з списку:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "Категор╕я:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "Пошук"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "Робота"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "Робочий факс:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "Зв'язки..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Категор╕╖..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Редактор контакт╕в"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Подробиц╕"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Загальне"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Новий тип телефона"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "Нотатки:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Ор╕╓нтац╕я:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Типи телефон╕в"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
-msgstr "Первинна е-пошта"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "Хоче отримувати листи в HTML"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Адреса стор╕нки WWW:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
-msgstr "Додати"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "Адреса..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "╤м'я пом╕чника:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "Дата народження:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "Робоча"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "Компан╕я:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "Контакти..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:625 mail/mail-config.glade.h:75
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:98
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "Стерти"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "В╕дд╕л:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "Повне ╕м'я..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "Домашня"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "Посада:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "╤м'я кер╕вника:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "Моб╕льний телефон"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "Пр╕звисько:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "Оф╕с:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "Профес╕я:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "Це поштова адреса"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Стерти контакт?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Пом╕чник"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Робоча"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Робоча 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Робочий факс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Авто"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Компан╕я"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Домашня"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Домашня 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Домашн╕й факс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Моб╕льний"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "╤нша"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "╤нший факс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Пейджер"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Первинний"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Рад╕о"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Телекс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
-msgid "Email 2"
-msgstr "Е-пошта 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
-msgid "Email 3"
-msgstr "Е-пошта 3"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Стерти контакт?"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:233
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Швидке додавання контакту"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:235
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "Виправлення повного ╕мен╕"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:276
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Повне ╕м'я"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:282
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "Е-пошта"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Адреса _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Канада"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Перев╕рка адреси"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Кра╖на:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Ф╕нлянд╕я"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "США"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "Адреса:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "М╕сто:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "А/С:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "Штат/область:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "╤ндекс:"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Перев╕рити повне ╕м'я"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Доктор"
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "Молодший"
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 #, fuzzy
 msgid "Miss"
 msgstr "╕сну╓"
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "╤м'я:"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "Пр╕звище:"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "По-батьков╕:"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "Титул:"
 
-#: addressbook/gui/component/addressbook.c:241
-msgid "As _Minicards"
-msgstr "Як _Minicards"
-
-#: addressbook/gui/component/addressbook.c:247
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:399
-#, c-format
-msgid "Enter password for %s"
-msgstr "Введ╕ть пароль для %s"
-
-#: addressbook/gui/component/addressbook.c:427
-msgid "Unable to open addressbook"
-msgstr "Не вдалося в╕дкрити адресну книгу"
-
-#: addressbook/gui/component/addressbook.c:432
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:555
-msgid "Show All"
-msgstr "Показати все"
-
-#: addressbook/gui/component/addressbook.c:557
-msgid "Advanced..."
-msgstr "Додатково..."
-
-#: addressbook/gui/component/addressbook.c:587 calendar/gui/gnome-cal.c:236
-msgid "Any field contains"
-msgstr "Будь-яке поле м╕стить"
-
-#: addressbook/gui/component/addressbook.c:588
-msgid "Name contains"
-msgstr "╤м'я м╕стить"
-
-#: addressbook/gui/component/addressbook.c:589
-msgid "Email contains"
-msgstr "Електронна адреса м╕стить"
-
-#: addressbook/gui/component/addressbook.c:732
-msgid "The URI that the Folder Browser will display"
-msgstr "URI теки, що буде в╕дображено переглядачем"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "Сервер LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Файл"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Нев╕домий тип адресно╖ книги"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
-msgid "Password"
-msgstr "Пароль"
-
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:170
-msgid "Unknown auth type"
-msgstr "Нев╕домий тип авторизац╕╖"
-
-#: addressbook/gui/component/addressbook-config.c:179
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #, fuzzy
-msgid "Base"
-msgstr "Вставити"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "One"
-msgstr ""
+msgid "List _name:"
+msgstr "Назва файлу:"
 
-#: addressbook/gui/component/addressbook-config.c:183
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
 #, fuzzy
-msgid "Subtree"
-msgstr "Джерело"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Unknown scope type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:353
-msgid "Bind DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:354
-msgid "FIXME Bind DN Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
-msgstr "Запам'ятати цей пароль"
-
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
-msgid "Host:"
-msgstr "Комп'ютер:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Host help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Port:"
-msgstr "Порт:"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:435
-msgid "Search Scope:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:489
-msgid "Authentication:"
-msgstr "Аутенф╕кац╕я:"
-
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
-msgid "Path:"
-msgstr "Шлях:"
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "FIXME Path Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:513
-msgid "Create path if it doesn't exist."
-msgstr "Створити шлях, якщо його не ╕сну╓."
-
-#: addressbook/gui/component/addressbook-config.c:647
-msgid "Edit Addressbook"
-msgstr "Виправити адресну книгу"
-
-#: addressbook/gui/component/addressbook-config.c:649
-msgid "Add Addressbook"
-msgstr "Додати адресну книгу"
-
-#: addressbook/gui/component/addressbook-config.c:665
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
-msgid "Name:"
-msgstr "╤м'я:"
-
-#: addressbook/gui/component/addressbook-config.c:672
-msgid "FIXME Name help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:674
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Опис:"
-
-#: addressbook/gui/component/addressbook-config.c:675
-msgid "FIXME Description help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Джерело адресно╖ книги"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:19
-#: mail/message-browser.c:203 ui/evolution-addressbook.xml.h:3
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Стерти"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "Виправити"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "╤м'я:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
-msgstr "╤нш╕ контакти"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "Заборонити запити"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "Дозволити запити (небезпечно!)"
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
-msgstr "Виправлення контактно╖ ╕нформац╕╖"
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
-msgid "Add to Contacts"
-msgstr "Додати до контакт╕в"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr ""
+msgid "Members"
+msgstr "Нагадування"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 #, fuzzy
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Канал адресно╖ книги Evolution"
+msgid "_Remove"
+msgstr "Видалити"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "Компонент Evolution для обробки контакт╕в."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "Редактор контакт╕в"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
 #, fuzzy
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+msgid "Contact List Editor"
+msgstr "Редактор контакт╕в"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
 #, fuzzy
-msgid "Factory for the Evolution addressbook component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+msgid "New Contact:"
+msgstr "Новий контакт"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
 #, fuzzy
-msgid "Factory for the sample Addressbook control"
-msgstr "Клацн╕ть тут щоб викликати адресну книгу"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
-msgstr "Видалити"
+msgid "Original Contact:"
+msgstr "╤нш╕ контакти"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
-msgid "Remove All"
-msgstr "Видалити все"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
+msgid ""
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
+msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
-msgid "Evolution's addressbook name selection interface."
-msgstr "Канал адресно╖ книги Evolution"
+msgid "Changed Contact:"
+msgstr "╤нш╕ контакти"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Шукати..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Адресати пов╕домлення"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Вибрати назви"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Вибер╕ть назву з списку:"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
+msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Пошук"
 
@@ -1154,159 +1289,255 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "Зберегти як VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr "В╕д╕слати контакт ╕ншому"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Send message to contact"
 msgstr "В╕д╕слати пов╕домлення за контактом"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/message-browser.c:200
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:55 ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Друкувати"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr "Надрукувати конверт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Стерти"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "Помилка завантаження %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "Джерела"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Нев╕дома помилка"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "Перенесення"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "Файлу не знайдено"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Операц╕я не п╕дтриму╓ться"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "В╕дм╕нено"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "Помилка вводу/виводу"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "Помилка завантаження %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Помилка завантаження %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Помилка завантаження %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "Помилка завантаження %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr "Помилка зчитування файлу пошти: %s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* Клацн╕ть тут щоб додати контакт *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 #, fuzzy
 msgid "File As"
 msgstr "Файл"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "Е-пошта"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "Первинний телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr "Телефлн пом╕чника"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "Робочий телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "Телефон компан╕╖"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "Домашн╕й телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Орган╕зац╕я"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "Робоча адреса"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "Домашня адреса"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "Моб╕льний телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "Автомоб╕льний телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "Робочий телеофн 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "Домашн╕й телефон 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "╤нший телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "╤нша адреса"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Сайт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "В╕дд╕л"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Оф╕с"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 #, fuzzy
 msgid "Title"
 msgstr "Титул:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Профес╕я"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Кер╕вник"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Пр╕звисько"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 #, fuzzy
 msgid "Spouse"
 msgstr "Джерело"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Прим╕тки"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "Нема╓"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "Завантаження календаря..."
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Зберегти у адресн╕й книз╕"
 
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1345,7 +1576,8 @@ msgid "Dimensions:"
 msgstr "Розм╕ри:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Шрифт..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1405,7 +1637,6 @@ msgid "Margins"
 msgstr "Поля"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "К╕льк╕сть стовпчик╕в:"
 
@@ -1486,40 +1717,67 @@ msgid "Width:"
 msgstr "Ширина:"
 
 #: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "label26"
+#, fuzzy
+msgid "_Font..."
+msgstr "Шрифт..."
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Сон"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#, fuzzy
+msgid "Evolution calendar executive summary component."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Гаразд"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Канал календаря Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#, fuzzy
+msgid "Factory for the Calendar Summary component."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the calendar iTip view control"
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the sample Calendar control"
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1529,141 +1787,254 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:56
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "початок зустр╕ч╕"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, c-format
+msgid "Notification about your task starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, c-format
+msgid "Notification about your task ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "Показати ╕нформац╕ю про Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Закрити"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "Сон"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "Час сну (в хвилинах)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "Виправити зустр╕ч"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+msgid "No description available."
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "Сон"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Гаразд"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
 "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
 "know."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:93 calendar/gui/main.c:52
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
 msgid "Could not initialize GNOME"
 msgstr "Не вдалось ╕н╕ц╕ал╕зувати GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:108
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Не вдалось ╕н╕ц╕ал╕зувати Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "Неможливо створити тимчасовий каталог: %s"
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
-msgstr "Файлу не знайдено"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A, %d %B %Y"
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
-msgstr "В╕дкрити календар"
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
-msgstr "Зберегти календар"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: calendar/gui/calendar-commands.c:468
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1606
-#: calendar/gui/event-editor.c:1633
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:690
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Високий"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
-#: calendar/gui/calendar-model.c:1572
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:689
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Звичайний"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:688
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Низький"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Прозорий"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Непрозорий"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Не розпочато"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "Викону╓ться"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "Завершено"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:544
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "В╕дм╕нено"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:802
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1674,23 +2045,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:882
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
-#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1179
-#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
-#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Нема╓"
 
-#: calendar/gui/calendar-model.c:970
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1700,119 +2075,295 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1010
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Значення в╕дсотка ма╓ бути м╕ж 0 та 100, включно"
 
-#: calendar/gui/calendar-model.c:1051
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1064
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Невизначено"
 
-#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1574
+#: calendar/gui/calendar-model.c:1710
 #, fuzzy
 msgid "Recurring"
 msgstr "Повторення"
 
-#: calendar/gui/calendar-model.c:1576
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Прив'язано"
 
-#: calendar/gui/calendar-model.c:1582
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Так"
 
-#: calendar/gui/calendar-model.c:1582
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Н╕"
 
-#: calendar/gui/calendar-summary.c:198
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
 #, fuzzy
-msgid "%A, %e %B %Y"
-msgstr "%A, %d %B %Y"
+msgid "Day View"
+msgstr "Картка: "
 
-#: calendar/gui/calendar-summary.c:207
-msgid "Appointments"
-msgstr "Зустр╕ч╕"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "Робочий тиждень"
 
-#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "Тиждень"
 
-#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:948
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Завдання"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "М╕сяць"
 
-#: calendar/gui/calendar-summary.c:443
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Помилка завантаження календаря</b>"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "URI, який в╕добразить календар"
 
-#: calendar/gui/calendar-summary.c:455
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Помилка завантаження календаря:<br>Метод не п╕дтриму╓ться"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "Звуков╕ си╜нали"
 
-#: calendar/gui/calendar-summary.c:622
+#: calendar/gui/dialogs/alarm-options.c:363
 #, fuzzy
-msgid "Display"
-msgstr "День"
+msgid "Message Alarm Options"
+msgstr "Адресати пов╕домлення"
 
-#: calendar/gui/calendar-summary.c:627
-msgid "Show appointments"
-msgstr "Показати зустр╕ч╕"
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "Параметри в╕дображення"
 
-#: calendar/gui/calendar-summary.c:635
-msgid "Show tasks"
-msgstr "Показати завдання"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:690
-msgid "Things to do"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Завантаження календаря"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "URI, який в╕добразить календар"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "Заголовок пов╕домлення"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+msgid "Play sound:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "Запустити програму"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Закрити"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#, fuzzy
+msgid "days"
+msgstr "Т╕ло"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Виправити зустр╕ч"
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+msgid "extra times every"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Час сну (в хвилинах)"
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr "Т╕ло"
+
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr " 1 день"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr "Тиждень"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr "Показати 1 тиждень"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr "24 години"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr " 1 година"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr " %d хвилин"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr "10 хвилин"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr "В╕д╕слати"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr " 1 секунда"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "Поштову пов╕домлення"
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an email"
+msgstr "В╕д╕слати пошту"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr "Запустити програму"
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr " перед початком зустр╕ч╕"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr " п╕сля початку зустр╕ч╕"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr " перед к╕нцем зустр╕ч╕"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr " п╕сля к╕нця зустр╕ч╕"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "Вставити"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "Дата й час"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "Нагадування"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Зведення:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "Параметри"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "п╕сля"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "перед"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#, fuzzy
+msgid "day(s)"
+msgstr "Т╕ло"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr "к╕нець зустр╕ч╕"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+#, fuzzy
+msgid "hour(s)"
+msgstr "година"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#, fuzzy
+msgid "minute(s)"
+msgstr "хвилина"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
+msgstr "початок зустр╕ч╕"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
@@ -1843,36 +2394,36 @@ msgid "60 minutes"
 msgstr "60 хвилин"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
+msgid "Beep when alarm windows appear."
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Звуков╕ си╜нали"
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
+msgid "Calendar"
+msgstr "Календар"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
-msgstr ""
+msgid "Calendar Preferences"
+msgstr "Параметри календаря"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
-msgid "Calendar"
-msgstr "Календар"
+msgid "Color for overdue tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
-msgstr "Параметри календаря"
+msgid "Color for tasks due today"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Кольори"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+msgid "Compress weekends in month view"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+msgid "Date Navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1881,595 +2432,1094 @@ msgid "Defaults"
 msgstr "Подробиц╕"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Параметри в╕дображення"
+#: mail/mail-config.glade.h:30
+#, fuzzy
+msgid "Display"
+msgstr "День"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "К╕нець дня:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Перший день тижня:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "Птн"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:484
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "П'ятниця"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "П╕дсв╕тка"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "Пнд"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Понед╕лок"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+msgid "Overdue tasks"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
-msgstr "Виб╕р кольору"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "Пр╕оритет"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Нагадувати про вс╕ зустр╕ч╕"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Нагадування"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "Сбт"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:485
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Субота"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Показати"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "Показати час завершення зустр╕чей"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Показати номера тижн╕в"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "Початок дня:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "Ндл"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:486
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Нед╕ля"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "Панель завдань"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "Завдання"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "Tasks due today"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "Чтв"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Четвер"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr ""
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Time"
+msgstr "Титул:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "Розд╕лювач╕ часу:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Формат часу:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"Часовий пояс: "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "Втр"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "В╕второк"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "В╕зуальн╕ си╜нали"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "Срд"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Середа"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
 msgstr "Робочий тиждень"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
 #, fuzzy
-msgid "seconds."
-msgstr "В╕д╕слати"
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "Ви впевнен╕, що хочете стерти завдання"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "Ви впевнен╕, що хочете стерти завдання \"%s\"?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "Ви впевнен╕, що хочете стерти запис в журнал╕ \"%s\"?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "Завершено"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "Завершено"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+msgid "Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "Виправити зустр╕ч"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "Зустр╕ч - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "Завдання - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Журнальний запис - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Нема╓ зведення"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "Переписати файл?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Файл з ц╕╓ю назвою вже ╕сну╓.\n"
+"Переписати його?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+#, fuzzy
+msgid "Save As..."
+msgstr "Зберегти як..."
 
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Ви впевнен╕, що хочете стерти зустр╕ч \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:73
+#: calendar/gui/dialogs/delete-comp.c:87
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Ви впевнен╕, що хочете стерти цю неназвану зустр╕ч?"
 
-#: calendar/gui/dialogs/delete-comp.c:79
+#: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Ви впевнен╕, що хочете стерти завдання \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:82
+#: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Ви впевнен╕, що хочете стерти це неназване завдання?"
 
-#: calendar/gui/dialogs/delete-comp.c:88
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Ви впевнен╕, що хочете стерти запис в журнал╕ \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Ви впевнен╕, що хочете стерти цей неназваний запис в журнал╕?"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Ви хочете зм╕нити зм╕ни?"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "Ви впевнен╕, що хочете стерти зустр╕ч \"%s\"?"
 
-#: calendar/gui/dialogs/task-editor.c:707
-msgid "Edit Task"
-msgstr "Виправити завдання"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "Ви впевнен╕, що хочете стерти завдання \"%s\"?"
 
-#: calendar/gui/dialogs/task-editor.c:713 calendar/gui/event-editor.c:382
-msgid "No summary"
-msgstr "Нема╓ зведення"
+#: calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "Ви впевнен╕, що хочете стерти запис в журнал╕ \"%s\"?"
 
-#: calendar/gui/dialogs/task-editor.c:719 calendar/gui/event-editor.c:388
-#, c-format
-msgid "Appointment - %s"
-msgstr "Зустр╕ч - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Вибрати файл"
 
-#: calendar/gui/dialogs/task-editor.c:722 calendar/gui/event-editor.c:391
-#, c-format
-msgid "Task - %s"
-msgstr "Завдання - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Розд╕ли:"
 
-#: calendar/gui/dialogs/task-editor.c:725 calendar/gui/event-editor.c:394
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Журнальний запис - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Часовий пояс: "
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% завершення:"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
+msgstr "Зустр╕ч"
+
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
+msgstr "Нагадування"
+
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
+msgstr "Повторення"
+
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "Скасувати зустр╕ч"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Класиф╕кац╕я"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Date & Time"
 msgstr "Дата й час"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Дата виконання:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Pri_vate"
 msgstr "Особисте"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "Поступ"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "Публ╕чне"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Час початку:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "Зведення:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Завдання"
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
+msgid "_Confidential"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "Час завершення:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Confidential"
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "Дата початку:"
+
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "Контакти..."
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Назва групи:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
 #, fuzzy
-msgid "_Due Date:"
-msgstr "В╕дд╕л:"
+msgid "Resource"
+msgstr "Джерело паперу:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "Пр╕оритет:"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "Стан:"
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
-msgstr "Категор╕╖"
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+#, fuzzy
+msgid "Required Participant"
+msgstr "Потр╕бн╕ люди"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Completion Date"
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Додати д╕ю"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Accepted"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr "Стерто"
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Стерто"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "Викону╓ться"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Автомоб╕льний телефон"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Потр╕бн╕ люди"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Потр╕бн╕ люди"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Потр╕бн╕ люди"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "В╕д╕слано"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "Стерти..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#, fuzzy
+msgid "Attendee"
+msgstr "Весь супров╕д"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
 msgstr "Дата завершення"
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "End Date"
-msgstr "Дата к╕нця"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "Стерто"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Start Date"
-msgstr "Дата початку"
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "Стерто"
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
-msgstr "Географ╕чне положення"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "Кер╕вник"
 
-#: calendar/gui/e-calendar-table.c:164
-msgid "Percent complete"
-msgstr "В╕дсоток виконання"
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+msgid "Member"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Summary"
-msgstr "Зведення"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
-msgstr "Прозор╕сть"
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#, fuzzy
+msgid "Role"
+msgstr "Моб╕льний"
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
-msgstr "URL"
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Стан"
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
-msgstr "Си╜нали"
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+#, fuzzy
+msgid "Type"
+msgstr "Тип:"
 
-#: calendar/gui/e-calendar-table.c:170
-msgid "Click here to add a task"
-msgstr "Клацн╕ть тут щоб додати завдання"
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Орган╕затор:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Орган╕затор:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "Запросити ╕нших..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Орган╕затор:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+#, fuzzy
+msgid "on"
+msgstr "Пнд"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "день"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+#, fuzzy
+msgid "on the"
+msgstr "м╕сяць"
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr " "
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+#, fuzzy
+msgid "occurrences"
+msgstr "Джерела"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#, fuzzy
+msgid "Custom recurrence"
+msgstr "Без повторення"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Кожен"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "Виключення"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
+msgstr "Без повторення"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
+msgstr "Перегляд"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
+msgstr "Правило повторення"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
+msgstr "Просте повторення"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "Зм╕нити"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "в"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "завжди"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "м╕сяць"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#, fuzzy
+msgid "week(s)"
+msgstr "Тиждень"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
+msgstr "р╕к"
+
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr "Ви хочете зм╕нити зм╕ни?"
+
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "Дата виконання:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "Стерто"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "Стерто"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "Нема╓"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "Завдання"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% завершення:"
+
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
+msgstr "Поступ"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "Час початку:"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
+#, fuzzy
+msgid "_Due Date:"
+msgstr "В╕дд╕л:"
+
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
+msgstr "Пр╕оритет:"
+
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
+msgstr "Стан:"
+
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "Позначити як виконане"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "В╕дкрити"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
-msgstr "Позначити завдання як виконане"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "Вир╕зати"
 
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit this task..."
-msgstr "Виправити це завдання..."
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "Скоп╕ювати"
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "Виправити завдання"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "Вставити"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "Позначити як виконане"
+
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Стерти це завдання"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
+msgstr "Позначити як виконане"
+
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Стерти завдання"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
-msgstr "дп"
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "Клацн╕ть тут щоб додати завдання"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
-msgstr "пп"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% завершення:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Си╜нали"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Категор╕╖"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+#, fuzzy
+msgid "Complete"
+msgstr "% завершення:"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "Дата завершення"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Дата к╕нця"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "Географ╕чне положення"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Пр╕оритет"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Дата початку"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "Зведення"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "Завдання"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "Прозор╕сть"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "дп"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "пп"
+
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Нова зустр╕ч"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "Нова щоденна под╕я"
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
 #, fuzzy
-msgid "Go to Today"
+msgid "Go to _Today"
 msgstr "сьогодн╕"
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
 #, fuzzy
-msgid "Go to Date..."
+msgid "_Go to Date..."
 msgstr "К╕нцева дата"
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "В╕дкрити"
-
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Стерти цю зустр╕ч"
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Планування зустр╕ч╕"
-
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
 #, fuzzy
-msgid "Make this Occurrence Movable"
+msgid "Make this Occurrence _Movable"
 msgstr "Зберегти поточний файл"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
 #, fuzzy
-msgid "Delete this Occurrence"
+msgid "Delete this _Occurrence"
 msgstr "Стерти цей елемент"
 
-#: calendar/gui/e-day-view.c:3179
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
 #, fuzzy
-msgid "Delete all Occurrences"
-msgstr "Стерти контакт"
+msgid "Delete _All Occurrences"
+msgstr "Джерела"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
-msgstr "Не вдалося поновити ваш календарний файл!\n"
-
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
+#: calendar/gui/e-itip-control.c:697
 #, fuzzy
-msgid "Component successfully updated."
-msgstr "Файли Evolution усп╕шно встановлено."
+msgid "This is a meeting request."
+msgstr "Це поштова адреса"
+
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 #, fuzzy
-msgid "I couldn't read your calendar file!\n"
-msgstr "Не вдалося створити календар в \"%s\""
+msgid "The message is not understandable."
+msgstr "Пов╕домлення %s не знайдено."
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:499
-#, fuzzy
-msgid "I couldn't update your calendar store."
-msgstr "Не вдалося створити календар в \"%s\""
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-#, fuzzy
-msgid "Component successfully deleted."
-msgstr "Файли Evolution усп╕шно встановлено."
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-#, fuzzy
-msgid "I don't recognize this type of calendar component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
-msgstr "Додати до календаря"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
-msgid " Accept "
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:815
-msgid " Decline "
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:834
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "Схоже тека непоправно з╕псована."
+
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Tentative "
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
-msgstr "Поновити календар"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr "Не вдалося поновити ваш календарний файл!\n"
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
-msgstr "Скасувати зустр╕ч"
+#: calendar/gui/e-itip-control.c:1015
+#, fuzzy
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "Не вдалося створити календар в \"%s\""
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, fuzzy, no-c-format
@@ -2484,26 +3534,22 @@ msgstr ""
 msgid "Calendar Message"
 msgstr "Календарне пов╕домлення"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:623
+#: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Дата:"
 
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "Завантаження календаря"
+
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Завантаження календаря..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Орган╕затор:"
-
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Серверне пов╕домлення:"
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Зведення:"
-
 #: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr ""
@@ -2512,452 +3558,50 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-#, fuzzy
-msgid "Attendee"
-msgstr "Весь супров╕д"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-#, fuzzy
-msgid "Attendee address"
-msgstr "Весь супров╕д"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-#, fuzzy
-msgid "Attendees: "
-msgstr "Весь супров╕д"
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"Скасувати\n"
-"зустр╕ч"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-#, fuzzy
-msgid "Chair"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-#, fuzzy
-msgid "Meeting Invitations"
-msgstr "Час початку з╕брання:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-#, fuzzy
-msgid "Organizer: "
-msgstr "Ор╕╓нтац╕я:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:18
-#, fuzzy
-msgid ""
-"Request\n"
-"Meeting"
-msgstr "Планування зустр╕ч╕"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-#, fuzzy
-msgid "Required Participant"
-msgstr "Потр╕бн╕ люди"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-#, fuzzy
-msgid "Role"
-msgstr "Моб╕льний"
-
-#: calendar/gui/e-meeting-dialog.glade.h:22
-#, fuzzy
-msgid ""
-"Schedule\n"
-"Time"
-msgstr "Планування зустр╕ч╕"
-
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1082
-msgid "Status"
-msgstr "Стан"
-
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:155
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "Категор╕я:"
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-tasks.c:403
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Не вдалося завантажити календар в \"%s\""
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Метод, необх╕дний для завантаження \"%s\", не п╕дтриму╓ться"
 
-#: calendar/gui/event-editor.c:376
-msgid "Edit Appointment"
-msgstr "Виправити зустр╕ч"
-
-#: calendar/gui/event-editor.c:454
-#, fuzzy
-msgid "on"
-msgstr "Пнд"
-
-#: calendar/gui/event-editor.c:479 filter/filter-datespec.c:81
-msgid "day"
-msgstr "день"
-
-#: calendar/gui/event-editor.c:606
-#, fuzzy
-msgid "on the"
-msgstr "м╕сяць"
-
-#: calendar/gui/event-editor.c:613
-msgid "th"
-msgstr " "
-
-#: calendar/gui/event-editor.c:759
-#, fuzzy
-msgid "occurrences"
-msgstr "Джерела"
-
-#: calendar/gui/event-editor.c:876
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-
-#: calendar/gui/event-editor.c:1548
-#, fuzzy, c-format
-msgid " %d days"
-msgstr "Т╕ло"
-
-#: calendar/gui/event-editor.c:1550
-msgid " 1 day"
-msgstr " 1 день"
-
-#: calendar/gui/event-editor.c:1553
-#, fuzzy, c-format
-msgid " %d weeks"
-msgstr "Тиждень"
-
-#: calendar/gui/event-editor.c:1555
-#, fuzzy
-msgid " 1 week"
-msgstr "Показати 1 тиждень"
-
-#: calendar/gui/event-editor.c:1558
-#, fuzzy, c-format
-msgid " %d hours"
-msgstr "24 години"
-
-#: calendar/gui/event-editor.c:1560
-msgid " 1 hour"
-msgstr " 1 година"
-
-#: calendar/gui/event-editor.c:1563
-#, c-format
-msgid " %d minutes"
-msgstr " %d хвилин"
-
-#: calendar/gui/event-editor.c:1565
-#, fuzzy
-msgid " 1 minute"
-msgstr "10 хвилин"
-
-#: calendar/gui/event-editor.c:1568
-#, fuzzy, c-format
-msgid " %d seconds"
-msgstr "В╕д╕слати"
-
-#: calendar/gui/event-editor.c:1570
-msgid " 1 second"
-msgstr " 1 секунда"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1593
-msgid "Play a sound"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1596
-msgid "Show a dialog"
-msgstr "Показати д╕алог"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1599
-msgid "Send an email"
-msgstr "В╕д╕слати пошту"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1602
-msgid "Run a program"
-msgstr "Запустити програму"
-
-#: calendar/gui/event-editor.c:1617
-msgid " before start of appointment"
-msgstr " перед початком зустр╕ч╕"
-
-#: calendar/gui/event-editor.c:1619
-msgid " after start of appointment"
-msgstr " п╕сля початку зустр╕ч╕"
-
-#: calendar/gui/event-editor.c:1627
-msgid " before end of appointment"
-msgstr " перед к╕нцем зустр╕ч╕"
-
-#: calendar/gui/event-editor.c:1629
-msgid " after end of appointment"
-msgstr " п╕сля к╕нця зустр╕ч╕"
-
-#: calendar/gui/event-editor.c:3137 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Зустр╕ч"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "П╕дстави зустр╕ч╕"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-#, fuzzy
-msgid "Custom recurrence"
-msgstr "Без повторення"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Кожен"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Виключення"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Зм╕нити"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Без повторення"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Перегляд"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Повторення"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Правило повторення"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Нагадування"
-
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "Установки..."
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Просте повторення"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "Час завершення:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "Дата початку:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "Дата початку:"
-
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "п╕сля"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
-msgid "before"
-msgstr "перед"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-#, fuzzy
-msgid "day(s)"
-msgstr "Т╕ло"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "к╕нець зустр╕ч╕"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "в"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "завжди"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-#, fuzzy
-msgid "hour(s)"
-msgstr "година"
-
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label26"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "label26"
-
-#: calendar/gui/event-editor-dialog.glade.h:42 mail/mail-config.glade.h:77
-#, fuzzy
-msgid "minute(s)"
-msgstr "хвилина"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "month(s)"
-msgstr "м╕сяць"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "start of appointment"
-msgstr "початок зустр╕ч╕"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:46
-#, fuzzy
-msgid "week(s)"
-msgstr "Тиждень"
-
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "р╕к"
-
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-msgid "New Appointment..."
-msgstr "Нова зустр╕ч..."
-
-#: calendar/gui/e-week-view.c:3314
-#, fuzzy
-msgid "Delete All Occurrences"
-msgstr "Джерела"
-
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/gnome-cal.c:223
-msgid "Show all "
-msgstr "Показати все "
-
-#: calendar/gui/gnome-cal.c:237
-msgid "Summary contains"
-msgstr "Зведення м╕стить"
-
-#: calendar/gui/gnome-cal.c:238
-msgid "Description contains"
-msgstr "Опис м╕стить"
-
-#: calendar/gui/gnome-cal.c:239
-msgid "Comment contains"
-msgstr "Коментар м╕стить"
-
-#: calendar/gui/gnome-cal.c:240
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
 #, fuzzy
-msgid "Has category"
-msgstr ""
-"\n"
-"Категор╕╖: "
+msgid "New _Appointment..."
+msgstr "Нова зустр╕ч..."
 
-#: calendar/gui/gnome-cal.c:843
+#: calendar/gui/gnome-cal.c:999
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 "Не вдалося в╕дкрити теку \"%s\":\n"
 "%s"
 
-#: calendar/gui/gnome-cal.c:854
+#: calendar/gui/gnome-cal.c:1010
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Метод, необх╕дний для завантаження \"%s\", не п╕дтриму╓ться"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-#, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#, fuzzy
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Канал календаря Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-#, fuzzy
-msgid "Factory for the Calendar Summary component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the calendar iTip view control"
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-#, fuzzy
-msgid "Factory for the sample Calendar control"
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr ""
@@ -2980,236 +3624,259 @@ msgid "Go To Date"
 msgstr "К╕нцева дата"
 
 #: calendar/gui/goto-dialog.glade.h:6
-#, fuzzy
-msgid "Go To Today"
-msgstr "сьогодн╕"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 #, fuzzy
 msgid "March"
 msgstr "Пошук"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 #, fuzzy
 msgid "May"
 msgstr "Понед╕лок"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 #, fuzzy
 msgid "October"
 msgstr "╤нша"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "сьогодн╕"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Ндл"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Пнд"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Втр"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "Срд"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Чтв"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Птн"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "Сбт"
 
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Завдання"
+
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "Поточний день (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1104
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Поточний тиждень (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Поточний м╕сяць (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Поточний р╕к (%Y)"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Надрукувати календар"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1524
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:57
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Перегляд друку"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Надрукувати цей елемент"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "Параметри друку"
+
+#: calendar/gui/tasks-control.c:126
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "URI, який в╕добразить календар"
@@ -3246,90 +3913,109 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "НПВСЧПС"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:209
+#: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:336
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "Операц╕я не п╕дтриму╓ться"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 #, fuzzy
 msgid "Syncing folders"
 msgstr "Синхрон╕зац╕я \"%s\""
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Не вдалося в╕дкрити адресну книгу"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Не вдалося зберегти список груп для %s: %s"
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 #, fuzzy
 msgid "Getting message %d (%d%%)"
 msgstr "Запис пов╕домлення %d з %d"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, fuzzy, c-format
-msgid "Failed message %d"
+msgid "Failed on message %d"
 msgstr "Переслане пов╕домлення %s"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 #, fuzzy
 msgid "Cannot open message"
 msgstr ""
 "Неможливо отримати пов╕домлення: %s\n"
 "  %s"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Синхрон╕зац╕я \"%s\""
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-#, fuzzy
-msgid "Complete"
-msgstr "% завершення:"
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "Запис пов╕домлення %d з %d"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "Запис пов╕домлення %d з %d"
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Помилка збереження файлу: %s"
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Помилка збереження файлу: %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Помилка збереження файлу: %s"
@@ -3365,14 +4051,33 @@ msgstr ""
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Не вдалося створити канал: %s"
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Не вдалося отримати теку: %s: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "Не вдалося запустити спадко╓мний процес: %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Не вдалося створити файл блокування для %s: %s"
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3387,113 +4092,108 @@ msgstr "Не вдалось зробити блокування за допомогою fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Не вдалось зробити блокування за допомогою flock(2): %s"
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, fuzzy, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Створити новий календар"
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Не вдалось в╕дкрити файл пошти %s: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Не вдалось в╕дкрити тимчасовий файл пошти %s: %s"
 
-#: camel/camel-movemail.c:199
-#, fuzzy, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Створити новий календар"
-
-#: camel/camel-movemail.c:245
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Помилка зчитування файлу пошти: %s"
-
-#: camel/camel-movemail.c:256
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Помилка запису пошти у тимчасовий файл: %s"
-
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Не вдалося зберегти пошту в тимчасовому файл╕ %s: %s"
 
-#: camel/camel-movemail.c:306
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Не вдалося створити канал: %s"
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Не вдалося запустити спадко╓мний процес: %s"
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Нев╕дома помилка)"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Помилка зчитування файлу пошти: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Помилка запису пошти у тимчасовий файл: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, fuzzy, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Помилка запису пошти у тимчасовий файл: %s"
 
-#: camel/camel-pgp-context.c:188
+#: camel/camel-pgp-context.c:193
 #, fuzzy, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Введ╕ть пароль NNTP для %s@%s"
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:511
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:518 camel/camel-pgp-context.c:690
-#: camel/camel-pgp-context.c:1057 camel/camel-pgp-context.c:1269
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Не вказано паролю."
 
-#: camel/camel-pgp-context.c:524 camel/camel-pgp-context.c:696
-#: camel/camel-pgp-context.c:879 camel/camel-pgp-context.c:1064
-#: camel/camel-pgp-context.c:1276
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Неможливо створити канал до GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:683
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:873
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr ""
 
-#: camel/camel-pgp-context.c:890
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Не вдалося створити тимчасовий файл: %s"
 
-#: camel/camel-pgp-context.c:1047
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr ""
 
-#: camel/camel-pgp-context.c:1073
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1261
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -3512,39 +4212,39 @@ msgstr "Не вдалося завантажити %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Не вдалося завантажити %s: нема╓ ╕н╕ц╕ал╕зац╕╖ в модул╕."
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
 #, fuzzy, c-format
 msgid "%s server %s"
 msgstr "Сервер:"
 
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
 #, fuzzy
 msgid "Connection cancelled"
 msgstr "В╕дм╕нено"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr "(нев╕домий хост)"
 
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:264
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "В╕дкрити календар"
 
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:489
 #, fuzzy
 msgid "Server unexpectedly disconnected"
 msgstr "Сервер в╕дкинув ╕м'я користувача"
@@ -3643,7 +4343,7 @@ msgid ""
 msgstr "Не вдалося створити канал: %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:421
+#: camel/providers/imap/camel-imap-store.c:440
 #, fuzzy
 msgid "Bad authentication response from server."
 msgstr "Неоч╕кувана в╕дпов╕дь в╕д сервера IMAP: %s"
@@ -3701,20 +4401,20 @@ msgstr ""
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:58
+#: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:273 camel/camel-session.c:363
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:462
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3723,27 +4423,53 @@ msgstr ""
 "Не вдалося створити каталог %s:\n"
 "%s"
 
-#. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:1007 mail/mail-ops.c:1014
-#: mail/mail-ops.c:1032 mail/mail-ops.c:1033
+#: camel/camel-smime-context.c:173
+#, fuzzy, c-format
+msgid "Please enter your password for %s"
+msgstr "Введ╕ть пароль NNTP для %s@%s"
+
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "Цього файлу не ╕сну╓."
+
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "Цього файлу не ╕сну╓."
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, fuzzy, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "Не вдалося в╕д╕слати ╕м'я користувача на сервер"
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
 #, fuzzy
-msgid "Trash"
-msgstr "Завдання"
+msgid "Failed to decode message."
+msgstr "Переслане пов╕домлення %s"
 
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3753,6 +4479,18 @@ msgid ""
 "Do you wish to accept anyway?"
 msgstr ""
 
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
+
 #: camel/camel-url.c:289
 #, fuzzy, c-format
 msgid "Could not parse URL `%s'"
@@ -3760,12 +4498,12 @@ msgstr ""
 "Не вдалося в╕дкрити файл \"%s\":\n"
 "%s"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "Переслати це пов╕домлення"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:547
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "Переслати це пов╕домлення"
@@ -3777,60 +4515,75 @@ msgstr ""
 "Неможливо отримати пов╕домлення \"%s\" з теки \"%s\"\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:130
-#, fuzzy, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Не вдалося створити каталог %s: %s"
-
-#: camel/providers/imap/camel-imap-command.c:209
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Неоч╕кувана в╕дпов╕дь в╕д сервера IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:217
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Нев╕дома помилка"
-
-#: camel/providers/imap/camel-imap-command.c:272
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:456
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:490
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Неоч╕кувана в╕дпов╕дь OK в╕д сервера IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:170
+#: camel/providers/imap/camel-imap-folder.c:192
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr "Не вдалося створити каталог %s: %s"
+
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:349
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
+msgstr ""
+
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
 #, fuzzy
-msgid "Scanning IMAP folder"
-msgstr "Сканування тек в \"%s\""
+msgid "Scanning for changed messages"
+msgstr "Збереження пов╕домлень"
 
-#: camel/providers/imap/camel-imap-folder.c:984
-#: camel/providers/imap/camel-imap-folder.c:1195
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1014
-#: camel/providers/imap/camel-imap-folder.c:1229
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Збереження пов╕домлень"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, fuzzy, c-format
+msgid "Could not open cache directory: %s"
+msgstr "Не вдалося створити каталог %s: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr ""
 
@@ -3839,7 +4592,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:534
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Теки"
 
@@ -3873,28 +4626,28 @@ msgstr "Для зчитування та збереження плшти на серверах IMAP."
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:444
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:454
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "╤дентиф╕кац╕я не вимага╓ться"
 
-#: camel/providers/imap/camel-imap-store.c:479
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:494
-#: camel/providers/smtp/camel-smtp-transport.c:403
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:522
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3902,103 +4655,107 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, fuzzy, c-format
-msgid "%s is not a selectable folder"
-msgstr "Показати вибрану теки"
-
-#: camel/providers/imap/camel-imap-store.c:883
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Не вдалося створити каталог %s: %s"
+msgid "No such folder %s"
+msgstr "Нев╕рна тека \"%s\"."
 
-#: camel/providers/imap/camel-imap-store.c:1386
-msgid "You must be working online to complete this operation"
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/local/camel-local-provider.c:40
 #, fuzzy
 msgid "MH-format mail directories"
 msgstr "каталог не Maildir"
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-provider.c:70
+msgid "Unix mbox spool-format mail files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:71
+msgid "For storing local mail in standard Unix spool directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:136
+#: camel/providers/local/camel-local-store.c:134
 #, fuzzy, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "\"%s\" не ╓ звичайним файлом."
 
-#: camel/providers/local/camel-local-store.c:144
-#: camel/providers/local/camel-local-store.c:160
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:175
+#: camel/providers/local/camel-local-store.c:173
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr "Файл локально╖ пошти %s"
 
-#: camel/providers/local/camel-local-store.c:241
+#: camel/providers/local/camel-local-store.c:237
 #, fuzzy, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Не вдалося перейменувати теку \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:283
+#: camel/providers/local/camel-local-store.c:279
 #, fuzzy, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Не вдалося стерти теку \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:293
+#: camel/providers/local/camel-local-store.c:289
 #, fuzzy, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Не вдалося стерти теку \"%s\": %s"
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-maildir-folder.c:176
 #, fuzzy, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "В╕д╕слан╕ пов╕домлення"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4007,19 +4764,20 @@ msgstr ""
 "Неможливо отримати пов╕домлення: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 #, fuzzy
 msgid "No such message"
 msgstr "Переслати це пов╕домлення"
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4029,14 +4787,14 @@ msgstr ""
 "Не вдалося в╕дкрити теку \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Теки \"%s\" не ╕сну╓."
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4046,22 +4804,29 @@ msgstr ""
 "Не вдалося створити теку \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "\"%s\" не ╓ каталогом Maildir."
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Не вдалося стерти теку \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "каталог не Maildir"
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"Не вдалося створити теку \"%s\":\n"
+"%s"
+
 #: camel/providers/local/camel-maildir-summary.c:405
 #: camel/providers/local/camel-maildir-summary.c:526
 #, fuzzy, c-format
@@ -4069,11 +4834,13 @@ msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Неможливо в╕дкрити поштову скриньку: %s: %s\n"
 
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Не вдалося отримати теку: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Неможливо в╕дкрити поштову скриньку: %s: %s\n"
@@ -4083,9 +4850,12 @@ msgstr "Неможливо в╕дкрити поштову скриньку: %s: %s\n"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Неможливо додати пов╕домлення до файлу Mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4094,11 +4864,13 @@ msgstr ""
 "Неможливо отримати пов╕домлення \"%s\" з теки \"%s\"\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Схоже тека непоправно з╕псована."
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -4144,11 +4916,13 @@ msgstr "Тека \"%s\" не порожня. Не стерто."
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
 #: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 #, fuzzy
 msgid "Summarising folder"
 msgstr "Синхрон╕зац╕я \"%s\""
 
 #: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, fuzzy, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
@@ -4156,23 +4930,29 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, fuzzy, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Не вдалося перейменувати теку \"%s\": %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1395
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "Синхрон╕зац╕я \"%s\""
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, fuzzy, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
@@ -4180,6 +4960,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Не вдалося в╕дкрити тимчасову поштову скриньку: %s"
@@ -4188,21 +4969,28 @@ msgstr "Не вдалося в╕дкрити тимчасову поштову скриньку: %s"
 #: camel/providers/local/camel-mbox-summary.c:557
 #: camel/providers/local/camel-mbox-summary.c:746
 #: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Помилка запису в тимчасову пошту скриньку: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Зб╕й запису в тимчасову поштову скриньку: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:635
 #: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
@@ -4217,13 +5005,14 @@ msgstr "Не вдалося закрити тимчасову теку: %s"
 msgid "Could not rename folder: %s"
 msgstr "Не вдалося перейменувати теку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Нев╕дома помилка: %s"
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, fuzzy, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "В╕д╕слан╕ пов╕домлення"
@@ -4238,39 +5027,92 @@ msgstr "\"%s\" не ╓ каталогом."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Неможливо в╕дкрити поштову скриньку: %s: %s\n"
 
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "Неможливо додати пов╕домлення до файлу Mbox: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "\"%s\" не ╓ звичайним файлом."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "Теки \"%s\" не ╕сну╓."
+
+#: camel/providers/local/camel-spool-store.c:176
+msgid "Spool stores do not have an inbox"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Файл локально╖ пошти %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "Не вдалось в╕дкрити тимчасовий файл пошти %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "Не вдалося стерти теку \"%s\": %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Введ╕ть пароль NNTP для %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "Сервер в╕дкинув ╕м'я користувача"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "Не вдалося в╕д╕слати ╕м'я користувача на сервер"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "Сервер в╕дкинув ╕м'я користувача ╕ пароль"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "Пов╕домлення %s не знайдено."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "Не вдалося отримати сп╕сок груп з сервера."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Не вдалося завантажити список груп для %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Не вдалося зберегти список груп для %s: %s"
@@ -4283,24 +5125,24 @@ msgstr "Новини USENET"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Не вдалося в╕дкрити каталог сервера новин: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "Новини USENET через %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
@@ -4354,7 +5196,7 @@ msgstr "Не видаляти пов╕домлення з сервера"
 msgid "Delete after %s day(s)"
 msgstr "Стерти завдання"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4382,59 +5224,59 @@ msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:225
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, fuzzy, c-format
 msgid "Could not connect to server: %s"
 msgstr "Створити новий календар"
 
-#: camel/providers/pop3/camel-pop3-store.c:329
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Створити новий календар"
 
-#: camel/providers/pop3/camel-pop3-store.c:368
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:387
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:390
-#: camel/providers/pop3/camel-pop3-store.c:427
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Нев╕дома помилка"
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:425
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:493
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Нев╕рна тека \"%s\"."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4487,7 +5329,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Достачання пошти через програму sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr ""
 
@@ -4495,127 +5337,127 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 #, fuzzy
 msgid "Help message"
 msgstr "Надрукувати пов╕домлення"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 #, fuzzy
 msgid "Service ready"
 msgstr "Прибрати"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "Не вказано паролю."
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "╤дентиф╕кац╕я не вимага╓ться"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 #, fuzzy
 msgid "Authentication required"
 msgstr "╤дентиф╕кац╕я не вимага╓ться"
 
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "Введ╕ть пароль NNTP для %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4623,312 +5465,237 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:527
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "Сервер SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Достачання пошти SMTP через %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr "Неможливо в╕д╕слати пов╕домлення: адреса в╕дправника не визначена."
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr "Неможливо в╕д╕слати пов╕домлення: адреса в╕дправника не в╕рна."
 
-#: camel/providers/smtp/camel-smtp-transport.c:575
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#, fuzzy
+msgid "Sending message"
+msgstr "Стерти це пов╕домлення негайно"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "Неможливо в╕д╕слати пов╕домлення: не визначено отримувач╕в"
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Перевищено час оч╕кування в╕дпов╕д╕ на HELO: %s: не фатально"
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Помилка в╕дпов╕д╕ на HELO: %s: не фатально"
 
-#: camel/providers/smtp/camel-smtp-transport.c:721
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:736
 #: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Автенф╕кац╕я"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Перевищено час оч╕кування в╕дпов╕д╕ на HELO: %s: не фатально"
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:782
+#, fuzzy
+msgid "AUTH request failed."
+msgstr "Перевищено час оч╕кування в╕дпов╕д╕ на HELO: %s: не фатально"
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 #, fuzzy
 msgid "Bad authentication response from server.\n"
 msgstr "Неоч╕кувана в╕дпов╕дь в╕д сервера IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:824
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:843
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Створити новий календар"
 
-#: camel/providers/smtp/camel-smtp-transport.c:887
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, fuzzy, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Створити новий календар"
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Створити новий календар"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:952
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Нев╕дома помилка: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 байт"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u байт╕в"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fК"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fМ"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fГ"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "долучення"
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Долучити файл"
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "Видалити вибран╕ елементи з списку долучення"
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Долучити..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "Долучити файл до пов╕домлення"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1082
-#, fuzzy
-msgid "Attachment"
-msgstr "долучення"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "Властивост╕ долучення"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Назва файлу:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-#, fuzzy
-msgid "Inline attachment"
-msgstr "долучення"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "Тип MIME:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-#, fuzzy
-msgid "Send as:"
-msgstr "В╕д╕слати \"%s\""
-
-#: composer/e-msg-composer.c:529
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"Не вдалося в╕дкрити файл п╕дпису %s:\n"
-"%s"
-
-#: composer/e-msg-composer.c:699
-msgid "Save as..."
-msgstr "Зберегти як..."
-
-#: composer/e-msg-composer.c:710
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Помилка збереження файлу: %s"
-
-#: composer/e-msg-composer.c:730
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Помилка завантаження файлу: %s"
-
-#: composer/e-msg-composer.c:802
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-
-#: composer/e-msg-composer.c:860 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:866
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-
-#: composer/e-msg-composer.c:891
-msgid "Open file"
-msgstr "В╕дкрити файл"
-
-#: composer/e-msg-composer.c:1017
-msgid "That file does not exist."
-msgstr "Цього файлу не ╕сну╓."
-
-#: composer/e-msg-composer.c:1027
-msgid "That is not a regular file."
-msgstr "Це не звичайний файл."
-
-#: composer/e-msg-composer.c:1037
-msgid "That file exists but is not readable."
-msgstr ""
-
-#: composer/e-msg-composer.c:1047
-msgid "That file appeared accesible but open(2) failed."
-msgstr ""
-
-#: composer/e-msg-composer.c:1069
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer.c:1090
-msgid "An error occurred while reading the file."
-msgstr "Сталася помилка п╕д час зчитування файлу."
-
-#: composer/e-msg-composer.c:1391 composer/e-msg-composer.c:1734
-msgid "Compose a message"
-msgstr "П╕дготувати пов╕домлення"
-
-#: composer/e-msg-composer.c:1825
-msgid "Could not create composer window."
-msgstr "Не вдалось створити в╕кно конструктора."
-
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "Клацн╕ть тут щоб викликати адресну книгу"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:354 mail/mail-format.c:744
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "В╕д:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:360 mail/mail-format.c:746
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "В╕дпов╕дати на:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:371 mail/mail-format.c:643
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Тема:"
 
-#: composer/e-msg-composer-hdrs.c:385 mail/mail-format.c:748
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "До:"
 
-#: composer/e-msg-composer-hdrs.c:386
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "Введ╕ть адресат╕в пов╕домлення"
 
-#: composer/e-msg-composer-hdrs.c:389 mail/mail-format.c:750
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Введ╕ть адресат╕в, що отримають коп╕ю пов╕домлення"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4936,349 +5703,285 @@ msgstr ""
 "Введ╕ть адресат╕в, що отримають коп╕ю пов╕домлення не попавши в список "
 "отримувач╕в."
 
-#: composer/evolution-composer.c:355
-msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
-
-#: composer/evolution-composer.c:370
-#, fuzzy
-msgid "Cannot initialize Evolution's composer."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
-
-#: data/evolution.desktop.in.h:2
-#, fuzzy
-msgid "The Evolution groupware suite"
-msgstr "Evolution - %s"
-
-#: data/evolution.keys.in.h:1
-#, fuzzy
-msgid "address card"
-msgstr "Адреса"
-
-#: data/evolution.keys.in.h:2
-#, fuzzy
-msgid "calendar information"
-msgstr "Нема╓ ╕нформац╕╖"
-
-#. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
-
-#. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
-msgid "%a %m/%d/%Y"
-msgstr ""
-
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
-#, fuzzy
-msgid "%a %m/%d/%Y %H:%M"
-msgstr "%d/%m/%Y"
-
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
-#, fuzzy
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-#, fuzzy
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S%n"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-#, fuzzy
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p%n"
-
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Долучити файл"
 
-#: executive-summary/component/e-summary.c:924
+#: composer/e-msg-composer.c:670
 #, fuzzy, c-format
 msgid ""
-"Cannot open the HTML file:\n"
+"Could not open file %s:\n"
 "%s"
 msgstr ""
-"Неможливо в╕дкрити файл %s:\n"
+"Не вдалося в╕дкрити файл \"%s\":\n"
 "%s"
 
-#: executive-summary/component/e-summary.c:938
+#: composer/e-msg-composer.c:683
 #, fuzzy, c-format
 msgid ""
-"Error reading data:\n"
+"Error while reading file %s:\n"
 "%s"
-msgstr "Помилка зчитування файлу пошти: %s"
+msgstr "Помилка завантаження файлу: %s"
 
-#: executive-summary/component/e-summary.c:956
-msgid "File does not have a place for the services.\n"
-msgstr ""
+#: composer/e-msg-composer.c:873
+msgid "Save as..."
+msgstr "Зберегти як..."
 
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "Попередження"
 
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:70
+#: composer/e-msg-composer.c:906
 #, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Отримання пошти з %s"
+msgid "Error saving file: %s"
+msgstr "Помилка збереження файлу: %s"
 
-#: executive-summary/component/e-summary-url.c:72
+#: composer/e-msg-composer.c:926
 #, c-format
-msgid "Change the view to %s"
-msgstr ""
+msgid "Error loading file: %s"
+msgstr "Помилка завантаження файлу: %s"
 
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
+#: composer/e-msg-composer.c:997
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:75
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Закрити"
-
-#: executive-summary/component/e-summary-url.c:76
+#: composer/e-msg-composer.c:1047
 #, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Перенести в теку"
+msgid "Error accessing file: %s"
+msgstr "Помилка збереження файлу: %s"
 
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
+#: composer/e-msg-composer.c:1055
+msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:78
+#: composer/e-msg-composer.c:1061
 #, fuzzy, c-format
-msgid "Move %s into the previous row"
-msgstr "Перейти до попереднього елементу"
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr "Не вдалося зберегти список груп для %s: %s"
 
-#: executive-summary/component/e-summary-url.c:79
+#: composer/e-msg-composer.c:1067
 #, fuzzy, c-format
-msgid "Move %s into the next row"
-msgstr "Перейти до наступного елементу"
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr "Не вдалося зберегти список груп для %s: %s"
 
-#: executive-summary/component/e-summary-url.c:80
+#: composer/e-msg-composer.c:1076
 #, fuzzy, c-format
-msgid "Configure %s"
-msgstr "Конф╕╜урувати теку"
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr "Помилка збереження файлу: %s"
 
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
+#: composer/e-msg-composer.c:1173
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
 msgstr ""
 
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
+#: composer/e-msg-composer.c:1321
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
 msgstr ""
 
-#: executive-summary/component/main.c:62
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
+msgid "Open file"
+msgstr "В╕дкрити файл"
+
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "Вставити текстовий файл..."
+
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+msgid "Compose a message"
+msgstr "П╕дготувати пов╕домлення"
+
+#: composer/e-msg-composer.c:2351
+msgid "Could not create composer window."
+msgstr "Не вдалось створити в╕кно конструктора."
+
+#: composer/evolution-composer.c:359
 msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
 msgstr ""
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr ""
+#: composer/evolution-composer.c:374
+#, fuzzy
+msgid "Cannot initialize Evolution's composer."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
+#: data/evolution.desktop.in.h:2
 #, fuzzy
-msgid "Factory for the Evolution executive summary component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+msgid "The Evolution groupware suite"
+msgstr "Evolution - %s"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr ""
+#: data/evolution.keys.in.h:1
+#, fuzzy
+msgid "address card"
+msgstr "Адреса"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
+#: data/evolution.keys.in.h:2
 #, fuzzy
-msgid "RDF Summary"
-msgstr "Нед╕ля"
+msgid "calendar information"
+msgstr "Нема╓ ╕нформац╕╖"
+
+#. strptime format for a date.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1480
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
+#. strptime format for a time of day, in 12-hour format.
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
 #, fuzzy
-msgid "Factory for the test bonobo component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p%n"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
 #, fuzzy
-msgid "Factory for the test component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S%n"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
+#. strptime format for time of day, without seconds, 12-hour format.
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr ""
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
+#: e-util/e-time-utils.c:240
 #, fuzzy
-msgid "Error"
-msgstr "Без помилок"
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
 
-#: executive-summary/test-service/rdf-summary.c:768
-msgid "Update automatically"
-msgstr ""
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%d/%m/%Y"
 
-#: executive-summary/test-service/rdf-summary.c:778
-msgid "Update now"
-msgstr ""
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
 
-#: executive-summary/test-service/rdf-summary.c:788
-msgid "Update every "
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:298
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
+msgid "%a %m/%d/%Y"
 msgstr ""
 
-#: executive-summary/test-service/rdf-summary.c:796
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr ""
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:303
+#, fuzzy
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%d/%m/%Y"
 
-#: filter/filter-datespec.c:78
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:312
+#, fuzzy
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%I:%M %p"
+
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "р╕к"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 #, fuzzy
 msgid "years"
 msgstr "Заголовок"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "м╕сяць"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 #, fuzzy
 msgid "months"
 msgstr "Шрифти"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "тиждень"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 #, fuzzy
 msgid "weeks"
 msgstr "Тиждень"
 
-#: filter/filter-datespec.c:81
-#, fuzzy
-msgid "days"
-msgstr "Т╕ло"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "година"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr ""
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "хвилина"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "секунда"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 #, fuzzy
 msgid "seconds"
 msgstr "В╕д╕слати"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
-#: filter/filter-datespec.c:276
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:339
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5286,28 +5989,36 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr ""
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr ""
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "зараз"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<клацн╕ть тут для вибору дати>"
 
@@ -5330,8 +6041,8 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Виб╕р теки"
 
@@ -5343,6 +6054,66 @@ msgstr "Введ╕ть URI теки"
 msgid "<click here to select a folder>"
 msgstr "<клацн╕ть тут для вибору теки>"
 
+#: filter/filter-input.c:193
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Помилка у ре╜улярному вираз╕ \"%s\":\n"
+"%s"
+
+#: filter/filter-part.c:488
+msgid "Test"
+msgstr "Тест"
+
+#: filter/filter-rule.c:626
+msgid "Rule name: "
+msgstr "Назва правила: "
+
+#: filter/filter-rule.c:630
+msgid "Untitled"
+msgstr ""
+
+#: filter/filter-rule.c:648
+msgid "If"
+msgstr "Якщо"
+
+#: filter/filter-rule.c:666
+msgid "Execute actions"
+msgstr ""
+
+#: filter/filter-rule.c:670
+msgid "if all criteria are met"
+msgstr "якщо вс╕ в╕дпов╕до╓ вс╕м критер╕ям"
+
+#: filter/filter-rule.c:675
+msgid "if any criteria are met"
+msgstr "якщо в╕дпов╕да╓ будь-якому критер╕ю"
+
+#: filter/filter-rule.c:686
+msgid "Add criterion"
+msgstr "Додати критер╕й"
+
+#: filter/filter-rule.c:771
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:771
+msgid "outgoing"
+msgstr ""
+
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Додати"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Виправити"
+
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Редагування в╕льтр╕в"
@@ -5386,58 +6157,10 @@ msgstr ""
 msgid "with all local folders"
 msgstr "Створити нову теку"
 
-#: filter/filter-input.c:193
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Помилка у ре╜улярному вираз╕ \"%s\":\n"
-"%s"
-
-#: filter/filter-part.c:488
-msgid "Test"
-msgstr "Тест"
-
-#: filter/filter-rule.c:626
-msgid "Rule name: "
-msgstr "Назва правила: "
-
-#: filter/filter-rule.c:630
-msgid "Untitled"
-msgstr ""
-
-#: filter/filter-rule.c:646
-msgid "If"
-msgstr "Якщо"
-
-#: filter/filter-rule.c:664
-msgid "Execute actions"
-msgstr ""
-
-#: filter/filter-rule.c:668
-msgid "if all criteria are met"
-msgstr "якщо вс╕ в╕дпов╕до╓ вс╕м критер╕ям"
-
-#: filter/filter-rule.c:673
-msgid "if any criteria are met"
-msgstr "якщо в╕дпов╕да╓ будь-якому критер╕ю"
-
-#: filter/filter-rule.c:684
-msgid "Add criterion"
-msgstr "Додати критер╕й"
-
-#: filter/filter-rule.c:770
-msgid "incoming"
-msgstr ""
-
-#: filter/filter-rule.c:770
-msgid "outgoing"
-msgstr ""
-
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
-msgstr ""
+#, fuzzy
+msgid "Assign Color"
+msgstr "Прив'язано"
 
 #: filter/libfilter-i18n.h:4
 msgid "Assign Score"
@@ -5515,95 +6238,96 @@ msgid "Expression"
 msgstr "Вираз"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "Переслати на адресу"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "Важливо"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "б╕льше"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "менше"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "Mailing list"
 msgstr "Список розсилки %s"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Т╕ло пов╕домлення"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Заголовок пов╕домлення"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Пов╕домлення було отримано"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Пов╕домлення було в╕д╕слано"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Перенести в теку"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "on or after"
 msgstr "К╕нцева дата"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Прочитано"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Адресати"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Replied to"
 msgstr "В╕дпов╕сти вс╕м"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.c:1082
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 #, fuzzy
 msgid "Score"
 msgstr "Моб╕льний"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "В╕дправник"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 #, fuzzy
 msgid "Set Status"
 msgstr "Стан:"
 
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Розм╕р"
+
 #: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "схоже на"
@@ -5625,7 +6349,8 @@ msgstr "почина╓ться на"
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/message-list.c:1083
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Тема"
 
@@ -5657,201 +6382,280 @@ msgstr "Виправлення повного ╕мен╕"
 msgid "Score Rules"
 msgstr "Моб╕льний"
 
-#: mail/component-factory.c:329
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
+msgstr "╤мпорт"
+
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "Mail"
+msgstr "Е-пошта"
+
+#: importers/elm-importer.c:498
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: importers/elm-importer.c:527
+#, fuzzy
+msgid "Elm mail"
+msgstr "Е-пошта"
+
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "Додати адресну книгу"
+
+#: importers/evolution-gnomecard-importer.c:253
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "Установки..."
+
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: importers/pine-importer.c:691
+#, fuzzy
+msgid "Pine mail"
+msgstr "Первинна е-пошта"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Evolution mail composer."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Evolution mail executive summary component."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Evolution mail folder display component."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Evolution mail folder factory component."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution composer."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution mail component."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Mail Summary component."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "Конф╕╜урац╕я пошти"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "Властивост╕..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Зм╕нити властивост╕ ц╕╓╖ теки"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:253
+#: mail/folder-browser-ui.c:254
+#, fuzzy, c-format
+msgid "Properties for \"%s\""
+msgstr "Властивост╕"
+
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr "Властивост╕"
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Неможливо створити тимчасовий каталог: %s"
+
+#: mail/folder-browser.c:893
 #, fuzzy
 msgid "Store search as vFolder"
 msgstr "Виб╕р теки"
 
-#: mail/folder-browser.c:561 ui/evolution-mail.xml.h:91
+#: mail/folder-browser.c:1238
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "В╕ртуальна тека теми"
 
-#: mail/folder-browser.c:564 ui/evolution-mail.xml.h:89
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "В╕ртуальна тека в╕дправника"
 
-#: mail/folder-browser.c:567 ui/evolution-mail.xml.h:90
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "В╕ртуальна тека отримувач╕в"
 
-#: mail/folder-browser.c:570 ui/evolution-mail.xml.h:88
+#: mail/folder-browser.c:1247
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Ф╕льтр списку розсилки"
 
-#: mail/folder-browser.c:576
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "Ф╕льтр теми"
 
-#: mail/folder-browser.c:579
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "Ф╕льтр в╕дправника"
 
-#: mail/folder-browser.c:582
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "Ф╕льтр отримувач╕в"
 
-#: mail/folder-browser.c:585
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "Ф╕льтр списку розсилки"
 
-#: mail/folder-browser.c:594
-msgid "_Open"
-msgstr "В╕дкрити"
-
-#: mail/folder-browser.c:596
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr ""
 
-#: mail/folder-browser.c:598 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:113 ui/evolution-tasks.xml.h:8
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Зберегти як..."
 
-#: mail/folder-browser.c:600 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "Друкувати"
 
-#: mail/folder-browser.c:605
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "В╕дпов╕сти в╕дправнику"
 
-#: mail/folder-browser.c:607 ui/evolution-mail.xml.h:66
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "В╕дпов╕сти вс╕м"
+
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "В╕дпов╕сти вс╕м"
 
-#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:102
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "Переслати"
 
-#: mail/folder-browser.c:611
-#, fuzzy
-msgid "Forward _inline"
-msgstr "Переслати"
-
-#: mail/folder-browser.c:614 ui/evolution-mail.xml.h:40
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Позначити прочитаним"
 
-#: mail/folder-browser.c:616 ui/evolution-mail.xml.h:44
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Позначити непрочитаним"
 
-#: mail/folder-browser.c:621 ui/evolution-mail.xml.h:107
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "Важливо"
+
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Позначити непрочитаним"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "Перенести в теку..."
 
-#: mail/folder-browser.c:623 ui/evolution-mail.xml.h:96
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "Скоп╕ювати в теку..."
 
-#: mail/folder-browser.c:627 ui/evolution-mail.xml.h:118
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "В╕дновити"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:637 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Додати адресну книгу"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Застосувати ф╕льтри"
 
-#: mail/folder-browser.c:641
+#: mail/folder-browser.c:1322
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "Створити правило з пов╕домлення"
 
-#: mail/folder-browser.c:780
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "Ф╕льтр списку розсилки"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:1480
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "Ф╕льтр списку розсилки"
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Ф╕льтр списку розсилки (%s)"
 
-#: mail/folder-browser.c:784
+#: mail/folder-browser.c:1483
 #, fuzzy, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Ф╕льтр списку розсилки (%s)"
 
-#: mail/folder-browser-factory.c:213
-#, fuzzy, c-format
-msgid "Properties for \"%s\""
-msgstr "Властивост╕"
-
-#: mail/folder-browser-factory.c:215 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Властивост╕"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
-msgid "Evolution mail composer."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Evolution mail executive summary component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#, fuzzy
-msgid "Evolution mail folder display component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#, fuzzy
-msgid "Evolution mail folder factory component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution composer."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the Evolution mail component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-#, fuzzy
-msgid "Factory for the Mail Summary component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
-
-#: mail/importers/elm-importer.c:420
-msgid ""
-"Evolution has found Elm mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-
-#: mail/importers/elm-importer.c:430
-#, fuzzy
-msgid "Elm mail"
-msgstr "Е-пошта"
-
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
 msgid "Factory to import mbox into Evolution"
@@ -5869,23 +6673,6 @@ msgstr ""
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:440
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-
-#: mail/importers/pine-importer.c:385
-msgid ""
-"Evolution has found Pine mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-
-#: mail/importers/pine-importer.c:395
-#, fuzzy
-msgid "Pine mail"
-msgstr "Первинна е-пошта"
-
 #: mail/local-config.glade.h:1
 #, fuzzy
 msgid "Current store format:"
@@ -5921,41 +6708,68 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
 msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "╤нсталяц╕я Evolution"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "╤нсталяц╕я Evolution"
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "Файл п╕дпису:"
+
+#: mail/mail-account-gui.c:977
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+
+#: mail/mail-accounts.c:135
 #, fuzzy
 msgid " (default)"
 msgstr "Стерти"
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
 msgstr "Ви впевнен╕, що хочете стерти завдання"
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "В╕дновити"
+
+#: mail/mail-accounts.c:271
+msgid "Really delete account?"
+msgstr ""
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 #, fuzzy
 msgid "Are you sure you want to delete this news account?"
 msgstr "Ви впевнен╕, що хочете стерти зустр╕ч"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:536
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr ""
 
@@ -6014,99 +6828,101 @@ msgid ""
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:311
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:354
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:593
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:774
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Переслане пов╕домлення:\n"
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:1011
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "В╕д╕слан╕ пов╕домлення"
 
-#: mail/mail-callbacks.c:879
+#: mail/mail-callbacks.c:1013
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "В╕д╕слан╕ пов╕домлення"
 
-#: mail/mail-callbacks.c:1156
+#: mail/mail-callbacks.c:1374
 #, fuzzy, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Ви впевнен╕, що хочете стерти завдання \"%s\"?"
 
-#: mail/mail-callbacks.c:1170
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1202
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1224
+#: mail/mail-callbacks.c:1442
+#, fuzzy, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "Ви впевнен╕, що хочете стерти завдання \"%s\"?"
+
+#: mail/mail-callbacks.c:1463
 #, fuzzy
 msgid "No Message Selected"
 msgstr "Пов╕домлення було отримано"
 
-#: mail/mail-callbacks.c:1250 mail/mail-display.c:90
-msgid "Overwrite file?"
-msgstr "Переписати файл?"
-
-#: mail/mail-callbacks.c:1254 mail/mail-display.c:94
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Файл з ц╕╓ю назвою вже ╕сну╓.\n"
-"Переписати його?"
-
-#: mail/mail-callbacks.c:1298
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Зберегти пов╕домлення як..."
 
-#: mail/mail-callbacks.c:1300
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Зберегти пов╕домлення як..."
 
-#: mail/mail-callbacks.c:1435
+#: mail/mail-callbacks.c:1766
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "Помилка завантаження файлу: %s"
 
-#: mail/mail-callbacks.c:1484 ui/evolution-mail.xml.h:56
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "Ф╕льтри..."
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Надрукувати пов╕домлення"
 
-#: mail/mail-callbacks.c:1531
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "Не вдалося надрукувати пов╕домлення"
 
-#: mail/mail-callbacks.c:1609
+#: mail/mail-callbacks.c:1966
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Ви впевнен╕, що хочете стерти зустр╕ч"
 
-#: mail/mail-config.c:1121 mail/mail-config.c:1124
-msgid "Connecting to server..."
-msgstr "З'╓днання з сервером..."
-
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -6138,10 +6954,14 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:445
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr ""
 
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
+msgstr "З'╓днання з сервером..."
+
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Check for supported types "
@@ -6152,37 +6972,67 @@ msgid " color"
 msgstr " кол╕р"
 
 #: mail/mail-config.glade.h:3
+msgid "(SSL is not supported in this build of evolution)"
+msgstr ""
+
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "Account"
 msgstr "Електронна адреса м╕стить"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "Account Information"
 msgstr "Нема╓ ╕нформац╕╖"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Accounts"
 msgstr "Електронна адреса м╕стить"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#, fuzzy
+msgid "Attachment"
+msgstr "долучення"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Автенф╕кац╕я"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Тип автенф╕кац╕╖: "
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "П╕дготувати"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6192,362 +7042,563 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "De_fault"
 msgstr "Стерти"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Done"
 msgstr "Нема╓"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Чорновики"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Drafts folder:"
 msgstr "Створення ново╖ теки"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "Виправити"
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "Електронна адреса:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+msgid "Enabled"
+msgstr ""
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Повне ╕м'я:"
 
-#: mail/mail-config.glade.h:27
-msgid "Highlight citations with "
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "Файл п╕дпису:"
+
+#: mail/mail-config.glade.h:43
+msgid "Highlight citations with"
+msgstr ""
+
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Inline"
+msgstr "Покажчик"
+
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "Конф╕╜урац╕я пошти"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Формат"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:54
 #, fuzzy
-msgid "Mark messages as \"Read\" after:"
+msgid "Mark messages as Read after"
 msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "Сервер LDAP"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "News"
 msgstr "Новий"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Optional Information"
 msgstr "Нема╓ ╕нформац╕╖"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Ор╕╓нтац╕я:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 #, fuzzy
 msgid "PGP binary path:"
 msgstr "Шифрування PGP"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "Виб╕р кольору"
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "Неможливо в╕д╕слати пов╕домлення: не визначено отримувач╕в"
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "Прим╕тки"
+
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Receiving Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Required Information"
 msgstr "Нема╓ ╕нформац╕╖"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
+
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Security"
+msgstr "Безпека"
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 #, fuzzy
 msgid "Send mail in HTML format by default."
 msgstr "В╕д╕слати пошту в формат╕ HTML"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Sending Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "В╕д╕слано"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "В╕д╕слати пов╕домлення негайно"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "В╕д╕слати пов╕домлення п╕зн╕ше"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Конф╕╜урац╕я пошти"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Server Type: "
 msgstr "Сервер:"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Файл п╕дпису:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "Джерела"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Нема╓ ╕нформац╕╖"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Джерела"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Special Folders"
 msgstr "В╕ртуальн╕ теки"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
-#, fuzzy
-msgid "Type"
-msgstr "Тип:"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Назва користувача:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "Редагування"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
+msgstr ""
+
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
+msgstr ""
+
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "seconds."
+msgstr "В╕д╕слати"
+
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "Створити новий календар"
+
+#: mail/mail-crypto.c:86
+#, fuzzy
+msgid "Could not create a PGP verification context."
+msgstr "Створити новий календар"
+
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr "Не вдалось створити в╕кно конструктора."
+
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
+msgstr ""
+"Не вдалося створити каталог %s:\n"
+"%s"
+
+#: mail/mail-crypto.c:177
+msgid "Could not create a S/MIME signature context."
+msgstr ""
+
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
+msgstr ""
+
+#: mail/mail-crypto.c:240
+msgid "Could not create a S/MIME encryption context."
+msgstr ""
+
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "Не вдалось створити в╕кно конструктора."
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr "Не вдалось створити в╕кно конструктора."
 
-#: mail/mail-display.c:194
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Зберегти долучення"
 
-#: mail/mail-display.c:234
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Неможливо створити тимчасовий каталог: %s"
-
-#: mail/mail-display.c:295
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Зберегти на диск..."
 
-#: mail/mail-display.c:297
-#, c-format
-msgid "Open in %s..."
-msgstr "В╕дкрити в %s..."
-
-#: mail/mail-display.c:299
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:334
-msgid "External Viewer"
-msgstr ""
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "В╕дкрити в %s..."
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Прибрати"
 
-#: mail/mail-display.c:1107
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr ""
+
+#: mail/mail-display.c:1048
 #, fuzzy
-msgid "Open link in browser"
+msgid "Loading message content"
+msgstr "Пересилання пов╕домлень \"%s\""
+
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
 msgstr "В╕дкрити у новому в╕кн╕"
 
-#: mail/mail-display.c:1109
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "Контакт"
+
+#: mail/mail-display.c:1408
 #, fuzzy
-msgid "Save as (FIXME)"
+msgid "Save Link as (FIXME)"
 msgstr "Завдання"
 
-#: mail/mail-display.c:1111
+#: mail/mail-display.c:1410
 #, fuzzy
-msgid "Copy location (FIXME)"
-msgstr "Контакт"
+msgid "Save Image as..."
+msgstr "Зберегти як..."
 
-#: mail/mail-format.c:522
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr "В╕д╕слати"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "долучення"
 
-#: mail/mail-format.c:564
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:771
+#: mail/mail-format.c:746
 #, fuzzy
-msgid "Loading message content"
-msgstr "Пересилання пов╕домлень \"%s\""
+msgid "Date"
+msgstr "п╕сля"
 
-#: mail/mail-format.c:1071
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "Електронна адреса:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr "В╕д"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "В╕дпов╕дати на:"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "До"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Cc:"
+
+#: mail/mail-format.c:1291
 #, fuzzy
 msgid "No GPG/PGP program configured."
 msgstr "Програма GPG/PGP не доспуна."
 
-#: mail/mail-format.c:1086
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:1092
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Зашифроване пов╕домлення"
 
-#: mail/mail-format.c:1093
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1183 mail/mail-format.c:1571
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1191 mail/mail-format.c:1579
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1792
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1804
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1808
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1842
+#: mail/mail-format.c:2094
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr ""
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1847
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:337
-#, fuzzy, c-format
-msgid "No such folder %s"
-msgstr "Нев╕рна тека \"%s\"."
-
-#: mail/mail-local.c:509
+#: mail/mail-local.c:458
 #, fuzzy, c-format
 msgid "Opening '%s'"
 msgstr "В╕дкрити в %s..."
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:791
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:814
-#, fuzzy
-msgid "Reconfiguring folder"
-msgstr "Конф╕╜урувати теку"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:843
-msgid "Closing current folder"
-msgstr "Закривання поточно╖ теки"
-
-#: mail/mail-local.c:875
-msgid "Renaming old folder and opening"
-msgstr "Перейменування старо╖ теки та в╕дкривання"
-
-#: mail/mail-local.c:893
-msgid "Creating new folder"
-msgstr "Створення ново╖ теки"
-
-#: mail/mail-local.c:907
-msgid "Copying messages"
-msgstr "Коп╕ювання пов╕домлень"
-
-#: mail/mail-local.c:924
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:963
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr ""
+"Неможливо отримати пов╕домлення \"%s\" з теки \"%s\"\n"
+"  %s"
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "Конф╕╜урувати теку"
+
+#: mail/mail-mt.c:187
 #, fuzzy, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6556,382 +7607,342 @@ msgstr ""
 "Помилка п╕д час \"%s\":\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr "Помилка завантаження файлу: %s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:892
+#: mail/mail-mt.c:794
 #, fuzzy
 msgid "Working"
 msgstr "Перенесення"
 
-#: mail/mail-mt.c:680 mail/session.c:98
-msgid "Do you accept?"
-msgstr ""
-
-#: mail/mail-mt.c:874
-#, fuzzy
-msgid "Evolution progress"
-msgstr "Evolution"
-
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "В╕дсилання \"%s\""
 
-#: mail/mail-ops.c:603
-#, fuzzy
-msgid "Sending message"
-msgstr "Стерти це пов╕домлення негайно"
-
-#: mail/mail-ops.c:718
+#: mail/mail-ops.c:698
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Запис пов╕домлення %d з %d"
 
-#: mail/mail-ops.c:737
+#: mail/mail-ops.c:717
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: mail/mail-ops.c:739 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 #, fuzzy
 msgid "Complete."
 msgstr "% завершення:"
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:805
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Збереження пов╕домлень з теки \"%s\""
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "В╕д╕слан╕ пов╕домлення"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Коп╕ювання пов╕домлень"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Перенесення"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Коп╕ювання"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканування тек в \"%s\""
 
-#: mail/mail-ops.c:1152
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#, fuzzy
+msgid "Trash"
+msgstr "Завдання"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "Переслан╕ пов╕домлення"
 
-#: mail/mail-ops.c:1193 mail/mail-ops.c:1331
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "В╕дкривання теки %s"
 
-#: mail/mail-ops.c:1260
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1447
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "В╕дкривання теки %s"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "Конф╕╜урувати теку"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "Викреслення теки"
 
-#: mail/mail-ops.c:1496
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Отримання пов╕домлення %s"
 
-#: mail/mail-ops.c:1563
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Отримання пов╕домлення"
 
-#: mail/mail-ops.c:1573
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Отримання пов╕домлення %d з %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1647
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Збереження пов╕домлень"
 
-#: mail/mail-ops.c:1726
+#: mail/mail-ops.c:1887
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Не вдалося зберегти список груп для %s: %s"
 
-#: mail/mail-ops.c:1739
-#, fuzzy, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
-
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1913
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Помилка збереження файлу: %s"
 
-#: mail/mail-ops.c:1827
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "Збереження долучення"
 
-#: mail/mail-ops.c:1842
+#: mail/mail-ops.c:2003
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "Не вдалося зберегти список груп для %s: %s"
 
-#: mail/mail-ops.c:1870
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не вдалось записати дан╕: %s"
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "Пошук"
+#: mail/mail-ops.c:2101
+#, c-format
+msgid "Disconnecting from %s"
+msgstr ""
+
+#: mail/mail-search.c:138
+#, fuzzy
+msgid "(Untitled Message)"
+msgstr "(Ненайменований)"
+
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Надрукувати пов╕домлення"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "Виправити пов╕домлення"
 
-#: mail/mail-send-recv.c:138
+#: mail/mail-search.c:284
 #, fuzzy
-msgid "Cancelling ..."
+msgid "Find in Message"
+msgstr "Виправити пов╕домлення"
+
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-search.c:315
+#, fuzzy
+msgid "Search Forward"
+msgstr "Переслати"
+
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
+msgstr "Знайти"
+
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "Шлях:"
+
+#: mail/mail-send-recv.c:141
+#, fuzzy
+msgid "Cancelling..."
 msgstr "В╕дм╕нити"
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 #, fuzzy
 msgid "Send & Receive mail"
 msgstr "Sendmail"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "Отримання"
 
-#: mail/mail-send-recv.c:285
-msgid "Updating ..."
+#: mail/mail-send-recv.c:302
+#, fuzzy
+msgid "Updating..."
 msgstr "Оновлення..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
-msgid "Waiting ..."
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#, fuzzy
+msgid "Waiting..."
 msgstr "Оч╕кування..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "В╕дсилання"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "В╕дм╕нено."
 
-#: mail/mail-summary.c:110
-msgid "Incomplete message written on pipe!"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-summary.c:468
-#, fuzzy
-msgid "Mail Summary"
-msgstr "Нед╕ля"
-
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Не вдалося створити тимчасову поштову скриньку \"%s\": %s"
 
-#: mail/mail-tools.c:188
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (переслане пов╕домлення)"
-
-#: mail/mail-tools.c:198
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (без теми)"
-
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Переслане пов╕домлення %s"
 
-#: mail/mail-tools.c:217
-msgid "Forwarded message (no subject)"
-msgstr "Переслане пов╕домлення (без теми)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Переслан╕ пов╕домлення"
 
-#: mail/mail-tools.c:415
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Переслан╕ пов╕домлення"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "В╕ртуальн╕ теки"
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Нова в╕ртуальна тека"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:64
-msgid "Reply"
-msgstr "В╕дпов╕сти"
-
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:70
-msgid "Reply to the sender of this message"
-msgstr "В╕дпов╕сти в╕дправнику цього пов╕домлення"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:65
-msgid "Reply to All"
-msgstr "В╕дпов╕сти вс╕м"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:68
-msgid "Reply to all recipients of this message"
-msgstr "В╕дпов╕сти вс╕м отримувачам цього пов╕домлення"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:25
-msgid "Forward"
-msgstr "Переслати"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:29
-msgid "Forward this message"
-msgstr "Переслати це пов╕домлення"
-
-#: mail/message-browser.c:200 ui/evolution-mail.xml.h:61
-msgid "Print the selected message"
-msgstr "Надрукувати вибране пов╕домлення"
-
-#: mail/message-browser.c:203 ui/evolution-mail.xml.h:13
-msgid "Delete this message"
-msgstr "Стерти це пов╕домлення"
-
-#: mail/message-browser.c:208 ui/evolution-event-editor.xml.h:33
-#: ui/evolution-mail.xml.h:54 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Попередн╓"
-
-#: mail/message-browser.c:208
-msgid "Previous message"
-msgstr "Попередн╓ пов╕домлення"
-
-#: mail/message-browser.c:211 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:50
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Дал╕"
-
-#: mail/message-browser.c:211
-msgid "Next message"
-msgstr "Наступне пов╕домлення"
-
-#: mail/message-list.c:678
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:679
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:680
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:681
+#: mail/message-list.c:616
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "Не вдалося в╕д╕слати пов╕домлення: %s"
 
-#: mail/message-list.c:682
+#: mail/message-list.c:617
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Надрукувати пов╕домлення"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:621
 #, fuzzy
 msgid "Lowest"
 msgstr "Низький"
 
-#: mail/message-list.c:687
+#: mail/message-list.c:622
 #, fuzzy
 msgid "Lower"
 msgstr "Низький"
 
-#: mail/message-list.c:691
+#: mail/message-list.c:626
 #, fuzzy
 msgid "Higher"
 msgstr "Високий"
 
-#: mail/message-list.c:692
+#: mail/message-list.c:627
 #, fuzzy
 msgid "Highest"
 msgstr "Високий"
 
-#: mail/message-list.c:942
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:884
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:958
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:970
+#: mail/message-list.c:905
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:978
+#: mail/message-list.c:913
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:980
+#: mail/message-list.c:915
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:1082
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Збереження пов╕домлень"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1083
-msgid "From"
-msgstr "В╕д"
-
-#: mail/message-list.c:1083
-#, fuzzy
-msgid "Date"
-msgstr "п╕сля"
-
-#: mail/message-list.c:1083
+#: mail/message-list.etspec.h:4
 #, fuzzy
 msgid "Received"
 msgstr "Дата отримання"
 
-#: mail/message-list.c:1084
-msgid "To"
-msgstr "До"
-
-#: mail/message-list.c:1084
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "Розм╕р"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:47
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Тека"
 
@@ -6960,42 +7971,1468 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "В╕дм╕нити передплату на теку \"%s\""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "Керування передплатами"
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr ""
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the Evolution executive summary component."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: my-evolution/component-factory.c:140
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+msgid "Appointments"
+msgstr "Зустр╕ч╕"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "Показати зустр╕ч╕"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%I:%M%p"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%I:%M %p"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Нед╕ля"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "╤нсталяц╕я Evolution"
+
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Помилка завантаження календаря</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "Показати завдання"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "Розд╕ли:"
+
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A, %d %B %Y"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "Не вдалося надрукувати пов╕домлення"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): не вдалось ╕н╕ц╕ал╕зувати Bonobo"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "Очистити"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
+
+#: my-evolution/metar.c:63
+msgid "Variable"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "Прим╕тки"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "Нотатки:"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "Вийти"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "Джерела"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "м╕сяць"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "Низький"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Тест"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "Низький"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "Показати"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "Рад╕о"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Drifting rain"
+msgstr "Опис м╕стить"
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "Шукати дал╕"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "зараз"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Moderate snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+#, fuzzy
+msgid "Drifting snow grains"
+msgstr "Опис м╕стить"
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "Е-пошта"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "Показати все "
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "Первинна е-пошта"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "Sendmail"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Shallow small hail"
+msgstr "Показати все "
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Showers of small hail"
+msgstr "Показати все "
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown precipitation"
+msgstr "Аутенф╕кац╕я:"
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "Нев╕дома помилка"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "Час початку з╕брання:"
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "╕сну╓"
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "Книжна"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Drifting mist"
+msgstr "Список розсилки %s"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Shallow fog"
+msgstr "Показати все "
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "Закрити це в╕кно"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "Моб╕льний"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "Показати завдання"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "Закрити це в╕кно"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "В╕дправити"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "Верхн╕й колонтитул"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "Т╕ло"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+msgid "Dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Raging tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Thunderous tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+msgid "Add new feed"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Теки"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "Весь супров╕д"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Створення ново╖ теки"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "Параметри в╕дображення"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "День"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "П'ятниця"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "Середа"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "м╕сяць"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr "Показати 1 тиждень"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr "Планування зустр╕ч╕"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Показати завдання"
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "Show full path for folders"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "Показати завдання"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "Завдання"
+
+#: my-evolution/my-evolution.glade.h:24
+msgid "Units: "
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "╤нша"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "Очистити вибране"
+
+#: my-evolution/my-evolution.glade.h:27
+msgid "imperial"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#, fuzzy
+msgid "The Evolution shell."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "Подробиц╕"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "Скасувати зустр╕ч"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "В╕ртуальн╕ теки"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "╤нсталяц╕я Evolution"
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "Натисн╕ть \"Гаразд\" щоб встановити файли, чи \"В╕дм╕нити\" щоб вийти."
 
-#: shell/e-setup.c:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "Не вдалося коректно поновити файли"
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr "Файли Evolution усп╕шно встановлено."
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 #, fuzzy
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Схоже це ваш перший запуск Evolution."
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -7006,16 +9443,14 @@ msgstr ""
 "%s\n"
 "Помилка: %s"
 
-#: shell/e-setup.c:230
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
-msgstr ""
-"Неможливо скоп╕ювати файли в\n"
-"\"%s\"."
+msgstr "Сталася помилка п╕д час зчитування файлу."
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7023,7 +9458,16 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7031,19 +9475,58 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell.c:379
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "Не вдалося отримати теку: %s: %s"
+
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"Неможливо скоп╕ювати файли в\n"
+"\"%s\"."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
 #, c-format
-msgid "Cannot set up local storage -- %s"
+msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell.c:1249
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "Скоп╕ювати у теку"
+
+#: shell/e-shell-folder-commands.c:313
 #, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "Перенести в теку"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "Стерти завдання"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "Ви впевнен╕, що хочете стерти завдання \"%s\"?"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "В╕дкривання теки %s"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -7052,200 +9535,424 @@ msgstr ""
 "Неможливо створити вказану теку:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "Вказана назва теки не в╕рна."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Створення ново╖ теки"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:321
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Новий..."
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Ненайменований)"
 
-#: shell/e-shell-view.c:148
-msgid "(No folder displayed)"
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
 msgstr ""
 
-#: shell/e-shell-view.c:1184
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
 #, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
 
-#: shell/e-shell-view.c:1186
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
 #, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:352
+#, fuzzy, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr "Нема╓ ново╖ кореспонденц╕╖ на %s."
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr "╤мпортування"
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:383
+#, fuzzy, c-format
+msgid "Error starting %s"
+msgstr "Помилка збереження файлу: %s"
+
+#: shell/e-shell-importer.c:402
+#, c-format
+msgid "Error loading %s"
+msgstr "Помилка завантаження %s"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/e-shell-importer.c:488
+#, fuzzy
+msgid "Automatic"
+msgstr "Автовиб╕р"
+
+#: shell/e-shell-importer.c:538
+msgid "Filename:"
+msgstr "Назва файлу:"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "Вибрати файл"
+
+#: shell/e-shell-importer.c:553
+msgid "File type:"
+msgstr "Тип файлу:"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "Виб╕р теки"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy не знайдено за шляхом вказаним в $PATH."
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Не вдалося запустити Bug buddy"
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Перейти на теку..."
 
-#: shell/e-shortcuts.c:381
-msgid "Error saving shortcuts."
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Створити новий контакт"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
+msgstr "Перенесення"
+
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+#, fuzzy
+msgid "Work Offline"
+msgstr "Перенесення"
+
+#: shell/e-shell-view.c:175
+msgid "(No folder displayed)"
+msgstr ""
+
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1411
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
+
+#: shell/e-shell-view.c:1413
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr ""
+
+#: shell/e-shell.c:1311
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Назва групи:"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "Не видаляти"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "Актив╕зувати цей ярлик"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "Актив╕зувати цей ярлик"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "Мал╕ п╕ктограми"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Показувати ярлик╕ як мал╕ п╕ктограми"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "Велик╕ п╕ктограми"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Показувати ярлик╕ як велик╕ п╕ктограми"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "Нова група..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "Видалити цю групу..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "Актив╕зувати цей ярлик"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "Видалити цю групу..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "Актив╕зувати цей ярлик"
+
+#: shell/e-shortcuts-view.c:341
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "Показувати ярлик╕ як велик╕ п╕ктограми"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "Показувати ярлик╕ як велик╕ п╕ктограми"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "Актив╕зувати"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "Актив╕зувати цей ярлик"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "Актив╕зувати цей ярлик"
+
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "В╕дкрити"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr "В╕дкрити у новому в╕кн╕"
+
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "В╕дкрити поточне пов╕домлення у новому в╕кн╕"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "Назва правила: "
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
 msgstr "Актив╕зувати цей ярлик"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:585
+msgid "Error saving shortcuts."
+msgstr ""
+
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Панель ярлик╕в"
+
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "Контакт"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Без назви)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Без помилок"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Загальна помилка"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "Тека з ц╕╓ю назвою вже ╕сну╓"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "Вказаний тип теки не в╕рний"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "Помилка вводу/виводу"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "Не вистача╓ м╕сця для створення теки"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "Вказано╖ теки не знайдено"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr ""
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "Операц╕я не п╕дтриму╓ться"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage-set-view.c:650 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:44
-msgid "_View"
-msgstr "Вид"
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
 
-#: shell/e-storage-set-view.c:650
-msgid "View the selected folder"
-msgstr "Показати вибрану теки"
+#: shell/e-task-widget.c:173
+#, fuzzy
+msgid "%s (%d%% complete)"
+msgstr "% завершення:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "Будь-яке поле м╕стить"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "Комп'ютер:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
 
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #, fuzzy
@@ -7262,93 +9969,6 @@ msgstr "Теки"
 msgid "Specify where to create the folder:"
 msgstr "Не вистача╓ м╕сця для створення теки"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-#, fuzzy
-msgid "The Evolution shell."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
-
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-
-#: shell/importer/importer.c:341
-#, fuzzy, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr "Нема╓ ново╖ кореспонденц╕╖ на %s."
-
-#: shell/importer/importer.c:351
-msgid "Importing"
-msgstr "╤мпортування"
-
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-
-#: shell/importer/importer.c:372
-#, fuzzy, c-format
-msgid "Error starting %s"
-msgstr "Помилка збереження файлу: %s"
-
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
-msgstr "Помилка завантаження %s"
-
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-
-#: shell/importer/importer.c:473
-#, fuzzy
-msgid "Automatic"
-msgstr "Автовиб╕р"
-
-#: shell/importer/importer.c:523
-msgid "Filename:"
-msgstr "Назва файлу:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
-msgstr "Вибрати файл"
-
-#: shell/importer/importer.c:538
-msgid "File type:"
-msgstr "Тип файлу:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
-msgstr "╤мпорт"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -7370,276 +9990,370 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:143
+#: shell/importer/intelligent.c:191
+#, fuzzy
+msgid "Importers"
+msgstr "╤мпорт"
+
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "Не видаляти"
+
+#: shell/importer/intelligent.c:199
 #, fuzzy
 msgid "Don't ask me again"
 msgstr "Б╕льше не показувати це пов╕домлення."
 
-#: shell/main.c:82
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
 #, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:107
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:138
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
 
-#: shell/main.c:184
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:185
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:217
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Не вдалося ╕н╕ц╕ал╕зувати компонентну систему Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Скоп╕ювати"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
+msgstr "Скоп╕ювати вибране"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "Створити новий контакт"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Стерти контакт"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "Створити новий контакт"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Знайти"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Вир╕зати"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Знайти контакт"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr "Вир╕зати вибране"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "Стерти контакт"
+
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Новий контакт"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:53
-msgid "Previews the message to be printed"
-msgstr "Переглянути пов╕домлення, що буде надрукувано"
-
 #: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+#, fuzzy
+msgid "New list"
+msgstr "Новий"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Вставити"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "Вставити буфер обм╕ну"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
+msgstr "Переглянути календар, що буде надрукувано"
+
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "Надрукувати контакти"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:84
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "Вибрати все"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "Стерти контакт"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Зупинити"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Зупинити завантаження"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "Показати все"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "Показати вс╕ контакти"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "_Addressbook Sources..."
 msgstr "Додати джерело"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "Контакт"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "Контакт"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "Друкувати..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "Пошук контакт╕в"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:117
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:43
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
+msgstr "Вибрати все"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "╤нструменти"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 Дн╕в"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-#, fuzzy
-msgid "Alter preferences"
-msgstr "Параметри календаря"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Create a new all day Event"
+msgid "Create a New All-Day _Event"
 msgstr "Створити новий календар"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Створити нову зустр╕ч"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Створити новий календар"
+msgid "Create a new appointment"
+msgstr "Створити нову зустр╕ч"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "День"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Go To"
 msgstr "Перейти"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Перейти назад в час╕"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Перейти вперед в час╕"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 #, fuzzy
 msgid "Go to _Date"
 msgstr "К╕нцева дата"
 
-#: ui/evolution-calendar.xml.h:12
-#, fuzzy
-msgid "Go to _Today"
-msgstr "сьогодн╕"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Перейти до вказано╖ дати"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Поперейти в точний час"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "М╕сяць"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr "Нова под╕я"
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "В╕дкрити календар"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "Назад"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Нова зустр╕ч"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Переглянути календар, що буде надрукувано"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Надрукувати календар"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Надрукувати цей календар"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Зберегти як"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "Нема╓ ╕нформац╕╖"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "Зберегти календар як щось ╕нше"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Показати 1 день"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Показати 1 м╕сяць"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Показати 1 тиждень"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Показати робочий тиждень"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
-msgid "Today"
-msgstr "сьогодн╕"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 #, fuzzy
 msgid "W_ork Week"
 msgstr "Робочий тиждень"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "Тиждень"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "Зустр╕ч╕"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "Установки пошти..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "День"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "М╕сяць"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:39
-msgid "_New"
-msgstr "Новий"
-
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "В╕дкрити календар"
-
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-calendar.xml.h:37
 #, fuzzy
 msgid "_Week"
 msgstr "Тиждень"
 
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Закрити"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "Закрити цю зустр╕ч"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "Стерти цю зустр╕ч"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "Головна панель ╕нструмент╕в"
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "Переглянути пов╕домлення, що буде надрукувано"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "Перегляд друку"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "Параметри друку"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Надрукувати цей елемент"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "Друкувати..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "Зберегти та закрити"
+
+#: ui/evolution-comp-editor.xml.h:16
+#, fuzzy
+msgid "Save the appointment and close the dialog box"
+msgstr "Зберегти контакт ╕ закрити д╕алог"
+
+#: ui/evolution-comp-editor.xml.h:17
+msgid "Save this item to disk"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "Д╕╖"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "Файл"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Стерти цей елемент"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "Стерти..."
 
@@ -7651,27 +10365,12 @@ msgstr "Дов╕дка"
 msgid "Print En_velope..."
 msgstr "Надрукувати конверт..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Надрукувати цей елемент"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:62 ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Друкувати..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Зберегти як..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Зберегти та закрити"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Зберегти контакт ╕ закрити д╕алог"
@@ -7689,911 +10388,1019 @@ msgstr ""
 msgid "Send _message to contact..."
 msgstr "В╕д╕слати пов╕домлення за контактом..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
-msgid "_File"
-msgstr "Файл"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "Зберегти"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Про цю програму"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "Стерти цей елемент"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Про..."
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "Зберегти контакт ╕ закрити д╕алог"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "Д╕╖"
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "В╕д╕слати контакт ╕ншому..."
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "Адресна книга..."
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "В╕д╕слати пов╕домлення за контактом..."
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "Очистити"
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "Скасувати зустр╕ч"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "Вир╕зати"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#, fuzzy
+msgid "Cancel the meeting for this item"
+msgstr "Зм╕нити властивост╕ ц╕╓╖ теки"
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Chec_k Names (FIXME)"
-msgstr "Завдання"
+msgid "Forward as i_Calendar"
+msgstr "Завантаження календаря"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "Очистити"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "Переслати це пов╕домлення"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "Очистити вибране"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Закрити цю зустр╕ч"
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr "Планування зустр╕ч╕"
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "Скоп╕ювати у теку..."
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr "Планувати зустр╕ч"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Скоп╕ювати"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#, fuzzy
+msgid "Schedule a meeting for this item"
+msgstr "Планування зустр╕ч╕"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Скоп╕ювати вибране"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "Д╕╖"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Вир╕зати"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "%s - Evolution %s"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Вир╕зати вибране"
+#: ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "В╕дм╕нено"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Стерти цю зустр╕ч"
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "Зберегти поточний файл"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "П╕дготувати"
+
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Скласти нове пов╕домлення"
+
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "Перший елемент у тец╕"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "Переслати"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr "Спорожнити см╕тник"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "Забути парол╕"
+
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "Перейти до наступного елементу"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
+msgstr "Керування передплатами..."
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Перейти до попереднього елементу"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "Невиконане завдання"
+#: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Перенести пов╕домлення у нову теку"
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr ""
+#: ui/evolution-mail-global.xml.h:14
+#, fuzzy
+msgid "Send / Receive"
+msgstr "Дата отримання"
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "Наступний"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "В╕д╕слати пов╕домлення з черги та отримати нов╕"
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Вставити"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Вставити буфер обм╕ну"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "Попередн╕й"
+#: ui/evolution-mail-global.xml.h:18
+#, fuzzy
+msgid "Virtual Folder _Editor..."
+msgstr "Редактор в╕ртуальних тек"
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "Перегляд друку"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
+msgstr "Ф╕льтри..."
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "Параметри друку..."
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr "В╕д╕слати пов╕домлення"
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Параметри друку"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "Установки пошти..."
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
-msgid "Save"
-msgstr "Зберегти"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "Перегляд"
 
-#: ui/evolution-event-editor.xml.h:43
+#: ui/evolution-mail-global.xml.h:23
 #, fuzzy
-msgid "Save the appointment and close the dialog box"
-msgstr "Зберегти контакт ╕ закрити д╕алог"
+msgid "_Send / Receive"
+msgstr "Дата отримання"
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "Зберегти поточний файл"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr "Зм╕нити властивост╕ ц╕╓╖ теки"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "Планувати зустр╕ч"
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "Стерти вибран╕ пов╕домлення"
 
-#: ui/evolution-event-editor.xml.h:47
+#: ui/evolution-mail-list.xml.h:5
 #, fuzzy
-msgid "Schedule some sort of a meeting"
-msgstr "Планування зустр╕ч╕"
+msgid "Cut selected messages"
+msgstr "Стерти вибран╕ пов╕домлення"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "Вибрати все"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "Прибрати вибран╕ пов╕домлення"
+
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "Прибрати стерт╕ пов╕домлення"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
+#: ui/evolution-mail-list.xml.h:8
 #, fuzzy
-msgid "Select everything"
-msgstr "Вибрати назви"
+msgid "Hide _Read Messages"
+msgstr "Прибрати прочитан╕ пов╕домлення"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "Позначити вс╕ прочитаними"
+
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
-msgid "Task _Request (FIXME)"
-msgstr "Завдання"
+msgid "Mark all visible messages as read"
+msgstr "Надрукувати вибране пов╕домлення"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "Про..."
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "Вставити буфер обм╕ну"
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "Закрити"
+#: ui/evolution-mail-list.xml.h:14
+#, fuzzy
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Перенести пов╕домлення у нову теку"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
-msgid "_Contact (FIXME)"
-msgstr "Контакт"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "Вибрати все"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "Скоп╕ювати"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "Вибрати г╕лку"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "Налагодження"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:35
-msgid "_Help"
-msgstr "Дов╕дка"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "Елемент"
+#: ui/evolution-mail-list.xml.h:19
+#, fuzzy
+msgid "Select all visible messages"
+msgstr "Стерти вибран╕ пов╕домлення"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "Журнальний запис"
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "Показати все"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "Останн╕й елемент у тец╕"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "В╕д╕слати пов╕домлення"
+#: ui/evolution-mail-list.xml.h:22
+#, fuzzy
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Надрукувати вибране пов╕домлення"
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "Перенести в теку..."
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "Стерти вибран╕ пов╕домлення"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "Прим╕тка"
+#: ui/evolution-mail-list.xml.h:24
+#, fuzzy
+msgid "Threaded Message list"
+msgstr "Переслати це пов╕домлення"
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "Вставити"
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "Викреслити"
+
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "Тека"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "╤нвертувати виб╕р"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:109
-#: ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Properties..."
 msgstr "Властивост╕..."
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "Вибрати все"
-
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:42
-msgid "_Task (FIXME)"
-msgstr "Завдання"
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "Переслати це пов╕домлення"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
+#: ui/evolution-mail-message.xml.h:1
 #, fuzzy
-msgid "_Unread Item (FIXME)"
-msgstr "Контакт"
+msgid "Apply filter rules to the selected messages"
+msgstr "Стерти вибран╕ пов╕домлення"
 
-#: ui/evolution-executive-summary.xml.h:1
+#: ui/evolution-mail-message.xml.h:2
 #, fuzzy
-msgid "Add Service"
-msgstr "Додати джерело"
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "В╕дпов╕сти вс╕м отримувачам цього пов╕домлення"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:3
+#: ui/evolution-mail-message.xml.h:4
 #, fuzzy
-msgid "Create a new email"
-msgstr "Створити новий контакт"
+msgid "Compose a reply to the sender of the selected message"
+msgstr "В╕дпов╕сти в╕дправнику цього пов╕домлення"
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr ""
+#: ui/evolution-mail-message.xml.h:6
+msgid "Copy selected messages to another folder"
+msgstr "Скоп╕ювати вибран╕ пов╕домлення у ╕ншу теку"
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Нова пошта"
+#: ui/evolution-mail-message.xml.h:7
+msgid "Create _Virtual Folder From Message"
+msgstr "Створити в╕ртуальну теку з пов╕домлення"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:3
-msgid "Change the properties of this folder"
-msgstr "Зм╕нити властивост╕ ц╕╓╖ теки"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:4
-msgid "Compose"
-msgstr "П╕дготувати"
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
-msgstr "Скласти нове пов╕домлення"
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:6
-msgid "Configure Folder..."
-msgstr "Налаштувати теку..."
+#: ui/evolution-mail-message.xml.h:12
+#, fuzzy
+msgid "Create a virtual folder for these recipients"
+msgstr "Створити в╕ртуальну теку з пов╕домлення"
 
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
-msgstr "Скоп╕ювати пов╕домлення у нову теку"
+#: ui/evolution-mail-message.xml.h:13
+#, fuzzy
+msgid "Create a virtual folder for this mailing list"
+msgstr "Створити в╕ртуальну теку з пов╕домлення"
 
-#: ui/evolution-mail.xml.h:9
-msgid "Copy selected messages to another folder"
-msgstr "Скоп╕ювати вибран╕ пов╕домлення у ╕ншу теку"
+#: ui/evolution-mail-message.xml.h:14
+#, fuzzy
+msgid "Create a virtual folder for this sender"
+msgstr "Створити в╕ртуальну теку з пов╕домлення"
 
-#: ui/evolution-mail.xml.h:10
-msgid "Create _Virtual Folder From Message"
+#: ui/evolution-mail-message.xml.h:15
+#, fuzzy
+msgid "Create a virtual folder for this subject"
 msgstr "Створити в╕ртуальну теку з пов╕домлення"
 
-#: ui/evolution-mail.xml.h:12
-msgid "Delete the selected messages"
+#: ui/evolution-mail-message.xml.h:17
+#, fuzzy
+msgid "Display the next important message"
+msgstr "В╕дпов╕сти в╕дправнику цього пов╕домлення"
+
+#: ui/evolution-mail-message.xml.h:18
+#, fuzzy
+msgid "Display the next message"
+msgstr "Перейти до наступного пов╕домлення"
+
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
 msgstr "Стерти вибран╕ пов╕домлення"
 
-#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:15
-msgid "Edit Message"
-msgstr "Виправити пов╕домлення"
-
-#: ui/evolution-mail.xml.h:16
-msgid "Edit the current message"
-msgstr "Виправити поточне пов╕домлення"
+#: ui/evolution-mail-message.xml.h:21
+#, fuzzy
+msgid "Display the previous important message"
+msgstr "Перейти до попереднього пов╕домлення"
 
-#: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
-msgstr "Спорожнити см╕тник"
+#: ui/evolution-mail-message.xml.h:22
+#, fuzzy
+msgid "Display the previous message"
+msgstr "Перейти до попереднього пов╕домлення"
 
-#: ui/evolution-mail.xml.h:18
-msgid "Expunge"
-msgstr "Викреслити"
+#: ui/evolution-mail-message.xml.h:23
+#, fuzzy
+msgid "Display the previous unread message"
+msgstr "Перейти до попереднього пов╕домлення"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Filter on Mailing _List"
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "Ф╕льтр списку розсилки"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "Ф╕льтр в╕дправника"
 
-#: ui/evolution-mail.xml.h:21
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "Ф╕льтр отримувач╕в"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "Ф╕льтр теми"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Finaly remove all mails tagged for deletion"
-msgstr "Остаточно видалити пошту в╕дм╕чену для стирання"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:24
-msgid "Forget _Passwords"
-msgstr "Забути парол╕"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "Переслати"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "Переслати як"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail-message.xml.h:31
 #, fuzzy
-msgid "Forward inline"
-msgstr "Переслати"
-
-#: ui/evolution-mail.xml.h:28
-msgid "Forward the selected mail to someone"
-msgstr ""
+msgid "Forward _Attached"
+msgstr "Переслати як"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail-message.xml.h:32
 #, fuzzy
-msgid "Forward this message in-line with your mail, so you can edit it"
-msgstr "Переслати пов╕домлення без теми"
-
-#: ui/evolution-mail.xml.h:31
-msgid "Full _Headers"
-msgstr "Повн╕ заголовки"
-
-#: ui/evolution-mail.xml.h:32
-msgid "Go to the next message"
-msgstr "Перейти до наступного пов╕домлення"
-
-#: ui/evolution-mail.xml.h:33
-msgid "Go to the previous message"
-msgstr "Перейти до попереднього пов╕домлення"
-
-#: ui/evolution-mail.xml.h:34
-msgid "Hide Deleted Messages"
-msgstr "Прибрати стерт╕ пов╕домлення"
+msgid "Forward _Inline"
+msgstr "Переслати"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Hide S_elected Messages"
-msgstr "Прибрати вибран╕ пов╕домлення"
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Forward _Quoted"
+msgstr "Переслати"
 
-#: ui/evolution-mail.xml.h:36
-msgid "Hide _Deleted Messages"
-msgstr "Прибрати стерт╕ пов╕домлення"
+#: ui/evolution-mail-message.xml.h:34
+#, fuzzy
+msgid "Forward the selected message in the body of a new message"
+msgstr "Надрукувати вибране пов╕домлення"
 
-#: ui/evolution-mail.xml.h:37
-msgid "Hide _Read messages"
-msgstr "Прибрати прочитан╕ пов╕домлення"
+#: ui/evolution-mail-message.xml.h:35
+#, fuzzy
+msgid "Forward the selected message quoted like a reply"
+msgstr "Надрукувати вибране пов╕домлення"
 
-#: ui/evolution-mail.xml.h:38
-msgid "Invert Selection"
-msgstr "╤нвертувати виб╕р"
+#: ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward the selected message to someone"
+msgstr "Перенести пов╕домлення у нову теку"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Manage _Subscriptions..."
-msgstr "Керування передплатами..."
+#: ui/evolution-mail-message.xml.h:37
+#, fuzzy
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Надрукувати вибране пов╕домлення"
 
-#: ui/evolution-mail.xml.h:41
-msgid "Mark All as R_ead"
-msgstr "Позначити вс╕ прочитаними"
+#: ui/evolution-mail-message.xml.h:39
+#, fuzzy
+msgid "Load _Images"
+msgstr "Переслан╕ пов╕домлення"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Mark As Read"
-msgstr "Позначити прочитаним"
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "Важливо"
 
-#: ui/evolution-mail.xml.h:43
-msgid "Mark As U_nread"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
 msgstr "Позначити непрочитаним"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail-message.xml.h:44
 #, fuzzy
 msgid "Mark the selected messages as having been read"
 msgstr "Надрукувати вибране пов╕домлення"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "Надрукувати вибране пов╕домлення"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Надрукувати вибране пов╕домлення"
+
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "Надрукувати вибране пов╕домлення"
+
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Перенести"
 
-#: ui/evolution-mail.xml.h:48
-msgid "Move message to a new folder"
-msgstr "Перенести пов╕домлення у нову теку"
-
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Move selected messages to another folder"
 msgstr "Перенести пов╕домлення у нову теку"
 
-#: ui/evolution-mail.xml.h:51
-msgid "Open in New Window"
-msgstr "В╕дкрити у новому в╕кн╕"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "Дал╕"
 
-#: ui/evolution-mail.xml.h:52
-msgid "Open the current message in a new window"
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Наступне пов╕домлення"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Наступне пов╕домлення"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Вибрати г╕лку"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Наступне пов╕домлення"
+
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Open the selected message in a new window"
 msgstr "В╕дкрити поточне пов╕домлення у новому в╕кн╕"
 
-#: ui/evolution-mail.xml.h:58
-msgid "Print Preview of message..."
-msgstr "Перегляд друку пов╕домлення..."
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Open the selected message in the composer to re-send it"
+msgstr "Надрукувати вибране пов╕домлення"
 
-#: ui/evolution-mail.xml.h:59
-msgid "Print message to the printer"
-msgstr "Надрукувати пов╕домлення на принтер╕"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "Переглянути пов╕домлення, що буде надрукувано"
 
-#: ui/evolution-mail.xml.h:60
-msgid "Print message..."
-msgstr "Надрукувати пов╕домлення..."
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "Попередн╓"
 
-#: ui/evolution-mail.xml.h:63
-msgid "Redirect (FIXME: implement me)"
-msgstr "Перенаправити"
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Попередн╓ пов╕домлення"
 
-#: ui/evolution-mail.xml.h:67
-msgid "Reply to all"
-msgstr "В╕дпов╕сти вс╕м"
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Попередн╓ пов╕домлення"
 
-#: ui/evolution-mail.xml.h:69
-msgid "Reply to sender"
-msgstr "В╕дпов╕сти в╕дправнику"
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Попередн╓ пов╕домлення"
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
-msgid "S_earch Message"
-msgstr "Серверне пов╕домлення:"
+msgid "Print Message..."
+msgstr "Надрукувати пов╕домлення..."
 
-#: ui/evolution-mail.xml.h:72
-msgid "S_ource"
-msgstr "Джерело"
+#: ui/evolution-mail-message.xml.h:65
+#, fuzzy
+msgid "Print Preview..."
+msgstr "Перегляд друку"
 
-#: ui/evolution-mail.xml.h:73
-msgid "Save the message into a new file"
-msgstr "Зберегти пов╕домлення у новому файл╕"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "Надрукувати пов╕домлення"
 
-#: ui/evolution-mail.xml.h:75 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Вибрати все"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "В╕дпов╕сти"
 
-#: ui/evolution-mail.xml.h:76
-msgid "Select _Thread"
-msgstr "Вибрати г╕лку"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "В╕дпов╕сти вс╕м"
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
-msgid "Send / Receive"
-msgstr "Дата отримання"
+msgid "S_earch Message"
+msgstr "Серверне пов╕домлення:"
+
+#: ui/evolution-mail-message.xml.h:72
+#, fuzzy
+msgid "Save the message as a text file"
+msgstr "Зберегти пов╕домлення у новому файл╕"
 
-#: ui/evolution-mail.xml.h:78
-msgid "Send a reply to the person who sent you this mail"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:79
-msgid "Send a single mail in reply to all the selected mail"
+#: ui/evolution-mail-message.xml.h:74
+msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:80
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
-msgstr "В╕д╕слати пов╕домлення з черги та отримати нов╕"
+msgid "Show Full _Headers"
+msgstr "Повн╕ заголовки"
 
-#: ui/evolution-mail.xml.h:82
-msgid "Send queued mail and retrieve new mail"
-msgstr "В╕д╕слати пов╕домлення з черги та отримати нов╕"
+#: ui/evolution-mail-message.xml.h:76
+#, fuzzy
+msgid "Show message in the normal style"
+msgstr ""
+"Дату потр╕бно вводити у такому формат╕: \n"
+"\n"
+"%s"
 
-#: ui/evolution-mail.xml.h:83
-msgid "Show _All"
-msgstr "Показати все"
+#: ui/evolution-mail-message.xml.h:77
+#, fuzzy
+msgid "Show message with all email headers"
+msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: ui/evolution-mail.xml.h:85
+#: ui/evolution-mail-message.xml.h:78
 #, fuzzy
-msgid "Threaded Message list"
-msgstr "Переслати це пов╕домлення"
+msgid "Show the raw email source of the message"
+msgstr "Долучити файл до пов╕домлення"
 
-#: ui/evolution-mail.xml.h:86
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Надрукувати вибране пов╕домлення"
 
-#: ui/evolution-mail.xml.h:87
-msgid "Undelete"
-msgstr "В╕дновити"
+#: ui/evolution-mail-message.xml.h:80
+#, fuzzy
+msgid "VFolder on Mailing _List..."
+msgstr "Ф╕льтр списку розсилки"
 
-#: ui/evolution-mail.xml.h:92
-msgid "View Raw Message Source"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:81
+#, fuzzy
+msgid "VFolder on Se_nder..."
+msgstr "В╕ртуальна тека в╕дправника"
 
-#: ui/evolution-mail.xml.h:93
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
-msgid "Virtual Folder _Editor..."
-msgstr "Редактор в╕ртуальних тек"
+msgid "VFolder on _Recipients..."
+msgstr "В╕ртуальна тека отримувач╕в"
 
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail-message.xml.h:83
+#, fuzzy
+msgid "VFolder on _Subject..."
+msgstr "В╕ртуальна тека теми"
+
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "Застосувати ф╕льтри"
 
-#: ui/evolution-mail.xml.h:95
-msgid "_Attachment"
-msgstr "Долучення"
+#: ui/evolution-mail-message.xml.h:85
+#, fuzzy
+msgid "_Copy to Folder"
+msgstr "Скоп╕ювати у теку"
 
-#: ui/evolution-mail.xml.h:97
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "_Create Filter From Message"
 msgstr "Створити правило з пов╕домлення"
 
-#: ui/evolution-mail.xml.h:99
-msgid "_Expunge"
-msgstr "Викреслити"
-
-#: ui/evolution-mail.xml.h:100
-msgid "_Filters..."
-msgstr "Ф╕льтри..."
-
-#: ui/evolution-mail.xml.h:101 ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "Тека"
+#: ui/evolution-mail-message.xml.h:88
+#, fuzzy
+msgid "_Forward Message"
+msgstr "Переслан╕ пов╕домлення"
 
-#: ui/evolution-mail.xml.h:103
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
-msgid "_Inline"
-msgstr "Покажчик"
+msgid "_Message Display"
+msgstr "Пов╕домлення"
 
-#: ui/evolution-mail.xml.h:104 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "╤нвертувати виб╕р"
+#: ui/evolution-mail-message.xml.h:90
+#, fuzzy
+msgid "_Move to Folder"
+msgstr "Перенести в теку"
 
-#: ui/evolution-mail.xml.h:105
-msgid "_Mail Message"
-msgstr "В╕д╕слати пов╕домлення"
+#: ui/evolution-mail-message.xml.h:91
+#, fuzzy
+msgid "_Normal Display"
+msgstr "День"
 
-#: ui/evolution-mail.xml.h:106
-msgid "_Mail Settings..."
-msgstr "Установки пошти..."
+#: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Open Message"
+msgstr "В╕д╕слати пов╕домлення знову"
 
-#: ui/evolution-mail.xml.h:108
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
-msgid "_Open Selected Items"
-msgstr "В╕дкрити завдання"
+msgid "_Re-send Message"
+msgstr "В╕д╕слати пов╕домлення знову"
 
-#: ui/evolution-mail.xml.h:110
-msgid "_Quoted"
-msgstr ""
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Закрити це в╕кно"
 
-#: ui/evolution-mail.xml.h:111
-msgid "_Reply"
-msgstr "В╕дпов╕сти"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr ""
 
-#: ui/evolution-mail.xml.h:112
-msgid "_Resend Messages"
-msgstr "В╕д╕слати пов╕домлення знову"
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:114
-msgid "_Save Message As..."
-msgstr "Зберегти пов╕домлення як..."
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:115
-#, fuzzy
-msgid "_Send / Receive"
-msgstr "Дата отримання"
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "Закрити"
 
-#: ui/evolution-mail.xml.h:116
-msgid "_Threaded"
-msgstr ""
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "Вид"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Долучити"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Закрити поточний файл"
 
 #: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Delete all but signature"
+msgstr "Стерти контакт"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Зашифрувати це пов╕домлення PGP"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "Формат"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "Вставити текстовий файл..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Вставити файл як текст у пов╕домлення"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Вставити текстовий файл..."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "В╕дкрити файл"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "Шифрування PGP"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "П╕дпис PGP"
 
 #: ui/evolution-message-composer.xml.h:17
 #, fuzzy
-msgid "Save _Draft"
-msgstr "Чорновик"
+msgid "S/MIME Encrypt"
+msgstr "Шифрування PGP"
 
 #: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Зберегти в тец╕..."
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "Зберегти"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Зберегти як"
+
+#: ui/evolution-message-composer.xml.h:22
+#, fuzzy
+msgid "Save _Draft"
+msgstr "Чорновик"
+
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Зберегти в тец╕..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "Зберегти поточний файл"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Зберегти поточний файл з ╕ншою назвою"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "В╕дправити"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "В╕дправити п╕зн╕ше"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "В╕дправити п╕зн╕ше"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "В╕д╕слати пошту в формат╕ HTML"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "В╕д╕слати пов╕домлення п╕зн╕ше"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "В╕д╕слати пов╕домлення негайно"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Стерти це пов╕домлення негайно"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Показати / прибрати долучення"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Показати долучення"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Показати долучення"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "П╕дписати це пов╕домлення вашим ключем PGP"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "П╕дписати це пов╕домлення вашим ключем PGP"
+
+#: ui/evolution-message-composer.xml.h:38
 #, fuzzy
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Перемикнути стан показу панел╕ тек"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 #, fuzzy
 msgid "Toggles whether the CC field is displayed"
 msgstr "Перемикнути стан показу панел╕ тек"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 #, fuzzy
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Перемикнути стан показу панел╕ тек"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "Долучення"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "Налагодження"
+
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Delete all"
+msgstr "Стерти"
+
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "Вставити"
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
-msgstr "Вставити текстовий файл..."
-
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "В╕дкрити..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 #, fuzzy
 msgid "_Reply-To Field"
 msgstr "В╕дпов╕дати на:"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "Безпека"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "Дов╕дка"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Додати теку до вашого списку передплачених тек"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "Тека"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Оновити список"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Оновити список тек"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Передплатити"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Припинити передплату"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
+#: ui/evolution-task-editor.xml.h:1
 #, fuzzy
-msgid "Assig_n Task (FIXME)"
-msgstr "Прив'язати завдання"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Шукати дал╕"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Повторити"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Повторити в╕дм╕нену д╕ю"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Зам╕нити"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Зам╕нити рядок"
+msgid "Cancel Task"
+msgstr "Нове завдання"
 
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "В╕дпов╕сти вс╕м"
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "Стерти завдання"
 
-#: ui/evolution-task-editor-dialog.xml.h:48
+#: ui/evolution-task-editor.xml.h:7
 #, fuzzy
-msgid "S_end Status Report (FIXME)"
-msgstr "Контакт"
+msgid "Re_fresh Task"
+msgstr "Оновити список"
 
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:54
+#: ui/evolution-tasks.xml.h:3
 #, fuzzy
-msgid "Save the task and close the dialog box"
-msgstr "Зберегти контакт ╕ закрити д╕алог"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "Шукати зновуй той же рядок"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "Пошук рядка"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "В╕дм╕нити"
-
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "В╕дм╕нити останню операц╕ю"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
-msgid "_Appointment (FIXME)"
-msgstr "Зустр╕ч"
-
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "Позначити виконаним"
-
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "В╕дпов╕сти"
+msgid "Copy selected task"
+msgstr "В╕дкрити завдання"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Створити нову завдання"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "Стерти завдання"
+
+#: ui/evolution-tasks.xml.h:7
+#, fuzzy
+msgid "Delete selected tasks"
+msgstr "Стерти завдання"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Нове завдання"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "Вставити буфер обм╕ну"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Зберегти завдання як щось ╕нше"
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "Параметри завдань..."
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "Установки пошти..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "Завдання"
 
@@ -8601,135 +11408,220 @@ msgstr "Завдання"
 msgid "About Evolution..."
 msgstr "Про Evolution..."
 
+#: ui/evolution.xml.h:2
+#, fuzzy
+msgid "Add to _Shortcut Bar"
+msgstr "Панель ярлик╕в"
+
 #: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Закрити це в╕кно"
+#, fuzzy
+msgid "Change the name of this folder"
+msgstr "Зм╕нити властивост╕ ц╕╓╖ теки"
 
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
-msgstr ""
+#: ui/evolution.xml.h:6
+#, fuzzy
+msgid "Copy this folder"
+msgstr "Скоп╕ювати у теку"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr ""
+#: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "Створення ново╖ теки"
 
-#: ui/evolution.xml.h:6
-msgid "Customize toolbars"
+#: ui/evolution.xml.h:8
+msgid "Create a link to this folder in the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Створення ново╖ теки"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "Стерти цей елемент"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "В╕добразити ╕ншу теку"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "Вийти"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "В╕кно Evolution"
 
-#: ui/evolution.xml.h:10
-#, fuzzy
-msgid "Evolution bar _shortcut"
-msgstr "Evolution - %s"
-
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Вийти з програми"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "Розпочато"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "Головна панель ╕нструмент╕в"
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "Перенести пов╕домлення у нову теку"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Open in New _Window"
+msgstr "В╕дкрити у новому в╕кн╕"
+
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Open this folder in an other window"
+msgstr "В╕дкрити поточне пов╕домлення у новому в╕кн╕"
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Показати ╕нформац╕ю про Evolution"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "П╕дготувати зв╕т про помилку"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "В╕д╕слати зв╕т про помилку"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "В╕д╕слати зв╕т про помилку використовуючи Bug Buddy"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:30
+#, fuzzy
+msgid "Toggle"
+msgstr "Моб╕льний"
+
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Перемикнути стан показу панел╕ тек"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Перемикнути стан показу панел╕ тек"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "Toggle whether we are working offline."
+msgstr "Перемикнути стан показу панел╕ тек"
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "Використання менеджера контакт╕в"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "Використання календаря"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "Використання поштово╖ програми"
 
-#: ui/evolution.xml.h:24
-#, fuzzy
-msgid "Work Offline"
-msgstr "Перенесення"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr "Показати вибрану теки"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "Про Evolution..."
 
-#: ui/evolution.xml.h:26
-msgid "_Actions"
-msgstr "Д╕╖"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "Зустр╕ч"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "Контакт"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "Скоп╕ювати"
+
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "Панель тек"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "Перейти на теку..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "╤мпортувати файл..."
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "Покажчик"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "Поштову пов╕домлення"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "Перенести"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "Новий"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "Нова тека"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "В╕дкрити..."
+
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "Панель ярлик╕в"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "Панель ярлик╕в"
 
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "Завдання"
+
+#: ui/evolution.xml.h:64
+#, fuzzy
+msgid "_Work Offline"
+msgstr "Перенесення"
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "Установки пошти..."
+
 #: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
+#, fuzzy
+msgid "Address Cards"
 msgstr "Адресн╕ картки"
 
 #: views/addressbook/galview.xml.h:2
@@ -8763,9 +11655,12 @@ msgstr ""
 "\n"
 "Категор╕╖: "
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr ""
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B %Y"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
@@ -8839,42 +11734,34 @@ msgstr "Час завершення з╕брання:"
 msgid "All Attendees"
 msgstr "Весь супров╕д"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B %Y"
-
-#: widgets/menus/gal-view-menus.c:177
+#: widgets/menus/gal-view-menus.c:218
 #, fuzzy
 msgid "_Current View"
 msgstr "Поточний р╕к (%Y)"
 
-#: widgets/menus/gal-view-menus.c:196
+#: widgets/menus/gal-view-menus.c:259
 msgid "Define Views"
 msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:422
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "ПВСЧПСН"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "зараз"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "сьогодн╕"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "Гаразд"
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, fuzzy, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -8882,22 +11769,108 @@ msgstr ""
 "\n"
 "%s"
 
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "тиждень"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "Завдання"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "Орган╕зац╕я"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "Новий"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Нев╕дома помилка: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "╤нша"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Редактор контакт╕в"
+
+#: widgets/misc/e-filter-bar.c:173
 #, fuzzy
 msgid "Save Search"
 msgstr "Пошук"
 
-#: widgets/misc/e-filter-bar.c:237
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "Удосконалений пошук"
 
-#: widgets/misc/e-filter-bar.c:317
-#, fuzzy
-msgid "Advanced ..."
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "Показати все"
+
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
 msgstr "Додатково..."
 
 #: widgets/misc/e-messagebox.c:152
@@ -8908,6 +11881,11 @@ msgstr "╤нформац╕я"
 msgid "Warning"
 msgstr "Попередження"
 
+#: widgets/misc/e-messagebox.c:166
+#, fuzzy
+msgid "Error"
+msgstr "Без помилок"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Питання"
@@ -8921,7 +11899,7 @@ msgstr "Пов╕домлення"
 msgid "Don't show this message again."
 msgstr "Б╕льше не показувати це пов╕домлення."
 
-#: widgets/misc/e-search-bar.c:148
+#: widgets/misc/e-search-bar.c:155
 msgid "Sear_ch"
 msgstr "Пошук"
 
@@ -8944,3 +11922,522 @@ msgstr "init_corba(): не вдалось ╕н╕ц╕ал╕зувати GNOME"
 #: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): не вдалось ╕н╕ц╕ал╕зувати Bonobo"
+
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "Параметри календаря"
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "Параметри завдань..."
+
+#~ msgid "C_ontacts..."
+#~ msgstr "Зв'язки..."
+
+#~ msgid "_Company:"
+#~ msgstr "Компан╕я:"
+
+#~ msgid "As _Minicards"
+#~ msgstr "Як _Minicards"
+
+#~ msgid "SASL"
+#~ msgstr "SASL"
+
+#~ msgid "Find..."
+#~ msgstr "Шукати..."
+
+#~ msgid "label26"
+#~ msgstr "label26"
+
+#~ msgid "Open calendar"
+#~ msgstr "В╕дкрити календар"
+
+#~ msgid "Save calendar"
+#~ msgstr "Зберегти календар"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>Помилка завантаження календаря:<br>Метод не п╕дтриму╓ться"
+
+#~ msgid "Colors"
+#~ msgstr "Кольори"
+
+#~ msgid "Highlight"
+#~ msgstr "П╕дсв╕тка"
+
+#~ msgid "TaskPad"
+#~ msgstr "Панель завдань"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "В╕зуальн╕ си╜нали"
+
+#~ msgid "Work week"
+#~ msgstr "Робочий тиждень"
+
+#~ msgid "Edit Task"
+#~ msgstr "Виправити завдання"
+
+#~ msgid "Percent complete"
+#~ msgstr "В╕дсоток виконання"
+
+#~ msgid "Mark the task complete"
+#~ msgstr "Позначити завдання як виконане"
+
+#~ msgid "Edit this task..."
+#~ msgstr "Виправити це завдання..."
+
+#~ msgid "Edit the task"
+#~ msgstr "Виправити завдання"
+
+#, fuzzy
+#~ msgid "Go to Today"
+#~ msgstr "сьогодн╕"
+
+#, fuzzy
+#~ msgid "Component successfully updated."
+#~ msgstr "Файли Evolution усп╕шно встановлено."
+
+#, fuzzy
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "Не вдалося створити календар в \"%s\""
+
+#, fuzzy
+#~ msgid "Component successfully deleted."
+#~ msgstr "Файли Evolution усп╕шно встановлено."
+
+#, fuzzy
+#~ msgid "I don't recognize this type of calendar component."
+#~ msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#~ msgid "Add to Calendar"
+#~ msgstr "Додати до календаря"
+
+#~ msgid "Update Calendar"
+#~ msgstr "Поновити календар"
+
+#, fuzzy
+#~ msgid "Attendee address"
+#~ msgstr "Весь супров╕д"
+
+#, fuzzy
+#~ msgid "Attendees: "
+#~ msgstr "Весь супров╕д"
+
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr ""
+#~ "Скасувати\n"
+#~ "зустр╕ч"
+
+#, fuzzy
+#~ msgid "Organizer: "
+#~ msgstr "Ор╕╓нтац╕я:"
+
+#~ msgid "Show a dialog"
+#~ msgstr "Показати д╕алог"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "П╕дстави зустр╕ч╕"
+
+#~ msgid "_Starting date:"
+#~ msgstr "Дата початку:"
+
+#~ msgid "label21"
+#~ msgstr "label26"
+
+#~ msgid "label55"
+#~ msgstr "label26"
+
+#~ msgid "Summary contains"
+#~ msgstr "Зведення м╕стить"
+
+#~ msgid "Comment contains"
+#~ msgstr "Коментар м╕стить"
+
+#, fuzzy
+#~ msgid "Has category"
+#~ msgstr ""
+#~ "\n"
+#~ "Категор╕╖: "
+
+#, fuzzy
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "Створити новий календар"
+
+#, fuzzy
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Сканування тек в \"%s\""
+
+#, fuzzy
+#~ msgid "%s is not a selectable folder"
+#~ msgstr "Показати вибрану теки"
+
+#, fuzzy
+#~ msgid "Inline attachment"
+#~ msgstr "долучення"
+
+#, fuzzy
+#~ msgid "Send as:"
+#~ msgstr "В╕д╕слати \"%s\""
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не вдалося в╕дкрити файл п╕дпису %s:\n"
+#~ "%s"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "Це не звичайний файл."
+
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr "%I:%M:%S %p%n"
+
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Неможливо в╕дкрити файл %s:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Send an email to %s"
+#~ msgstr "Отримання пошти з %s"
+
+#, fuzzy
+#~ msgid "Close %s"
+#~ msgstr "Закрити"
+
+#, fuzzy
+#~ msgid "Move %s to the left"
+#~ msgstr "Перенести в теку"
+
+#, fuzzy
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Перейти до попереднього елементу"
+
+#, fuzzy
+#~ msgid "Move %s into the next row"
+#~ msgstr "Перейти до наступного елементу"
+
+#, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "Нед╕ля"
+
+#, fuzzy
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#, fuzzy
+#~ msgid "Factory for the test component."
+#~ msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#~ msgid "Forward to Address"
+#~ msgstr "Переслати на адресу"
+
+#~ msgid "Closing current folder"
+#~ msgstr "Закривання поточно╖ теки"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Перейменування старо╖ теки та в╕дкривання"
+
+#~ msgid "Copying messages"
+#~ msgstr "Коп╕ювання пов╕домлень"
+
+#, fuzzy
+#~ msgid "Evolution progress"
+#~ msgstr "Evolution"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Отримання пов╕домлення %d з %d (uid \"%s\")"
+
+#, fuzzy
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (переслане пов╕домлення)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Fwd: (без теми)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Переслане пов╕домлення (без теми)"
+
+#~ msgid "Print the selected message"
+#~ msgstr "Надрукувати вибране пов╕домлення"
+
+#~ msgid "Delete this message"
+#~ msgstr "Стерти це пов╕домлення"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Файли Evolution усп╕шно встановлено."
+
+#~ msgid "Activate"
+#~ msgstr "Актив╕зувати"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "Актив╕зувати цей ярлик"
+
+#~ msgid "Find a contact"
+#~ msgstr "Знайти контакт"
+
+#~ msgid "View All"
+#~ msgstr "Показати все"
+
+#~ msgid "View all contacts"
+#~ msgstr "Показати вс╕ контакти"
+
+#~ msgid "5 Days"
+#~ msgstr "5 Дн╕в"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Створити новий календар"
+
+#~ msgid "Day"
+#~ msgstr "День"
+
+#~ msgid "New _Event"
+#~ msgstr "Нова под╕я"
+
+#~ msgid "Open Calendar"
+#~ msgstr "В╕дкрити календар"
+
+#~ msgid "Prev"
+#~ msgstr "Назад"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Зберегти календар як щось ╕нше"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "В╕дкрити календар"
+
+#~ msgid "About this application"
+#~ msgstr "Про цю програму"
+
+#~ msgid "About..."
+#~ msgstr "Про..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "Д╕╖"
+
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "Адресна книга..."
+
+#~ msgid "C_lear"
+#~ msgstr "Очистити"
+
+#, fuzzy
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "Завдання"
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "Скоп╕ювати у теку..."
+
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "Перший елемент у тец╕"
+
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "Переслати"
+
+#~ msgid "Go to the next item"
+#~ msgstr "Перейти до наступного елементу"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "Перейти до попереднього елементу"
+
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "Невиконане завдання"
+
+#~ msgid "N_ext"
+#~ msgstr "Наступний"
+
+#~ msgid "Pre_vious"
+#~ msgstr "Попередн╕й"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "Параметри друку..."
+
+#, fuzzy
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "Планування зустр╕ч╕"
+
+#, fuzzy
+#~ msgid "Select everything"
+#~ msgstr "Вибрати назви"
+
+#, fuzzy
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "Завдання"
+
+#~ msgid "_About..."
+#~ msgstr "Про..."
+
+#~ msgid "_Item (FIXME)"
+#~ msgstr "Елемент"
+
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "Журнальний запис"
+
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "Останн╕й елемент у тец╕"
+
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "В╕д╕слати пов╕домлення"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "Перенести в теку..."
+
+#~ msgid "_Note (FIXME)"
+#~ msgstr "Прим╕тка"
+
+#, fuzzy
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "Контакт"
+
+#, fuzzy
+#~ msgid "Add Service"
+#~ msgstr "Додати джерело"
+
+#, fuzzy
+#~ msgid "Create a new email"
+#~ msgstr "Створити новий контакт"
+
+#~ msgid "New Mail"
+#~ msgstr "Нова пошта"
+
+#~ msgid "Configure Folder..."
+#~ msgstr "Налаштувати теку..."
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Скоп╕ювати пов╕домлення у нову теку"
+
+#~ msgid "Edit the current message"
+#~ msgstr "Виправити поточне пов╕домлення"
+
+#~ msgid "Expunge"
+#~ msgstr "Викреслити"
+
+#~ msgid "Finaly remove all mails tagged for deletion"
+#~ msgstr "Остаточно видалити пошту в╕дм╕чену для стирання"
+
+#, fuzzy
+#~ msgid "Forward inline"
+#~ msgstr "Переслати"
+
+#, fuzzy
+#~ msgid "Forward this message in-line with your mail, so you can edit it"
+#~ msgstr "Переслати пов╕домлення без теми"
+
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "Прибрати стерт╕ пов╕домлення"
+
+#~ msgid "Invert Selection"
+#~ msgstr "╤нвертувати виб╕р"
+
+#~ msgid "Mark As Read"
+#~ msgstr "Позначити прочитаним"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Позначити непрочитаним"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Перенести пов╕домлення у нову теку"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Перегляд друку пов╕домлення..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Надрукувати пов╕домлення на принтер╕"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "Перенаправити"
+
+#~ msgid "Reply to all"
+#~ msgstr "В╕дпов╕сти вс╕м"
+
+#~ msgid "Reply to sender"
+#~ msgstr "В╕дпов╕сти в╕дправнику"
+
+#~ msgid "S_ource"
+#~ msgstr "Джерело"
+
+#, fuzzy
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr "В╕д╕слати пов╕домлення з черги та отримати нов╕"
+
+#~ msgid "_Reply"
+#~ msgstr "В╕дпов╕сти"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "Зберегти пов╕домлення як..."
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Зберегти в тец╕..."
+
+#~ msgid "Send the message now"
+#~ msgstr "В╕д╕слати пов╕домлення негайно"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "Вставити текстовий файл..."
+
+#, fuzzy
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "Прив'язати завдання"
+
+#~ msgid "Redo"
+#~ msgstr "Повторити"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Повторити в╕дм╕нену д╕ю"
+
+#~ msgid "Replace"
+#~ msgstr "Зам╕нити"
+
+#~ msgid "Replace a string"
+#~ msgstr "Зам╕нити рядок"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "В╕дпов╕сти вс╕м"
+
+#, fuzzy
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "Контакт"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "Шукати зновуй той же рядок"
+
+#~ msgid "Search for a string"
+#~ msgstr "Пошук рядка"
+
+#~ msgid "Undo"
+#~ msgstr "В╕дм╕нити"
+
+#~ msgid "Undo the last action"
+#~ msgstr "В╕дм╕нити останню операц╕ю"
+
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "Позначити виконаним"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "В╕дпов╕сти"
+
+#, fuzzy
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Evolution - %s"
+
+#, fuzzy
+#~ msgid "Advanced ..."
+#~ msgstr "Додатково..."